称重修改

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

@@ -36,8 +36,13 @@ class PackageController extends WeightBaseController
                     $params['hid'] = $value;
                     break;
                 case '1':
-                    $params['code'] = $value;
-//                    $params['code'] = $this->processCode($value);
+                    if(mb_stristr($value,'-')){
+                        $arr = [];
+                        preg_match('/[A-Z|a-z|\d]+/',$value,$arr);
+                        $params['code'] = $arr[0];
+                    }else{
+                        $params['code'] = $value;
+                    }
                     break;
                 case '2':
                     $params['weight'] = $value;

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

@@ -14,7 +14,6 @@ use App\Services\OrderService;
 use Illuminate\Support\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 
 class WeightBaseController
 {
@@ -50,8 +49,10 @@ class WeightBaseController
 
         // 2.获取快递单号
         $logistic_number = $this->getCodeValue($params);
+
         // 3、获取称重设备
         $measuringMachine = $this->getMeasuringMachine($params);
+
         // 4、快递单号对应的OrderPackage
         $orderPackage = $this->getOrderPackageByCode($logistic_number);
         if (is_null($orderPackage)) {
@@ -69,18 +70,26 @@ class WeightBaseController
                 return json_encode(["success" => false, "message" => "写入WAS失败!"], JSON_UNESCAPED_UNICODE);
             }
         }
+
         // 5、更新包裹信息
         $bool = $this->updateOrderPackage($orderPackage, $params, $measuringMachine);
-        if (!$bool) return $this->getUpdatePackageMessage($orderPackage);
-        // 6、处理波次信息
+        // 6、称重时间
+        if($bool)$this->afterApply($orderPackage);
+        else {
+            app('LogService')->log(__METHOD__, $this->name, '写入WAS失败! (Error)',$logistic_number , null);
+            return $this->getUpdatePackageMessage($orderPackage);
+        }
+
+        // 7、处理波次信息
         try {
-            $this->activityWaveNoProcessing($orderPackage);
+            if ($orderPackage->isActivityBatch()) {
+                $this->activityWaveNoProcessing($orderPackage);
+            }
         } catch (\Exception $e) {
             app('LogService')->log(__METHOD__, $this->name, 'weightApi (Error)', json_encode($orderPackage) . '||' . json_encode($e), null);
             return $this->getWeightMessage($orderPackage, $e);
         }
-        // 7、称重完成之后操作
-        $this->afterApply($orderPackage);
+
         $response = $this->getSuccessMessage($params, $orderPackage);
         app('LogService')->log(__METHOD__, $this->name, "下发写入包裹成功：" . json_encode($request->getContent()) . '||' . json_encode($response), null);
         return json_encode($response, JSON_UNESCAPED_UNICODE);
@@ -224,6 +233,7 @@ class WeightBaseController
 // endregion
 
 //  region ---包裹
+
     // 获取包裹
     public function getOrderPackageByCode($code)
     {
@@ -235,7 +245,7 @@ class WeightBaseController
     }
 
     // 更新包裹
-    public function updateOrderPackage(OrderPackage $orderPackage, $params, $measuringMachine)
+    public function updateOrderPackage(OrderPackage $orderPackage, $params, $measuringMachine): bool
     {
         $edges = $this->getEdges($params);
         $req_date = Carbon::now()->toDateTimeString();
@@ -246,14 +256,9 @@ class WeightBaseController
         $orderPackage['height'] = $edges[2];
         $orderPackage['weighed_at'] = $req_date;
         $orderPackage['bulk'] = $edges[0] * $edges[1] * $edges[2] / 1000;
-        if ($orderPackage->isActivityBatch()) {
-            $result = $this->activityWaveNoProcessing($orderPackage);
-            if (!$result) return false;
-        }
         return $orderPackage->save();
     }
 
-
     // 创建包裹信息
     public function createOrderPackage($params, $measuringMachine, $order)
     {
@@ -274,7 +279,6 @@ class WeightBaseController
         return $this->getOrderPackageByCode($this->getCodeValue($params));
     }
 
-
 //  endregion
 
 //  region ---称重设备
@@ -336,7 +340,7 @@ class WeightBaseController
                 $orderPackage->uploaded_to_wms = "异常";
             }
         } else {
-            app('LogService')->log(__METHOD__, $this->name . " 写入包裹至WMS：", json_encode($orderPackage), null);
+            app('LogService')->log(__METHOD__, $this->name . " 写入包裹至WMS异常：", json_encode($orderPackage), null);
             try {
                 $result = $fluxController->accomplishToWMS($orderPackage);
                 if ($result['result'] == 'success') $orderPackage->uploaded_to_wms = "是";
@@ -345,7 +349,7 @@ class WeightBaseController
                 $orderPackage->uploaded_to_wms = "否";
             }
         }
-        return $orderPackage->save();
+        $orderPackage->save();
     }
 // endregion