修改代码

app/Http/Controllers/AdminOutstoreController.php

@@ -45,15 +45,10 @@ class AdminOutstoreController extends Controller
         $data = $request->all();
         try{
 
-<<<<<<< HEAD
-            //获取需要修改的货品121
-            if ($data['out_store_detail_id'] == 'all'){
-                $data['out_store_detail_id_arr'] = OutStoreDetailModel::where('out_store_id',$data['out_store_id'])->pluck('out_store_detail_id');
-=======
+
             //获取需要修改的货品
             if ($data['pick_task_detail_id'] == 'all'){
                 $data['pick_task_detail_id_arr'] = PickTaskDetailModel::where('out_store_id',$data['out_store_id'])->whereIn('pick_status',[1,4])->pluck('pick_task_detail_id');
->>>>>>> develop
             }else{
                 $data['pick_task_detail_id_arr'] = [$data['pick_task_detail_id']];
             }

app/Http/Model/Logic/OutStoreLogic.php

@@ -178,19 +178,14 @@ class OutStoreLogic
                 $outStoreDetailId = OutStoreDetailModel::insertGetId($value);
 
                 //is_apply_customs报关任务默认隐藏
-//                $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([
+                $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);
+                }
 
             }
 

storage/laravels.pid

-<<<<<<< HEAD
-92671
-=======
-95547
->>>>>>> develop
+97105
\ No newline at end of file