增加箱号和卡板号的判断

app/Http/Controllers/OutstoreController.php

@@ -70,7 +70,7 @@ class OutstoreController extends Controller
     {
     {
         $data = $request->all();
         $data = $request->all();
         try{
         try{
-            $data['pick_task_detail_id_arr'] = PickTaskLogic::getPickTaskDetailList($data);
+            $data['pick_task_detail_id_arr'] = PalletLogic::getPalletBoxPatailPickTaskDetailIdArr($data,0);
             $returnData = (new PalletLogic())->confirmOutStore($data);
             $returnData = (new PalletLogic())->confirmOutStore($data);
         }catch (\Exception $exception){
         }catch (\Exception $exception){
             if (empty(self::$errCode))self::$errCode=101;
             if (empty(self::$errCode))self::$errCode=101;
@@ -84,8 +84,7 @@ class OutstoreController extends Controller
     {
     {
         $data = $request->all();
         $data = $request->all();
         try{
         try{
-            //获取所有的out_store_detail_id
-            $data['pick_task_detail_id_arr'] = PickTaskLogic::getPickTaskDetailList($data);
+            $data['pick_task_detail_id_arr'] = PalletLogic::getPalletBoxPatailPickTaskDetailIdArr($data,1);
             $returnData = (new PalletLogic())->cancelOutStore($data);
             $returnData = (new PalletLogic())->cancelOutStore($data);
         }catch (\Exception $exception){
         }catch (\Exception $exception){
             if (empty(self::$errCode))self::$errCode=101;
             if (empty(self::$errCode))self::$errCode=101;

app/Http/Model/Logic/PalletLogic.php

@@ -92,7 +92,7 @@ class PalletLogic
 
 
 
 
     //获取当前卡板的箱号任务ID
     //获取当前卡板的箱号任务ID
-    public function getPalletBoxPatailPickTaskDetailIdArr($data,$isConfirm=0)
+    static public function getPalletBoxPatailPickTaskDetailIdArr($data,$isConfirm=0)
     {
     {
         $palletId = PalletModel::where('pallet_sn',$data['pallet_sn'])->value('pallet_id');
         $palletId = PalletModel::where('pallet_sn',$data['pallet_sn'])->value('pallet_id');
         if (empty($palletId)){
         if (empty($palletId)){
@@ -111,7 +111,7 @@ class PalletLogic
 
 
 
 
     //确认出库
     //确认出库
-    public function confirmOutStore($data)
+    static public function confirmOutStore($data)
     {
     {
         $outStoreDetailIdArr = $data['pick_task_detail_id_arr'];
         $outStoreDetailIdArr = $data['pick_task_detail_id_arr'];
 
 

app/Http/Model/Logic/PickTaskLogic.php

@@ -486,7 +486,7 @@ class PickTaskLogic
     }
     }
 
 
     //获取拣货任务明细列表
     //获取拣货任务明细列表
-    static public function getPickTaskDetailList($data)
+    public function getPickTaskDetailList($data)
     {
     {
         $palletId = PalletModel::where('pallet_sn',$data['pallet_box_sn'])->value('pallet_id');
         $palletId = PalletModel::where('pallet_sn',$data['pallet_box_sn'])->value('pallet_id');