Zhouzhendong 3 rokov pred
rodič
commit
1469ba723a

+ 26 - 7
app/Http/Controllers/TestController.php

@@ -55,13 +55,32 @@ class TestController extends Controller
     }
     public function test(Request $request)
     {
-        $req = json_decode(
-            <<<json
-{"request":[{"OrderNo":"SO220824002947","CustomerID":"HENIAN-NEW","CarrierID":"BSZFC","ConsigneeName":"\u674e\u521a","C_Tel1":"13386015319,13386015319","C_Address1":"\u6c5f\u82cf\u7701\u82cf\u5dde\u5e02\u5e38\u719f\u5e02\u83ab\u57ce\u8857\u4e1c\u8def3\u53f7\u7199\u9ea6\u957f\u4e09\u89d2\u65f6\u5c1a\u4f9b\u5e94\u94fe\u4e00\u671f3\u697c2\u53f7\u5e93","C_Province":"\u6c5f\u82cf\u7701","C_City":"\u82cf\u5dde\u5e02","C_District":"\u5e38\u719f\u5e02","ReservedField01":"199270842873-SDO516764043198","ReservedField02":null,"ReservedField03":null,"ReservedField04":null,"ReservedField05":null,"order_list":[{"SKU_Descr_c":"Vsinger \u6d1b\u5929\u4f9d 8\u738b\u9f99\u7cfb\u5217\u76d2\u86cb\uff08BOX\uff09","SKU":"6974260921198","Alternate_sku1":"6974260921198","Qtyordered_each":"108","Cubic":"0","GrossWeight":"0","NetWeight":"0","ReservedField01":null,"ReservedField02":null,"ReservedField03":null,"ReservedField04":null,"ReservedField05":null}]}]}
-json
-
-            , true);
-        dd(Http::post("https://api.baoshi56.com/oapi/device/check/waybill/create", $req)->body());
+        $waybill = Waybill::query()->where("waybill_number","BSZX2209079840")->first();
+        $json="
+                {
+                    \"request\": [
+                        {
+                            \"OrderNo\": \"{$waybill['wms_bill_number']}\",
+                            \"DELIVERYNO\": \"{$waybill['waybill_number']}\"
+                        }
+                    ]
+                }
+                ";
+        $sendingJson = json_decode($json,true);
+        $url=url(config('api.flux.waybill.new'));
+        try{
+            $response = Zttp::post($url, $sendingJson);
+        }catch (\Exception $exception){
+            dd('CURL请求异常:'.$exception->getMessage());
+            return false;
+        }
+        $responseJson = $response->json();
+        if(!$responseJson||!isset($responseJson['Response'])||!$responseJson['Response']['return']['returnFlag']=='1'){
+            dd("向WMS提交运单失败!!SO单号:{$waybill['wms_bill_number']}。提交:{$json},返回:{$response->body()}, URL:{$url}");
+            return false;
+        }
+        Controller::logS(__METHOD__,''.__FUNCTION__,"向WMS提交运单成功,SO单号:{$waybill['wms_bill_number']}。返回:{$response->body()}",0);
+        return true;
     }
 }
 

+ 1 - 1
resources/views/auth/login.blade.php

@@ -6,7 +6,7 @@
     <link rel="icon" href="{{asset('icon/faviconc.ico')}}" type="image/x-icon"/>
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
-    <title>宝时SWAS</title>
+    <title>宝时物流网站</title>
 
     <link href="{{ mix('css/app.css') }}" rel="stylesheet">
     <link href="{{ mix('css/reset.css') }}" rel="stylesheet">

+ 1 - 0
resources/views/equipment/index.blade.php

@@ -1023,6 +1023,7 @@
                     return;
                 }
                 this.batchSign = false;
+                this.currentEqChildIndex = index-1;
                 this.isLoadLocation = true;
                 this._locationAttrDefault();
                 setTimeout(function (){

+ 1 - 1
resources/views/layouts/app.blade.php

@@ -7,7 +7,7 @@
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>@yield('title') 宝时 SWAS</title>
+    <title>宝时物流网站 @yield('title')</title>
     @yield('head')
     <!-- Styles -->
     <link href="{{ mix('css/app.css') }}" rel="stylesheet">