修改

app/Http/Controllers/Api/TestController.php

@@ -3,7 +3,12 @@
 namespace App\Http\Controllers\Api;
 
 
+use App\Service\Box\BoxService;
+
 class TestController extends BaseController
 {
-
+    public function delTestQ(){
+        (new BoxService())->delBoxLock();
+        dd(1);
+    }
 }

app/Service/Box/BoxService.php

@@ -89,7 +89,10 @@ class BoxService extends Service
                 $detail = $num_list['detail'];
                 $team_id = $num_list['team_id'];
                 $un_box_num = bcsub($v['dispatch_complete_quantity'] , $v['box_num'],3);
-                if ($total > $un_box_num) return [false, $v['product_title'] . ' ' . $v['technology_name'] . ' 可包装的数量不足'];
+                if ($total > $un_box_num) {
+                    $this->dellimitingSendRequestBackgNeed($limit_key);
+                    return [false, $v['product_title'] . ' ' . $v['technology_name'] . ' 可包装的数量不足'];
+                }
 
                 $ext_1 = $v['product_no'];//产品编号
                 $ext_2 = $v['technology_material']; //工艺材质 废弃
@@ -192,11 +195,11 @@ class BoxService extends Service
             }
 
             //更新完工数量
-            list($status, $msg) = $this->updateFinish($product_list,$key_list);
+            list($status, $msg1) = $this->updateFinish($product_list,$key_list);
             if(! $status) {
                 $this->dellimitingSendRequestBackgNeed($limit_key);
                 DB::rollBack();
-                return [false,$msg];
+                return [false,$msg1];
             }
 
             //用友 ------产成品入库
@@ -214,13 +217,17 @@ class BoxService extends Service
             DB::commit();
             $this->dellimitingSendRequestBackgNeed($limit_key);
             return [true, ['package_data' => $package_data]];
-        }catch (\Exception $e){
+        }catch (\Throwable $e){
             DB::rollBack();
             $this->dellimitingSendRequestBackgNeed($limit_key);
             return [false,$e->getLine().':'.$e->getMessage()];
         }
     }
 
+    public function delBoxLock(){
+        $this->dellimitingSendRequestBackgNeed($this->lock_key);
+    }
+
     public function updateFinish($production_list = [], $map){
         if(empty($production_list)) return [true,''];
 
@@ -431,7 +438,7 @@ class BoxService extends Service
     }
 
     /**
-     * 根据发货单包装（恒诚塑业不需要 如果有调用 直接返回）
+     * 根据发货单包装（恒成塑业不需要 如果有调用 直接返回）
      * @param $data
      * @return array
      */
@@ -779,9 +786,13 @@ class BoxService extends Service
             }
         }
 
-        $list = $list->select('top_order_no','order_no','crt_time','shipment_order_no')->where('del_time',0)
+        $list = $list->select('top_order_no','order_no as box_no','crt_time','shipment_order_no')->where('del_time',0)
             ->get()->toArray();
 
+        foreach ($list as $key => $value){
+            $list[$key]['crt_time'] = date('Y-m-d H:i:s',$value['crt_time']);
+        }
+
         return [true,$list];
     }
 

app/Service/DispatchService.php

@@ -455,6 +455,7 @@ class DispatchService extends Service
         if(isset($data['finished_num'])) $model->where('finished_num', '>',0);
         if(! empty($data['order_no'])) $model->where('order_no', 'LIKE', '%'.$data['order_no'].'%');
         if(! empty($data['dispatch_no'])) $model->where('dispatch_no', 'LIKE', '%'.$data['dispatch_no'].'%');
+        if(! empty($data['out_order_no'])) $model->where('out_order_no', 'LIKE', '%'.$data['out_order_no'].'%');
         if(! empty($data['process_id'])) $model->where('process_id',$data['process_id']);
         if(! empty($data['technology_material'])) $model->where('technology_material', 'LIKE', '%'.$data['technology_material'].'%');
         if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) $model->whereBetween('crt_time',[$data['crt_time'][0],$data['crt_time'][1]]);

app/Service/FyySqlServerService.php

@@ -31,14 +31,14 @@ class FyySqlServerService extends Service
         try {
             //用户信息校验
             if (empty($user_id['id'])) {
-                $this->error = '恒诚塑业数据库连接用户参数不能为空！';
+                $this->error = '恒成塑业数据库连接用户参数不能为空！';
                 return;
             }
 
             //获取用友账号密码
             $emp = Employee::where('id', $user_id['id'])->select('sqlserver_account', 'sqlserver_password')->first();
             if (empty($emp) || empty($emp->sqlserver_account)) {
-                $this->error = '恒诚塑业连接构造失败,未找到账号对应的用友账号信息';
+                $this->error = '恒成塑业连接构造失败,未找到账号对应的用友账号信息';
                 return;
             }
 
@@ -304,9 +304,9 @@ class FyySqlServerService extends Service
         if (! empty($this->error)) return [false, $this->error];
 
         if ($bredvouch) {
-            $cmemo = '来源:恒诚塑业完工操作撤回';
+            $cmemo = '来源:恒成塑业完工操作撤回';
         } else {
-            $cmemo = '来源:恒诚塑业包装操作 包装单号:' . $data['order_no'];
+            $cmemo = '来源:恒成塑业包装操作 包装单号:' . $data['order_no'];
         }
 
         //数据
@@ -383,9 +383,9 @@ class FyySqlServerService extends Service
         if (!empty($this->error)) return [false, $this->error];
 
         if ($bredvouch) {
-            $cmemo = '来源:恒诚塑业发货出库操作（撤回）';
+            $cmemo = '来源:恒成塑业发货出库操作（撤回）';
         } else {
-            $cmemo = '来源:恒诚塑业发货出库操作';
+            $cmemo = '来源:恒成塑业发货出库操作';
         }
         foreach ($data as $value) {
             $bodys_tmp = [];

routes/api.php

@@ -28,6 +28,7 @@ Route::any('ttt','Api\TestController@ttt');
 Route::any('tttt','Api\TestController@tttt');
 Route::any('getProductionOrder/{file_name}','Api\ProductionOrderController@getItemFile');
 Route::any('getCloudData','Api\CloudDataController@getCloudData');
+Route::any('delTestQ','Api\TestController@delTestQ');
 
 Route::any('output_value','Api\ScreenController@output_value');
 Route::any('order_process1','Api\ScreenController@order_process1');