From c09c67e44448a20112c7eb9b0d6932c6f05a931b Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Thu, 1 Aug 2024 10:01:03 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E5=AD=90=E5=8D=B7?=
 =?UTF-8?q?=E8=B4=A8=E6=A3=80=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/PdmBiSubpackagerelationMapper.xml    | 17 ++++++++++++++++-
 .../PdmBiSubpackagerelationServiceImpl.java     |  9 ++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
index ab0db12e8..c7e67bae2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
@@ -74,7 +74,22 @@
     </select>
     <select id="queryContainerNameBySaleOrder" resultType="org.nl.b_lms.pdm.subpackagerelation.dto.PdmBiSubpackagerelationDto">
             SELECT a.*,
-                   b.*,
+            a.workorder_id,
+            a.package_box_sn,
+            a.quanlity_in_box,
+            a.box_weight,
+            a.sale_order_name,
+            a.customer_name,
+            a.customer_description,
+            a.container_name,
+            a.status,
+            a.box_type,
+            a.sap_pcsn,
+            a.box_group,
+            b.point_status,
+            b.point_code,
+            b.ivt_status,
+            b.is_used,
                    (CASE
                             WHEN c.paper_tube_or_FRP = '1' THEN c.paper_tube_description
                             WHEN c.paper_tube_or_FRP = '2' THEN c.FRP_description END) AS paper_tube_description,
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 b4bf5cb85..41a5c65ed 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
@@ -1,7 +1,6 @@
 package org.nl.b_lms.pdm.subpackagerelation.service.impl;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.StopWatch;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -199,13 +198,17 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
         if (whereJson.get("type").toString().equals(PackageInfoIvtEnum.REQUEST_SOURCE.code("PC"))) {
             //订单号
             if (!whereJson.containsKey("sale_order_name")) {
-                return Collections.emptyList();
+                throw new BadRequestException("订单号不能为空!");
             }
             pdmBiSubpackagerelationList = pdmBiSubpackagerelationMapper.queryContainerNameBySaleOrder(whereJson.get("sale_order_name").toString(), null);
         } else {
             //子卷号
             if (!whereJson.containsKey("container_name")) {
-                return Collections.emptyList();
+                throw new BadRequestException("子卷号不能为空!");
+            }
+            List<BstIvtPackageinfoivt> ivtList = packageinfoivtService.list(new QueryWrapper<BstIvtPackageinfoivt>().eq("container_name", whereJson.get("container_name").toString()).eq("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("合格品")));
+            if (CollectionUtils.isEmpty(ivtList)) {
+                throw new BadRequestException("该子卷未质检或品质不符合要求，请扫码质检!");
             }
             pdmBiSubpackagerelationList = pdmBiSubpackagerelationMapper.queryContainerNameBySaleOrder(null, whereJson.get("container_name").toString());
         }