From 3a23d4aac93606ba3393ed05df1527e9315c0c78 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Thu, 9 Jan 2025 15:36:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pda/controller/ProductOutTwoController.java     |  3 ++-
 .../impl/PdmBiSubpackagerelationServiceImpl.java    | 13 ++++++++-----
 .../iostorInv/util/impl/InBoxManageServiceImpl.java |  3 ---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java
index d8b1d41b6..f3c5c7786 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java
@@ -5,6 +5,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.b_lms.pda.service.ProductOutTwoService;
+import org.nl.common.TableDataInfo;
 import org.nl.modules.logging.annotation.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -79,7 +80,7 @@ public class ProductOutTwoController {
     @Log("avg取货点放行")
     @SaIgnore
     public ResponseEntity<Object> woodenBoxPoint(@RequestBody JSONObject whereJson) {
-        return new ResponseEntity<>(productOutTwoService.woodenBoxPoint(whereJson), HttpStatus.OK);
+        return new ResponseEntity<>(TableDataInfo.build(productOutTwoService.woodenBoxPoint(whereJson)), HttpStatus.OK);
     }
 
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
index 804dfe051..bfeb43f11 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
@@ -181,9 +181,9 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             if (ObjectUtils.isEmpty(ivtList)) {
                 throw new BadRequestException("该子卷未质检或品质不符合要求，请扫码质检!");
             }
-            if (ivtList.stream().noneMatch(r -> r.getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("待检区")))) {
-                throw new BadRequestException("该子卷不在待检区，请检查！");
-            }
+//            if (ivtList.stream().noneMatch(r -> r.getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("待检区")))) {
+//                throw new BadRequestException("该子卷不在待检区，请检查！");
+//            }
             pdmBiSubpackagerelationList = pdmBiSubpackagerelationMapper.queryContainerNameBySaleOrder(null, whereJson.get("container_name").toString());
         }
         Map<String, Long> countByGroup = pdmBiSubpackagerelationList.stream()
@@ -345,6 +345,9 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             throw new BadRequestException("当前木箱"+subList.get(0).getQuanlity_in_box()+"要装箱的子卷"+split.length+"未装完");
         }
         String boxSn = subList.get(0).getPackage_box_sn();
+        //子卷到装箱区
+        agvTransfer(containers, deviceCode, boxSn);
+
         // 查询木箱对应的托盘号
         JSONObject jsonVeExt = WQLObject.getWQLObject("md_pb_storagevehicleext").query("pcsn = '" + boxSn + "'")
                 .uniqueResult(0);
@@ -396,8 +399,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         jsonTaskParam.put("request_param", request_param.toString());
         TwoOutBoxTask taskBean = new TwoOutBoxTask();
         taskBean.createTask(jsonTaskParam);
-        //子卷到装箱区
-        agvTransfer(containers, deviceCode, boxSn);
+
         taskBean.immediateNotifyAcs(null);
     }
 
@@ -666,6 +668,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         List<BstIvtPackageinfoivt> djqPoints = djqPointList.stream()
                 .filter(r -> containerNameList.contains(r.getContainer_name()))
                 .collect(Collectors.toList());
+
         //任务组id
         String groupId = deviceCode.substring(deviceCode.indexOf("_") + 1, deviceCode.indexOf("_", deviceCode.indexOf("_") + 1));
         String now = DateUtil.now();
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
index 801da37b2..986f1c2d0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
@@ -268,9 +268,6 @@ public class InBoxManageServiceImpl implements InBoxManageService {
             apply_jo.put("container_type", vehicle_type);
             acsToWmsService.applyTwo(apply_jo);
         } else {
-            if (split.length>data.getIntValue("qty")){
-                throw new BadRequestException("当前拆叠盘托盘不足"+split.length+"个");
-            }
             if (!data.getString("container_type").equals(vehicle_type)) {
                 if (data.getString("container_type").equals("0")) {
                     throw new BadRequestException("当前电气反馈的托盘类型为0，请检查！");