修改代码

app/Http/Model/Logic/OutStoreLogic.php

@@ -178,14 +178,20 @@ class OutStoreLogic
                 $outStoreDetailId = OutStoreDetailModel::insertGetId($value);
                 $outStoreDetailId = OutStoreDetailModel::insertGetId($value);
 
 
                 //is_apply_customs报关任务默认隐藏
                 //is_apply_customs报关任务默认隐藏
-                $pickTaskData = PickTaskLogic::handleInsertData([
+//                $pickTaskData = PickTaskLogic::handleInsertData([
+//                    'out_store_id'=>$outStoreId,'out_store_detail_id'=>$outStoreDetailId,'store_id'=>$insertData['store_id'],
+//                    'pick_task_id'=>$pickTaskId,'is_show'=>empty($insertData['is_apply_customs'])?1:0
+//                ],$value);
+//
+//                foreach ($pickTaskData as $v){
+//                    PickTaskDetailModel::insertGetId($v);
+//                }
+
+                PickTaskDetailModel::insertGetId([
                     'out_store_id'=>$outStoreId,'out_store_detail_id'=>$outStoreDetailId,'store_id'=>$insertData['store_id'],
                     'out_store_id'=>$outStoreId,'out_store_detail_id'=>$outStoreDetailId,'store_id'=>$insertData['store_id'],
                     'pick_task_id'=>$pickTaskId,'is_show'=>empty($insertData['is_apply_customs'])?1:0
                     'pick_task_id'=>$pickTaskId,'is_show'=>empty($insertData['is_apply_customs'])?1:0
-                ],$value);
+                ]);
 
 
-                foreach ($pickTaskData as $v){
-                    PickTaskDetailModel::insertGetId($v);
-                }
             }
             }
 
 
             DB::commit();
             DB::commit();

app/Http/Model/Logic/PickTaskLogic.php

@@ -99,7 +99,7 @@ class PickTaskLogic
 
 
         if (empty($isAllGoods)){
         if (empty($isAllGoods)){
             //判断是当前商品是否是整拣
             //判断是当前商品是否是整拣
-            if (StockModel::where('goods_id',$outStoreDetail['goods_id'])->where('warehousing_sn',$outStoreDetail['warehousing_sn'])->sum('stock') == $returData[0]['numebr']){
+            if (StockModel::where('goods_id',$outStoreDetail['goods_id'])->where('warehousing_sn',$outStoreDetail['warehousing_sn'])->sum('stock') == $returData[0]['number']){
                 $returData[0]['pick_remark'] = '整拣';
                 $returData[0]['pick_remark'] = '整拣';
             }else{
             }else{
                 $returData[0]['pick_remark'] = '拆零';
                 $returData[0]['pick_remark'] = '拆零';
@@ -452,6 +452,7 @@ class PickTaskLogic
     {
     {
         $pickTaskDetailIdArr = $data['pick_task_detail_id_arr'];
         $pickTaskDetailIdArr = $data['pick_task_detail_id_arr'];
 
 
+        self::checkIsPackCheck($pickTaskDetailIdArr,'该单据已经复核，不可再拣货');
 
 
         //获取可以拣货的数据
         //获取可以拣货的数据
         if (empty($pickTaskDetail = PickTaskDetailModel::whereIn('pick_task_detail_id',$pickTaskDetailIdArr)->where('pick_status','=',3)->get()->toArray())){
         if (empty($pickTaskDetail = PickTaskDetailModel::whereIn('pick_task_detail_id',$pickTaskDetailIdArr)->where('pick_status','=',3)->get()->toArray())){