活动波次加增规则

app/Http/Controllers/api/thirdPart/flux/PackageController.php

@@ -84,27 +84,30 @@ class PackageController extends Controller
                 ]);
             }
             //活动波次同步
-            $packageBatch=Package::whereRaw('batch_number = ? AND weight IS NOT NULL',[$receiveInputs['USERDEFINE1']])->first();
-            if ($receiveInputs['USERDEFINE1']&&$packageBatch){
-                $createPackage->measuring_machine_id=$packageBatch->measuring_machine_id;
-                $createPackage->weight=$packageBatch->weight;
-                $createPackage->length=$packageBatch->length;
-                $createPackage->width=$packageBatch->width;
-                $createPackage->height=$packageBatch->height;
-                $createPackage->bulk=$packageBatch->bulk;
-                $createPackage->paper_box_id=$packageBatch->paper_box_id;
-                $createPackage->save();
-                $result=$this->accomplishToWMS($createPackage);
-                if ($result['result']=='success'){
-                    $createPackage->status="已上传";
+            if ($receiveInputs['USERDEFINE2']&&strstr($receiveInputs['USERDEFINE2'],'活动')){
+                $packageBatch=Package::whereRaw('batch_number = ? AND weight IS NOT NULL',[$receiveInputs['USERDEFINE1']])->first();
+                if ($receiveInputs['USERDEFINE1']&&$packageBatch){
+                    $createPackage->measuring_machine_id=$packageBatch->measuring_machine_id;
+                    $createPackage->weight=$packageBatch->weight;
+                    $createPackage->length=$packageBatch->length;
+                    $createPackage->width=$packageBatch->width;
+                    $createPackage->height=$packageBatch->height;
+                    $createPackage->bulk=$packageBatch->bulk;
+                    $createPackage->paper_box_id=$packageBatch->paper_box_id;
+                    $createPackage->save();
+                    $result=$this->accomplishToWMS($createPackage);
+                    if ($result['result']=='success'){
+                        $createPackage->status="已上传";
+                    }else{
+                        $createPackage->status="上传异常";
+                    }
                 }else{
-                    $createPackage->status="上传异常";
+                    WeightQueue::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
                 }
             }else{
                 WeightQueue::dispatch($createPackage)->delay(Carbon::now()->addMinutes(1440));
             }
             $createPackage->save();
-
             $this->log(__METHOD__,'success_'.__FUNCTION__,json_encode($request->all()),null);
         }
         return response()->json(['response'=>['flag'=>'Y','code'=>'0000','message'=>'正确接收']])

app/Http/Controllers/api/thirdPart/weight/PackageController.php

@@ -68,25 +68,45 @@ class PackageController extends Controller
             $accomplishToWMS=new \App\Http\Controllers\Api\thirdPart\flux\PackageController();
 
             //处理活动波次
-            $packagesBatch=Package::where('batch_number',$package->batch_number)->get();
-            foreach ($packagesBatch as $packageBatch){
-                $packageBatch->measuring_machine_id=$measuringMachine->id;
-                $packageBatch->weight=$request['weight'];
-                $packageBatch->length=$max;
-                $packageBatch->width=$centre;
-                $packageBatch->height=$min;
-                $packageBatch->bulk=$max*$centre*$min;
-                if (isset($paperBox_id))$packageBatch->paper_box_id=$paperBox_id;
-                $packageBatch->status="未上传";
-                $this->log(__METHOD__,'Batch_'.__FUNCTION__,json_encode($packageBatch),null);
-                $packageBatch->save();
-                $result=$accomplishToWMS->accomplishToWMS($packageBatch);
+            if ($package->batch_rule&&strstr($package->batch_rule,'活动')){
+                $packagesBatch=Package::where('batch_number',$package->batch_number)->get();
+                foreach ($packagesBatch as $packageBatch){
+                    $packageBatch->measuring_machine_id=$measuringMachine->id;
+                    $packageBatch->weight=$request['weight'];
+                    $packageBatch->length=$max;
+                    $packageBatch->width=$centre;
+                    $packageBatch->height=$min;
+                    $packageBatch->bulk=$max*$centre*$min;
+                    if (isset($paperBox_id))$packageBatch->paper_box_id=$paperBox_id;
+                    $packageBatch->status="未上传";
+                    $this->log(__METHOD__,'Batch_'.__FUNCTION__,json_encode($packageBatch),null);
+                    $packageBatch->save();
+                    $result=$accomplishToWMS->accomplishToWMS($packageBatch);
+                    if ($result['result']=='success'){
+                        $packageBatch->status="已上传";
+                    }else{
+                        $packageBatch->status="上传异常";
+                    }
+                    $packageBatch->save();
+                }
+            }else{
+                $package->measuring_machine_id=$measuringMachine->id;
+                $package->weight=$request['weight'];
+                $package->length=$max;
+                $package->width=$centre;
+                $package->height=$min;
+                $package->bulk=$max*$centre*$min;
+                if (isset($paperBox_id))$package->paper_box_id=$paperBox_id;
+                $package->status="未上传";
+                $this->log(__METHOD__,'Batch_'.__FUNCTION__,json_encode($package),null);
+                $package->save();
+                $result=$accomplishToWMS->accomplishToWMS($package);
                 if ($result['result']=='success'){
-                    $packageBatch->status="已上传";
+                    $package->status="已上传";
                 }else{
-                    $packageBatch->status="上传异常";
+                    $package->status="上传异常";
                 }
-                $packageBatch->save();
+                $package->save();
             }
             event(new WeightEvent($package));
             $response=["msg"=>"保存成功",

config/api.php

@@ -17,5 +17,5 @@ return [
 //    'receiveAccomplishToWMS_flux' => 'http://47.103.72.58:19199/datahub/FluxBSJsonApi/RECECF?messageId=RECECF', //通知WMS完成的订单收货(测试服)
     'receiveAccomplishToWMS_flux' => 'http://106.14.155.246:19192/datahub/FluxBSJsonApi/RECECF?messageId=RECECF', //通知WMS完成的订单收货
 
-    'packageAccomplishTOWMS_flux' =>'http://106.14.155.246:19192/datahub/FluxBSJsonApi/',
+    'packageAccomplishTOWMS_flux' =>'http://106.14.155.246:19192/datahub/FluxBSJsonApi/TASK',
 ];

tests/webApi/flux.http

@@ -5,10 +5,10 @@
 ## * 'ptr' and 'ptrp' create a POST request with a simple or parameter-like body;
 ## * 'mptr' and 'fptr' create a POST request to submit a form with a text or file field (multipart/form-data);
 
-POST https://testwas.baoshi56.com/api/thirdPart/flux/package/new
+POST http://bswas/api/thirdPart/flux/package/new
 Content-Type: application/json
 
-{"request":{"TASKID":"testTASKID","Orderno":"testOrderno","palletid":"testPalletid","SOReference5":"YT4373286708826","Customer":"BOAO","Consigneename":"22","CarrierID":"1","USERDEFINE1":"TESTFLUX","USERDEFINE2":null,"USERDEFINE3":null}}
+{"request":{"TASKID":"ad5","Orderno":"ad5","palletid":"ad5","SOReference5":"ad5","Customer":"BOAO","Consigneename":"22","CarrierID":"1","USERDEFINE1":"TESTFLUX","USERDEFINE2":null,"USERDEFINE3":null}}
 
 ###
 

tests/webApi/test.http

@@ -13,7 +13,7 @@ Content-Type: application/json
 ###
 
 
-POST http://106.14.155.246:19192/datahub/FluxBSJsonApi/
+POST http://106.14.155.246:19192/datahub/FluxBSJsonApi/TASK
 Content-Type: application/json
 
 {"request":{"TASKID":"75331710268640","SOReference5":"75331710268640","Weigh":"0.05","Addwho":"","Addtime":"2020-02-28 17:30","Package":"xx","USERDEFINE1":"W200228000193","USERDEFINE2":"01.[ALLBLU]普通波次","USERDEFINE3":"OK"}}