Merge branch 'zengjun'

app/Http/Controllers/WorkOrderController.php

@@ -56,14 +56,18 @@ class WorkOrderController extends Controller
         if (OrderIssue::query()->whereIn('order_id',$work_orders->map(function($item){return $item['order_id'];}))->exists()){
             return ['success' => false, 'message' => '已有对应的问题件'];
         }
-        $result = $service->buildOrderIssue($work_orders);
-        if (!$result['success']) return $result;
-        $workOrders = WorkOrder::query()->with(['type', 'creator', 'order' => function ($query) {
-            /** @var $query Builder */
-            $query->with('packages', 'issue', 'logistic');
-        }, 'reviewer','issueType'])->whereIn(  'id',$request['ids'])->get();
-        $service->tags($workOrders);
-        return ['success' => true ,'data' => $workOrders];
+        try {
+            $result = $service->buildOrderIssue($work_orders);
+            if (!$result['success']) return $result;
+            $workOrders = WorkOrder::query()->with(['type', 'creator', 'order' => function ($query) {
+                /** @var $query Builder */
+                $query->with('packages', 'issue', 'logistic');
+            }, 'reviewer', 'issueType'])->whereIn('id', $request['ids'])->get();
+            $service->tags($workOrders);
+            return ['success' => true, 'data' => $workOrders];
+        } catch (\Exception $e) {
+            return  ['success' => true, 'message' => '创建问题件失败，检查对应问题件是否存在，刷新重试'];
+        }
     }
 
     // 创建工单 api

app/Services/weight/WeightService.php

@@ -15,6 +15,8 @@ use App\Waybill;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class WeightService
 {
@@ -77,7 +79,13 @@ class WeightService
 
 
         // 5、更新包裹信息
-        $bool = $this->updateOrderPackage($orderPackage, $params, $measuringMachine);
+        try {
+            $bool = $this->updateOrderPackage($orderPackage, $params, $measuringMachine);
+        } catch (\Exception $e) {
+            $result = DB::select('select * from information_schema.innodb_trx');
+            Log::warning("包裹称重",["message"=>json_encode($result),"param"=>json_encode($result)]);
+            return $this->getWeightMessage($orderPackage, $e->getMessage());
+        }
         // 6、称重时间
         if ($bool) $this->afterApply($orderPackage);
         else {