修复一些错误

app/Http/Model/Logic/PalletLogic.php

@@ -155,7 +155,7 @@ class PalletLogic
 
 
         if (!isset($data['is_apply_customs_app'])){
         if (!isset($data['is_apply_customs_app'])){
             //是否需要报关
             //是否需要报关
-            if (OutStoreDetailModel::whereIn('out_store_detail_id',$outStoreDetailIdArr)->value('is_apply_customs') && (empty($data['weigh_val']))){
+            if (OutStoreDetailModel::whereIn('out_store_detail_id',$outStoreDetailIdArr)->value('is_apply_customs') ){
                 throw new \Exception('报关单据不可在此发货');
                 throw new \Exception('报关单据不可在此发货');
             }
             }
         }
         }
@@ -329,7 +329,7 @@ class PalletLogic
         }
         }
 
 
         //获取拣货任务中已经有的箱子信息
         //获取拣货任务中已经有的箱子信息
-        $boxIdArr = OutStoreDetailModel::getWhereObj([])->where('pallet_id',$palletId)->pluck('box_id');
+        $boxIdArr = PickTaskDetailModel::getWhereObj([])->where('pallet_id',$palletId)->pluck('box_id');
 
 
         if (empty($boxIdArr)){
         if (empty($boxIdArr)){
             throw new \Exception('当前卡板并没有箱子');
             throw new \Exception('当前卡板并没有箱子');
@@ -343,7 +343,7 @@ class PalletLogic
         }
         }
 
 
         foreach ($boxData as $key=>$val){
         foreach ($boxData as $key=>$val){
-            $boxData[$key]['warehousing_sn'] = OutStoreDetailModel::getWhereObj([])->where('box_id',$val['box_id'])->value('warehousing_sn');
+            $boxData[$key]['warehousing_sn'] = OutStoreDetailModel::where('out_store_detail_id',PickTaskDetailModel::where('box_id',$val['box_id'])->value('out_store_detail_id'))->value('warehousing_sn');
         }
         }
 
 
         return [
         return [
@@ -365,20 +365,20 @@ class PalletLogic
             throw new \Exception('该拣货任务不存在');
             throw new \Exception('该拣货任务不存在');
         }
         }
 
 
-        $outStoreDetailData = OutStoreDetailModel::where('pick_task_id',$pickTask)->get()->toArray();
-        if (empty($outStoreDetailData)){
+        $picktaskDetailArr = PickTaskDetailModel::where('pick_task_id',$pickTask)->get()->toArray();
+        if (empty($picktaskDetailArr)){
             throw new \Exception('该拣货任务不存在');
             throw new \Exception('该拣货任务不存在');
         }
         }
 
 
-        foreach ($outStoreDetailData as $key=>$value){
-            $value = array_merge(PickTaskDetailModel::where('out_store_detail_id',$value['out_store_detail_id'])->first()->toArray(),$value);
-            $outStoreDetailData[$key] = CommonLogic::getHaveKeyCn($value);
+        foreach ($picktaskDetailArr as $key=>$value){
+            $value = array_merge(OutStoreDetailModel::where('out_store_detail_id',$value['out_store_detail_id'])->first()->toArray(),$value);
+            $picktaskDetailArr[$key] = CommonLogic::getHaveKeyCn($value);
         }
         }
 
 
-        return $outStoreDetailData;
+        return $picktaskDetailArr;
     }
     }
 
 
-    //获取打印的拣货任务信息
+    //获取打印的拣货任务标签
     public function print_pick_task_label($data)
     public function print_pick_task_label($data)
     {
     {
         //查询当前卡板
         //查询当前卡板
@@ -434,7 +434,7 @@ class PalletLogic
     }
     }
 
 
 
 
-    //获取打印的拣货任务信息
+    //获取打印的卡板标签
     public function print_pallet_label($data)
     public function print_pallet_label($data)
     {
     {
         //查找拣货任务ID
         //查找拣货任务ID

scm_wms_common @ 64218b25

-Subproject commit b7a43f3b5c302da482e01750ff029be3d00d069e
+Subproject commit 64218b258abb792578ff19cc0270d218625a734a