From 4648570e7760e452b0fcdfd10dcb4d8bba959913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Thu, 28 Aug 2025 13:11:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedule/mapper/ScheduleMapper.java       |  2 +-
 .../service/impl/ScheduleServiceImpl.java     |  2 +-
 .../mapper/schedule/ScheduleMapper.xml        | 21 +++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
index 7212789..a68e407 100644
--- a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
+++ b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java
@@ -317,7 +317,7 @@ public interface ScheduleMapper {
      * @return com.gaotao.modules.schedule.data.CRollInfoOutData
      **/
     CRollInfoOutData getCRollInfoByRollNo(SearchScheduleData inData);
-
+    CRollInfoOutData getInventoryStockByRollNo(SearchScheduleData inData);
     /**
      * @Author LR
      * @Description 根据工单和物料自动获取bom行数据
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 fdd2b1a..9c2cc52 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
@@ -1313,7 +1313,7 @@ public class ScheduleServiceImpl implements ScheduleService {
     @Override
     public List<Map<String, Object>> getBomItemNosByPartNo(SearchScheduleData inData) {
         //首先查询当前的材料卷号数据
-        CRollInfoOutData cRollInfo = scheduleMapper.getCRollInfoByRollNo(inData);
+        CRollInfoOutData cRollInfo = scheduleMapper.getInventoryStockByRollNo(inData);
         //判断是否存在
         if (null == cRollInfo) {
             throw new XJException(sysMsgService.getLanguageMsg(SysMsgConstant.OBJECT_ID_200165));
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index 9f1b446..2ae77ae 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -993,6 +993,27 @@
         WHERE cri.site = #{site}
           AND cri.rollno = #{rmRollNo}
     </select>
+    <!--根据条件或者材料卷数据-->
+    <select id="getInventoryStockByRollNo" parameterType="SearchScheduleData" resultType="CRollInfoOutData">
+        SELECT cri.roll_no           rollNo,
+        cri.part_no           partNo,
+        part.PartDescription partDesc,
+        '合格卷'        rollType,
+        '0'      rollTypeDb,
+        status               status,
+        cri.status_tb        statusDb,
+        cri.qty_on_hand          rollQty,
+        cri.site,
+        cri.orderref0       orderRefType,
+        cri.orderref1        orderRef1,
+        cri.orderref2        orderRef2,
+        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
+        WHERE cri.site = #{site}
+        AND cri.roll_no = #{rmRollNo}
+    </select>
 
     <!--根据工单和物料自动获取bom行数据-->
     <select id="getBomItemNosByPartNo" parameterType="SearchScheduleData" resultType="java.util.HashMap">