二次分拨划分

app/Http/Controllers/TestController.php

@@ -6,9 +6,13 @@ use App\Components\AsyncResponse;
 use App\Components\Database;
 use App\Components\ErrorPush;
 use App\Exceptions\Exception;
+use App\Rejected;
+use App\RejectedBill;
+use App\RejectedBillItem;
 use App\Services\WaybillService;
 use App\User;
 use App\Waybill;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -37,49 +41,13 @@ class TestController extends Controller
     }
     public function test()
     {
-        $json = <<<json
-{
-                    "request": [
-                        {
-                            "ORDERNUMBERCODE": "ASN2205270586",
-                            "CUSTOMERID": "JIANSHANG",
-                            "ASNTYPE": "THRK",
-                            "ASNREFERENCE1": "92052644969",
-                            "ADDWHO": "WCS",
-                            "USERDEFINE1": "",
-                            "USERDEFINE2": "",
-                            "USERDEFINE3": "",
-                            "SKU_LIST": [
-                        {
-                            "ORDERNUMBERCODE": "ASN2205270586",
-                            "ASNLINENO": "1",
-                            "SKUCODE": "6213100205402",
-                            "QUANTITY": "1",
-                            "LOTATT04": "",
-                            "LOTATT05": "MJ-CP",
-                            "STATUS": "CC",
-                            "PRODUCTION DATE": "",
-                            "EXPIRATION DATE": "",
-                            "USERDEFINE1": "JIANSHANG02",
-                            "USERDEFINE2": "",
-                            "USERDEFINE3": "",
-                            "UNIQUE_CODE_LIST": []
-                        }
-                    ]
-                        }
-                    ]
-                }
-json;
-
-        $sendingJson = json_decode($json,true);
-        $url=url(config('api.flux.receive.new'));
-        try{
-            $response = Zttp::post($url, $sendingJson);
-            dd($response->json());
-        }catch (\Exception $exception){
-            Controller::logS(__METHOD__,'Exception_'.__FUNCTION__,'CURL请求异常：'.$exception->getMessage(),null);
-            dd($exception);
+        $url = config('api.java.base').config('api.java.device.picking.getContainerOfWave');
+        $get = Http::get($url, ["container" => "JH028"]);
+        $result = $get->json();
+        if ($result["code"] != 200) {
+            return response()->json(['result'=>'failure','fail_info'=>$result["message"]])->setEncodingOptions(JSON_UNESCAPED_UNICODE);
         }
+        dd($result["data"]);
     }
 }
 

app/Http/Controllers/api/thirdPart/haochuang/SortingController.php

@@ -77,7 +77,7 @@ class SortingController extends Controller
         $warehouseId = null;// 仓库ID
         $number = 0;// 总拣数量
         // 容器号获取波次
-        if (strlen($batch_id) != 13 && substr($batch_id, 0, 1) != 'W') {
+        if (strlen($batch_id) != 13 || substr($batch_id, 0, 1) != 'W') {
             // 请求JAVA端获取对应波次号
             $url = config('api.java.base').config('api.java.device.picking.getContainerOfWave');
             $get = Http::get($url, ["container" => $batch_id]);
@@ -89,11 +89,11 @@ class SortingController extends Controller
         } else {
             $arr = explode('-',$batch_id);
             if (count($arr)==2){
-                $batch_id = $arr[0];
                 $childIndex = (int)$arr[1];
-                $request->offsetSet("batch_id",$batch_id);
+                $request->offsetSet("batch_id",$arr[0]);
             }
         }
+        $batch_id = $request->input('batch_id');
 
         $errors=$this->processValidator($request->all())->errors();
         if(count($errors)>0){

app/Http/Controllers/api/thirdPart/jianshang/RejectedController.php

@@ -20,6 +20,13 @@ class RejectedController extends Controller
 {
     use ErrorPush;
 
+    /**
+     * 22-6-8 废弃接口
+     *
+     * @Deprecated
+     * @param $rejected
+     * @return false
+     */
     function sendRejected($rejected){
         $amount = $rejected['amount'] ?? '';
         $created_at = $rejected['created_at'] ?? '';
@@ -51,6 +58,12 @@ class RejectedController extends Controller
     }
 
 
+    /**
+     * 22-6-8 废弃接口
+     * @Deprecated
+     * @param Request $request
+     * @return array|string[]
+     */
     function sendRejectedByApi(Request $request){
         $amount = $request->input('amount') ?? '';
         $created_at = $request->input('created_at') ?? '';
@@ -71,6 +84,25 @@ class RejectedController extends Controller
         if(!$json['success']){return $this->apiError(__METHOD__,"返回错误：".json_encode($json));}
         return $json;
     }
+
+    /**
+     * 22-6-8 废弃接口
+     *
+     * @Deprecated
+     * @param $amount
+     * @param $created_at
+     * @param $fee_collected
+     * @param $goods_barcode
+     * @param $goods_name
+     * @param $logistic_name_return
+     * @param $logistic_number
+     * @param $logistic_number_return
+     * @param $order_number
+     * @param $quality_label
+     * @param $sender_mobile
+     * @param $sender_name
+     * @return false
+     */
     private function packSendToRemote($amount,$created_at,$fee_collected,$goods_barcode,
                                       $goods_name,$logistic_name_return,$logistic_number,$logistic_number_return,$order_number,
                                       $quality_label,$sender_mobile,$sender_name){

config/api.php

@@ -6,7 +6,7 @@ return [
     'api_switch_receive_to_wms' => env('API_SWITCH_RECEIVE_TO_WMS', true),
     'jianshang_rejecteds_log_switch' => true,
 
-    'url_rejected_send_jianshang' => 'http://daye.mjstyle.cn:8083/mjstyle-bs-service/order/receive',
+    'url_rejected_send_jianshang' => 'http://daye.mjstyle.cn:8083/mjstyle-bs-service/order/receive',// 222-6-8 证实为废弃接口
     'url_rejected_send_jianshang2' => 'http://daye.mjstyle.cn:8083/mjstyle-bs-service/order/receive2',
     'fakingUrl_rejected_send_jianshang' => '/api/rejected/jianshang/send',
     'sign_key_rejected_send_jianshang' => 'ymgYuN01D3UCZneZ53wGC0suOIUPmLgY',