From bcb19e8c93c3cabf0d8eb3ee34ed819b3c5a10ef Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 25 十一月 2024 13:14:11 +0800
Subject: [PATCH] #优化地图

---
 src/main/resources/mapper/LocDetlMapper.xml |   63 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index d95340d..5dcc275 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -64,15 +64,32 @@
         where 1=1
         and loc_no = #{locNo}
         and matnr = #{matnr}
+        and (batch IS NULL OR batch = '')
         <choose>
             <when test="suppCode != null and suppCode != ''">
                 and supp_code = #{suppCode}
             </when>
-            <otherwise>
-                and (supp_code IS NULL OR supp_code = '')
-            </otherwise>
+<!--            <otherwise>-->
+<!--                and (supp_code IS NULL OR supp_code = '')-->
+<!--            </otherwise>-->
         </choose>
         <include refid="batchSeq"></include>
+    </select>
+
+    <select id="selectItemByOrderNo" resultMap="BaseResultMap">
+        select * from asr_loc_detl
+        where 1=1
+        and loc_no = #{locNo}
+        and matnr = #{matnr}
+        <if test="batch!=null and batch!='' ">
+            and batch = #{batch}
+        </if>
+        <if test="csocode!=null and csocode!='' ">
+            and three_code = #{csocode}
+        </if>
+        <if test="isocode!=null and isocode!='' ">
+            and dead_time = #{isocode}
+        </if>
     </select>
 
     <delete id="deleteItem">
@@ -81,6 +98,7 @@
         and loc_no = #{locNo}
         and matnr = #{matnr}
         <include refid="batchSeq"></include>
+        <include refid="locdetlCondition"></include>
     </delete>
 
     <update id="updateAnfme">
@@ -90,8 +108,21 @@
         where 1=1
         and loc_no = #{locNo}
         and matnr = #{matnr}
+        <include refid="locdetlCondition"></include>
         <include refid="batchSeq"></include>
     </update>
+
+    <sql id="locdetlCondition">
+        <if test="threeCode!=null and threeCode!='' ">
+            and three_code = #{threeCode}
+        </if>
+        <if test="suppCode!=null and suppCode!='' ">
+            and supp_code = #{suppCode}
+        </if>
+        <if test="deadTime!=null and deadTime!='' ">
+            and dead_time = #{deadTime}
+        </if>
+    </sql>
 
     <sql id="stockOutCondition">
         <if test="loc_no!=null and loc_no!='' ">
@@ -166,9 +197,12 @@
         ROW_NUMBER() over (order by sum(a.anfme) desc) as row
         , a.matnr
         , sum(a.anfme) as anfme
+        , a.maktx
+        , a.specs
+        , model
         from asr_loc_detl a
         where 1=1
-        group by a.matnr
+        group by a.matnr,a.maktx,a.specs,model
     </select>
 
     <select id="selectPakoutByRule" resultMap="BaseResultMap">
@@ -329,6 +363,27 @@
         ORDER BY lm.modi_time ASC
     </select>
 
+    <select id="selectSameLevDetl" resultType="java.lang.String">
+        SELECT
+            ld.loc_no
+        FROM asr_loc_detl ld
+                 LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no
+                 LEFT JOIN (
+            select
+                loc_no,
+                count(1) as count
+            from asr_loc_detl
+            where 1=1
+            group by loc_no
+        ) dual on dual.loc_no = lm.loc_no
+        WHERE 1 = 1
+          AND ld.matnr = #{matnr}
+          AND (lm.loc_sts = 'F')
+          AND dual.count = 1
+          AND lm.lev1 = #{lev}
+        ORDER BY lm.modi_time ASC
+    </select>
+
     <select id="searchByLike" resultMap="BaseResultMap">
         select *
         from asr_loc_detl

--
Gitblit v1.9.1