From faab40b28c06b1aec031d057d0751b6df597713b Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 25 Nov 2025 10:15:07 +0800
Subject: [PATCH] =?UTF-8?q?2025-11-25=20=E8=BF=87=E7=AB=99=E9=87=87?=
 =?UTF-8?q?=E9=9B=86-=E3=80=8B=E6=9D=90=E6=96=99=E4=B8=8A=E6=9C=BA?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=E5=92=8C?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gaotao/modules/boxManage/data/SoReceiveCasesData.java  | 2 ++
 .../com/gaotao/modules/boxManage/entity/SoReceiveCases.java    | 2 ++
 .../modules/schedule/service/impl/ScheduleServiceImpl.java     | 2 +-
 src/main/resources/mapper/schedule/ScheduleMapper.xml          | 3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
index d6c57ad..6644901 100644
--- a/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
+++ b/src/main/java/com/gaotao/modules/boxManage/data/SoReceiveCasesData.java
@@ -64,6 +64,8 @@ public class SoReceiveCasesData extends SoReceiveCases {
 
 
 
+
+
 
 
 
diff --git a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
index 79c3444..0c8a9b5 100644
--- a/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
+++ b/src/main/java/com/gaotao/modules/boxManage/entity/SoReceiveCases.java
@@ -203,6 +203,8 @@ public class SoReceiveCases {
 
 
 
+
+
 
 
 
diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
index 00937ca..893c59c 100644
--- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java
@@ -1417,7 +1417,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         //查询bom行数据
         List<Map<String, Object>> resultList = scheduleMapper.getBomItemNosByPartNo(inData);
         //判断是否存在
-        if (resultList.size() == 0) {
+        if (resultList.isEmpty()) {
             throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200166) + inData.getOrderNo() + "/" + cRollInfo.getPartNo());
         }
         return resultList;
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index c327457..d5f000e 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -1318,7 +1318,7 @@
         cri.orderref3        orderRef3,
         case when  cri.status='冻结' then 'Y' else 'N' end     frozenFlag
         FROM inventory_stock cri
-        LEFT JOIN Part part ON part.Site = cri.site AND part.PartNo = cri.part_no
+        inner JOIN Part part ON part.Site = cri.site AND part.PartNo = cri.part_no
         WHERE cri.site = #{site}
         AND cri.roll_no = #{rmRollNo}
     </select>
@@ -1329,6 +1329,7 @@
                OrderNo                              orderNo,
                CONVERT(INT, ItemNo)                 itemNo,
                ComponentPartNo                      partNo,
+               dbo.Get_PartDesc(Site, ComponentPartNo) partDesc,
                QtyAssembly                          qtyAssembly,
                QtyFixedScrapt                       qtyFixedScrapt,
                ScraptFactor                         scraptFactor,