From 8af4cdbdb52932dca5d16fbce42a2f6fad4e3b8b Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期六, 28 三月 2026 14:59:29 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocDetlMapper.xml |   75 ++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 958190a..05b0f54 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -27,7 +27,7 @@
         <result column="item_num" property="itemNum" />
         <result column="safe_qty" property="safeQty" />
         <result column="weight" property="weight" />
-        <result column="man_length" property="manLength" />
+<!--        <result column="man_length" property="manLength" />-->
         <result column="volume" property="volume" />
         <result column="three_code" property="threeCode" />
         <result column="supp" property="supp" />
@@ -51,6 +51,8 @@
         <result column="box_type1" property="boxType1" />
         <result column="box_type2" property="boxType2" />
         <result column="box_type3" property="boxType3" />
+        <result column="area_id" property="areaId" />
+
     </resultMap>
 
     <sql id="batchSeq">
@@ -124,65 +126,65 @@
             <when test="batch != null and batch != ''">
                 and a.batch = #{batch}
             </when>
-            <otherwise>
-                and (a.batch IS NULL OR a.batch = '')
-            </otherwise>
+<!--            <otherwise>-->
+<!--                and (a.batch IS NULL OR a.batch = '')-->
+<!--            </otherwise>-->
         </choose>
-        <choose>
-            <when test="brand != null and brand != ''">
-                and a.brand = #{brand}
-            </when>
-            <otherwise>
-                and (a.brand IS NULL OR a.brand = '')
-            </otherwise>
-        </choose>
-        <choose>
-            <when test="standby1 != null and standby1 != ''">
-                and a.standby1 = #{standby1}
-            </when>
-            <otherwise>
-                and (a.standby1 IS NULL OR a.standby1 = '')
-            </otherwise>
-        </choose>
+<!--        <choose>-->
+<!--            <when test="brand != null and brand != ''">-->
+<!--                and a.brand = #{brand}-->
+<!--            </when>-->
+<!--&lt;!&ndash;            <otherwise>&ndash;&gt;-->
+<!--&lt;!&ndash;                and (a.brand IS NULL OR a.brand = '')&ndash;&gt;-->
+<!--&lt;!&ndash;            </otherwise>&ndash;&gt;-->
+<!--        </choose>-->
+<!--        <choose>-->
+<!--            <when test="standby1 != null and standby1 != ''">-->
+<!--                and a.standby1 = #{standby1}-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                and (a.standby1 IS NULL OR a.standby1 = '')-->
+<!--            </otherwise>-->
+<!--        </choose>-->
         <choose>
             <when test="standby2 != null and standby2 != ''">
                 and a.standby2 = #{standby2}
             </when>
-            <otherwise>
-                and (a.standby2 IS NULL OR a.standby2 = '')
-            </otherwise>
+<!--            <otherwise>-->
+<!--                and (a.standby2 IS NULL OR a.standby2 = '')-->
+<!--            </otherwise>-->
         </choose>
         <choose>
             <when test="standby3 != null and standby3 != ''">
                 and a.standby3 = #{standby3}
             </when>
-            <otherwise>
-                and (a.standby3 IS NULL OR a.standby3 = '')
-            </otherwise>
+<!--            <otherwise>-->
+<!--                and (a.standby3 IS NULL OR a.standby3 = '')-->
+<!--            </otherwise>-->
         </choose>
         <choose>
             <when test="boxType1 != null and boxType1 != ''">
                 and a.box_type1 = #{boxType1}
             </when>
-            <otherwise>
-                and (a.box_type1 IS NULL OR a.box_type1 = '')
-            </otherwise>
+<!--            <otherwise>-->
+<!--                and (a.box_type1 IS NULL OR a.box_type1 = '')-->
+<!--            </otherwise>-->
         </choose>
         <choose>
             <when test="boxType2 != null and boxType2 != ''">
                 and a.box_type2 = #{boxType2}
             </when>
-            <otherwise>
-                and (a.box_type2 IS NULL OR a.box_type2 = '')
-            </otherwise>
+<!--            <otherwise>-->
+<!--                and (a.box_type2 IS NULL OR a.box_type2 = '')-->
+<!--            </otherwise>-->
         </choose>
         <choose>
             <when test="boxType3 != null and boxType3 != ''">
                 and a.box_type3 = #{boxType3}
             </when>
-            <otherwise>
-                and (a.box_type3 IS NULL OR a.box_type3 = '')
-            </otherwise>
+<!--            <otherwise>-->
+<!--                and (a.box_type3 IS NULL OR a.box_type3 = '')-->
+<!--            </otherwise>-->
         </choose>
     </sql>
     <sql id="batchSeqNew">
@@ -354,6 +356,7 @@
             left join asr_loc_mast b on a.loc_no = b.loc_no
             where 1=1
             and b.loc_sts = 'F'
+            and (b.whs_type is null or b.whs_type != 2)
             <include refid="stockOutCondition"></include>
         ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
     </select>
@@ -365,6 +368,7 @@
         left join asr_loc_mast b on a.loc_no = b.loc_no
         where 1=1
         and b.loc_sts = 'F'
+        and (b.whs_type is null or b.whs_type != 2)
         <include refid="stockOutCondition"></include>
     </select>
 
@@ -550,6 +554,7 @@
                 #{item}
             </foreach>
         </if>
+            and b.deleted = 0 and b.frozen = 0
 
         order by
         DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme

--
Gitblit v1.9.1