From 971dc3eb422fb38ffe8205ed60283c85036fde36 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 03 九月 2025 17:10:58 +0800
Subject: [PATCH] 许可证有效期”改成“仓储系统许可有效期

---
 src/main/resources/mapper/OrderDetlMapper.xml |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 99ccde1..6986656 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -45,6 +45,11 @@
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
         <result column="memo" property="memo" />
+        <result column="owner" property="owner" />
+        <result column="payment" property="payment" />
+        <result column="uuid" property="uuid" />
+        <result column="source_loc_name" property="sourceLocName" />
+        <result column="target_loc_name" property="targetLocName" />
 
     </resultMap>
 
@@ -68,7 +73,7 @@
         where 1=1
         and order_no = #{orderNo}
         and matnr = #{matnr}
-        <if test="batch!=null">
+        <if test="batch!=null and batch!=''">
             and batch = #{batch}
         </if>
     </select>
@@ -82,7 +87,7 @@
 
     <sql id="pakOutPageCondition">
         <if test="order_id!=null and order_id!='' ">
-            and mod.order_id like '%' + #{order_id} + '%'
+            and mod.order_id = #{order_id}
         </if>
         <if test="matnr!=null and matnr!='' ">
             and mod.matnr like '%' + #{matnr} + '%'
@@ -127,10 +132,18 @@
     <select id="checkAllDetlFinish" resultType="java.lang.Integer">
         SELECT count(*) From man_order_detl WHERE qty &lt; anfme and order_no = #{orderNo}
     </select>
+    <select id="sameOrderComb" resultType="java.lang.Integer">
+        SELECT SUM(anfme) FROM cust_wait_pakin WHERE  1=1
+        <if test="orderNo!=null and orderNo!='' ">
+            and order_no like '%' + #{orderNo} + '%'
+        </if>
+        and matnr = #{matnr}
+        and batch = #{batch}
+    </select>
 
     <update id="increase">
         update man_order_detl
-        set qty = qty + #{qty}
+        set work_qty = work_qty + #{workQty}
         where 1=1
         and order_id = #{orderId}
         and matnr = #{matnr}
@@ -146,7 +159,7 @@
 
     <update id="decrease">
         update man_order_detl
-        set work_qty = work_qty - #{qty}
+        set work_qty = work_qty - #{workQty}
         where 1=1
         and order_no = #{orderNo}
         and matnr = #{matnr}

--
Gitblit v1.9.1