From 68e5217822c940e4be902b23ee62403c52d7c442 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Thu, 1 Aug 2024 18:40:45 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E5=A2=9E=E5=8A=A0=E5=AD=90=E5=8D=B7?=
 =?UTF-8?q?=E9=87=8D=E9=87=8F=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PdmBiSubpackagerelationServiceImpl.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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 a8ed3583e..1dbe4fa4b 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
@@ -210,6 +210,9 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             if (CollectionUtils.isEmpty(ivtList)) {
                 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()
@@ -220,8 +223,8 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             //            int containerLength = getMaxNum(null, r.getPaper_tube_description());
             //            r.setUn_plan_product_property3(Integer.toString(containerLength));
             if (whereJson.get("type").toString().equals(PackageInfoIvtEnum.REQUEST_SOURCE.code("PC"))) {
-            //                r.setWeight(r.getWeight() != null ? r.getPaper_weight() : "0");
-            //                r.setPaper_weight(r.getPaper_weight() != null ? r.getPaper_weight() : "0");
+                //                r.setWeight(r.getWeight() != null ? r.getPaper_weight() : "0");
+                //                r.setPaper_weight(r.getPaper_weight() != null ? r.getPaper_weight() : "0");
                 if (r.getBox_group() != null) {
                     r.setQuanlity_in_box(BigDecimal.valueOf(countByGroup.getOrDefault(r.getBox_group(), null)));
                 } else {
@@ -326,7 +329,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             if (totalWeight.compareTo(new BigDecimal(0)) == 0) {
                 throw new BadRequestException("分切计划的子卷重量不能为0");
             }
-            // outBox(workIdList, containerNameList, deviceCode, maxBoxGroup,whereJson,totalWeight);
+            outBox(workIdList, containerNameList, deviceCode, maxBoxGroup,whereJson,totalWeight);
         } catch (Exception e) {
             throw new BadRequestException(e.getMessage());
         }