From e0ffdb9ece998fb3dd5ed497ba1dff8ab6749e30 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期一, 29 十二月 2025 20:36:15 +0800
Subject: [PATCH] 海康rcs系统可能会多次上报导致库位状态不对

---
 src/main/resources/mapper/OrderDetlMapper.xml |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 7b50892..62d230b 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -101,6 +101,14 @@
         where 1=1
         and order_no = #{orderNo}
         and matnr = #{matnr}
+        <choose>
+            <when test="batch != null and batch != ''">
+                and batch = #{batch}
+            </when>
+            <otherwise>
+                and (batch IS NULL OR batch = '')
+            </otherwise>
+        </choose>
         <if test="threeCode!=null and threeCode!='' ">
             and three_code = #{threeCode}
         </if>
@@ -337,4 +345,21 @@
         <include refid="pakOutPageCondition"></include>
     </select>
 
+    <select id="getReportDetl" resultType="String">
+        select DISTINCT o.order_no
+        from man_order_detl d
+                 join man_order o on o.id = d.order_id
+        where o.doc_type = #{docType}
+          and d.qty > ISNULL(d.report_qty, 0)
+          and d.qty > 0
+    </select>
+
+
+    <select id="listAutoDetl" resultMap="BaseResultMap">
+        select DISTINCT o.order_no
+        from man_order_detl d
+                 join man_order o on d.id = d.order_id
+        where d.dev_no = #{devNo}
+        order by d.create_time asc
+    </select>
 </mapper>

--
Gitblit v1.9.1