From dc9228656b202a8f1ec7720d78eb0421a94a28c9 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 23 十月 2025 16:20:14 +0800
Subject: [PATCH] 聚乳酸明细增加丙交酯含量,%指标

---
 src/main/resources/mapper/ManLocDetlMapper.xml |   34 +++++++++++++++++++---------------
 1 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml
index 4715759..84cdcf6 100644
--- a/src/main/resources/mapper/ManLocDetlMapper.xml
+++ b/src/main/resources/mapper/ManLocDetlMapper.xml
@@ -29,6 +29,7 @@
         <result column="create_time" property="createTime" />
         <result column="update_by" property="updateBy" />
         <result column="modi_time" property="modiTime" />
+        <result column="produce_time" property="produceTime" />
         <result column="memo" property="memo" />
         <result column="owner" property="owner" />
         <result column="payment" property="payment" />
@@ -349,15 +350,10 @@
         select top 1 * from man_loc_detl
         where loc_no=#{LocNo}
         and 1=1
-        and matnr=#{Matnr}
-        <choose>
-            <when test="batch != null and batch != ''">
-                and batch = #{batch}
-            </when>
-            <otherwise>
-                and (batch IS NULL OR batch = '')
-            </otherwise>
-        </choose>
+        and matnr=#{matnr}
+        <if test="batch != null and batch !='' ">
+          and  batch like '%' + #{batch} + '%'
+        </if>
     </select>
     <sql id="selectAllWarningSql">
         <if test="locNo!=null and locNo!='' ">
@@ -378,17 +374,19 @@
         FROM
         (
         SELECT
-        loc_no,
+        DISTINCT loc_no,
         locd.matnr,
         locd.maktx,
-        create_time,
+        locd.owner,
+        locd.batch,
+        produce_time as create_time,
+        produce_time,
         locd.specs,
         locd.unit,
         inventory_max,
         inventory_min,
         inventory_age_max,
-        count_anfme,
-        DATEDIFF( DAY, create_time, GETDATE( ) ) AS [diff_time]
+        DATEDIFF( DAY, produce_time, GETDATE( ) ) AS [diff_time]
         FROM
         man_loc_detl locd
         LEFT JOIN (
@@ -403,10 +401,10 @@
         count_anfme
         FROM
         man_mat
-        RIGHT JOIN ( SELECT matnr, SUM ( anfme ) AS count_anfme FROM man_loc_detl loc GROUP BY matnr ) aa ON aa.matnr = man_mat.matnr
+        RIGHT JOIN ( SELECT matnr,batch,owner, SUM ( anfme ) AS count_anfme FROM man_loc_detl loc GROUP BY matnr,batch,owner ) aa ON aa.matnr = man_mat.matnr
         ) warn ON locd.matnr = warn.matnr
         WHERE
-        DATEDIFF( DAY, create_time, GETDATE( ) ) > inventory_age_max
+        DATEDIFF( DAY, produce_time, GETDATE( ) ) > inventory_age_max
         OR count_anfme > inventory_max
         OR count_anfme &lt; inventory_min
         ) t
@@ -424,6 +422,9 @@
         where 1=1
         and b.loc_sts = 'F'
         and a.matnr = #{matnr}
+        <if test="batch != null || batch != ''">
+            and a.batch = #{batch}
+        </if>
 
     </select>
     <delete id="deleteDatailed">
@@ -448,6 +449,9 @@
         where 1=1
         and loc_no = #{locNo}
         and matnr = #{matnr}
+        <if test="batch != null || batch != ''">
+            and batch = #{batch}
+        </if>
 <!--        <choose>-->
 <!--            <when test="batch != null and batch!=''  ">-->
 <!--                and batch = #{batch}-->

--
Gitblit v1.9.1