Просмотр исходного кода

异方接口:称重回传与广播

Zhouzhendong 5 лет назад
Родитель
Сommit
676b8f663f
1 измененных файлов с 15 добавлено и 15 удалено
  1. 15 15
      app/Http/Controllers/api/thirdPart/goodscan/PackageController.php

+ 15 - 15
app/Http/Controllers/api/thirdPart/goodscan/PackageController.php

@@ -66,7 +66,7 @@ class PackageController
         if(!empty($orderPackage->order)){
             Waybill::setWeightByOrderCode($orderPackage->order->code,$orderPackage->weight);
         }
-//            event(new WeighedEvent($orderPackage));
+            event(new WeighedEvent($orderPackage));
         $response=["code"=>0,'error'=>'upload success'];
         LogService::log(__METHOD__,__FUNCTION__,"下发写入包裹成功:".json_encode($request).'||'.json_encode($response),null);
         return json_encode($response,JSON_UNESCAPED_UNICODE);
@@ -135,7 +135,7 @@ class PackageController
      */
     public function activityWaveNoProcessing(&$orderPackage) //处理活动波次
     {
-//        $fluxController = new \App\Http\Controllers\Api\thirdPart\flux\PackageController();
+        $fluxController = new \App\Http\Controllers\Api\thirdPart\flux\PackageController();
         if($orderPackage->isActivityBatch()){
             LogService::log(__METHOD__,__FUNCTION__,"依波次号同步所有包裹:".json_encode($orderPackage),null);
             $params = [
@@ -149,21 +149,21 @@ class PackageController
                 'paper_box_id'=>$orderPackage['paper_box_id'] ?? null,
             ];
             OrderPackage::query()->where('batch_number',$orderPackage['batch_number'])->update($params);
-//            $result=$fluxController->markWMSOnBatch($orderPackage['batch_number'], $orderPackage['weight']);
-//            if(!$result['result']){
-//                $orderPackage->status="上传异常";
-//            }
+            $result=$fluxController->markWMSOnBatch($orderPackage['batch_number'], $orderPackage['weight']);
+            if(!$result['result']){
+                $orderPackage->status="上传异常";
+            }
         }else{
             LogService::log(__METHOD__,__FUNCTION__,"GoodScan 写入包裹至WMS:".json_encode($orderPackage),null);
-//            try{
-//                $result=$fluxController->accomplishToWMS($orderPackage);
-//                if ($result['result'])
-//                    $orderPackage->status="已上传";
-//                else
-//                    $orderPackage->status="上传异常";
-//            }catch (\Exception $e){
-//                $orderPackage->status="未上传";
-//            }
+            try{
+                $result=$fluxController->accomplishToWMS($orderPackage);
+                if ($result['result'])
+                    $orderPackage->status="已上传";
+                else
+                    $orderPackage->status="上传异常";
+            }catch (\Exception $e){
+                $orderPackage->status="未上传";
+            }
         }
         $response=$this->saveOrderPackage($orderPackage);
         return $response??[];