From bfa307fb0fe82ce6f5a2ea354fcee43d9d1f0fa1 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 13 四月 2026 09:53:06 +0800
Subject: [PATCH] no message
---
src/main/resources/mapper/LocDetlMapper.xml | 307 ++------------------------------------------------
1 files changed, 14 insertions(+), 293 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index f8ecfc8..e27407c 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -55,22 +55,6 @@
<sql id="batchSeq">
<choose>
- <when test="batch != null and batch != ''">
- and d.batch = #{batch}
- </when>
- <otherwise>
- and (d.batch IS NULL OR d.batch = '')
- </otherwise>
- </choose>
- <choose>
- <when test="brand != null and brand != ''">
- and d.brand = #{brand}
- </when>
- <otherwise>
- and (d.brand IS NULL OR d.brand = '')
- </otherwise>
- </choose>
- <choose>
<when test="standby1 != null and standby1 != ''">
and d.standby1 = #{standby1}
</when>
@@ -78,64 +62,8 @@
and (d.standby1 IS NULL OR d.standby1 = '')
</otherwise>
</choose>
- <choose>
- <when test="standby2 != null and standby2 != ''">
- and d.standby2 = #{standby2}
- </when>
- <otherwise>
- and (d.standby2 IS NULL OR d.standby2 = '')
- </otherwise>
- </choose>
- <choose>
- <when test="standby3 != null and standby3 != ''">
- and d.standby3 = #{standby3}
- </when>
- <otherwise>
- and (d.standby3 IS NULL OR d.standby3 = '')
- </otherwise>
- </choose>
- <choose>
- <when test="boxType1 != null and boxType1 != ''">
- and d.box_type1 = #{boxType1}
- </when>
- <otherwise>
- and (d.box_type1 IS NULL OR d.box_type1 = '')
- </otherwise>
- </choose>
- <choose>
- <when test="boxType2 != null and boxType2 != ''">
- and d.box_type2 = #{boxType2}
- </when>
- <otherwise>
- and (d.box_type2 IS NULL OR d.box_type2 = '')
- </otherwise>
- </choose>
- <choose>
- <when test="boxType3 != null and boxType3 != ''">
- and d.box_type3 = #{boxType3}
- </when>
- <otherwise>
- and (d.box_type3 IS NULL OR d.box_type3 = '')
- </otherwise>
- </choose>
</sql>
<sql id="batchSeqA">
- <choose>
- <when test="batch != null and batch != ''">
- and a.batch = #{batch}
- </when>
- <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}
@@ -144,110 +72,14 @@
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>
- </choose>
- <choose>
- <when test="standby3 != null and standby3 != ''">
- and a.standby3 = #{standby3}
- </when>
- <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>
- </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>
- </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>
- </choose>
</sql>
<sql id="batchSeqNew">
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
- <choose>
- <when test="brand != null and brand != ''">
- and brand = #{brand}
- </when>
- <otherwise>
- and (brand IS NULL OR brand = '')
- </otherwise>
- </choose>
<choose>
<when test="standby1 != null and standby1 != ''">
and standby1 = #{standby1}
</when>
<otherwise>
and (standby1 IS NULL OR standby1 = '')
- </otherwise>
- </choose>
- <choose>
- <when test="standby2 != null and standby2 != ''">
- and standby2 = #{standby2}
- </when>
- <otherwise>
- and (standby2 IS NULL OR standby2 = '')
- </otherwise>
- </choose>
- <choose>
- <when test="standby3 != null and standby3 != ''">
- and standby3 = #{standby3}
- </when>
- <otherwise>
- and (standby3 IS NULL OR standby3 = '')
- </otherwise>
- </choose>
- <choose>
- <when test="boxType1 != null and boxType1 != ''">
- and box_type1 = #{boxType1}
- </when>
- <otherwise>
- and (box_type1 IS NULL OR box_type1 = '')
- </otherwise>
- </choose>
- <choose>
- <when test="boxType2 != null and boxType2 != ''">
- and box_type2 = #{boxType2}
- </when>
- <otherwise>
- and (box_type2 IS NULL OR box_type2 = '')
- </otherwise>
- </choose>
- <choose>
- <when test="boxType3 != null and boxType3 != ''">
- and box_type3 = #{boxType3}
- </when>
- <otherwise>
- and (box_type3 IS NULL OR box_type3 = '')
</otherwise>
</choose>
</sql>
@@ -465,63 +297,12 @@
#{item}
</foreach>
</if>
-
- order by
- DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
- desc,
- NEWID(),
- case
- when (left(a.loc_no, 2) = '01') then 0
- when (left(a.loc_no, 2) = '02') then 1
- when (left(a.loc_no, 2) = '03') then 1
- when (left(a.loc_no, 2) = '04') then 0
- when (left(a.loc_no, 2) = '05') then 0
- when (left(a.loc_no, 2) = '06') then 1
- when (left(a.loc_no, 2) = '07') then 1
- when (left(a.loc_no, 2) = '08') then 0
- when (left(a.loc_no, 2) = '09') then 0
- when (left(a.loc_no, 2) = '10') then 1
- when (left(a.loc_no, 2) = '11') then 1
- when (left(a.loc_no, 2) = '12') then 0
- when (left(a.loc_no, 2) = '13') then 0
- when (left(a.loc_no, 2) = '14') then 1
- when (left(a.loc_no, 2) = '15') then 1
- when (left(a.loc_no, 2) = '16') then 0
- when (left(a.loc_no, 2) = '17') then 0
- when (left(a.loc_no, 2) = '18') then 1
- when (left(a.loc_no, 2) = '19') then 1
- when (left(a.loc_no, 2) = '20') then 0
- when (left(a.loc_no, 2) = '21') then 0
- when (left(a.loc_no, 2) = '22') then 1
- when (left(a.loc_no, 2) = '23') then 1
- when (left(a.loc_no, 2) = '24') then 0
- when (left(a.loc_no, 2) = '25') then 0
- when (left(a.loc_no, 2) = '26') then 1
- when (left(a.loc_no, 2) = '27') then 1
- when (left(a.loc_no, 2) = '28') then 0
- when (left(a.loc_no, 2) = '29') then 0
- when (left(a.loc_no, 2) = '30') then 1
- when (left(a.loc_no, 2) = '31') then 1
- when (left(a.loc_no, 2) = '32') then 0
- when (left(a.loc_no, 2) = '33') then 0
- when (left(a.loc_no, 2) = '34') then 1
- when (left(a.loc_no, 2) = '35') then 1
- when (left(a.loc_no, 2) = '36') then 0
- when (left(a.loc_no, 2) = '37') then 0
- when (left(a.loc_no, 2) = '38') then 1
- when (left(a.loc_no, 2) = '39') then 1
- when (left(a.loc_no, 2) = '40') then 0
- when (left(a.loc_no, 2) = '41') then 0
- when (left(a.loc_no, 2) = '42') then 1
- when (left(a.loc_no, 2) = '43') then 1
- when (left(a.loc_no, 2) = '44') then 0
- when (left(a.loc_no, 2) = '45') then 0
- when (left(a.loc_no, 2) = '46') then 1
- when (left(a.loc_no, 2) = '47') then 1
- when (left(a.loc_no, 2) = '48') then 0
- else 0
- end
- desc
+ ORDER BY
+ DATEPART( yyyy, a.modi_time ),
+ DATEPART( mm, a.modi_time ),
+ DATEPART( dd, a.modi_time ),
+ a.anfme,b.lev1,b.bay1
+ ASC
</select>
<select id="queryStockAll" resultMap="BaseResultMap">
@@ -550,64 +331,12 @@
#{item}
</foreach>
</if>
-
-
- order by
- DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
- desc,
- NEWID(),
- case
- when (left(a.loc_no, 2) = '01') then 0
- when (left(a.loc_no, 2) = '02') then 1
- when (left(a.loc_no, 2) = '03') then 1
- when (left(a.loc_no, 2) = '04') then 0
- when (left(a.loc_no, 2) = '05') then 0
- when (left(a.loc_no, 2) = '06') then 1
- when (left(a.loc_no, 2) = '07') then 1
- when (left(a.loc_no, 2) = '08') then 0
- when (left(a.loc_no, 2) = '09') then 0
- when (left(a.loc_no, 2) = '10') then 1
- when (left(a.loc_no, 2) = '11') then 1
- when (left(a.loc_no, 2) = '12') then 0
- when (left(a.loc_no, 2) = '13') then 0
- when (left(a.loc_no, 2) = '14') then 1
- when (left(a.loc_no, 2) = '15') then 1
- when (left(a.loc_no, 2) = '16') then 0
- when (left(a.loc_no, 2) = '17') then 0
- when (left(a.loc_no, 2) = '18') then 1
- when (left(a.loc_no, 2) = '19') then 1
- when (left(a.loc_no, 2) = '20') then 0
- when (left(a.loc_no, 2) = '21') then 0
- when (left(a.loc_no, 2) = '22') then 1
- when (left(a.loc_no, 2) = '23') then 1
- when (left(a.loc_no, 2) = '24') then 0
- when (left(a.loc_no, 2) = '25') then 0
- when (left(a.loc_no, 2) = '26') then 1
- when (left(a.loc_no, 2) = '27') then 1
- when (left(a.loc_no, 2) = '28') then 0
- when (left(a.loc_no, 2) = '29') then 0
- when (left(a.loc_no, 2) = '30') then 1
- when (left(a.loc_no, 2) = '31') then 1
- when (left(a.loc_no, 2) = '32') then 0
- when (left(a.loc_no, 2) = '33') then 0
- when (left(a.loc_no, 2) = '34') then 1
- when (left(a.loc_no, 2) = '35') then 1
- when (left(a.loc_no, 2) = '36') then 0
- when (left(a.loc_no, 2) = '37') then 0
- when (left(a.loc_no, 2) = '38') then 1
- when (left(a.loc_no, 2) = '39') then 1
- when (left(a.loc_no, 2) = '40') then 0
- when (left(a.loc_no, 2) = '41') then 0
- when (left(a.loc_no, 2) = '42') then 1
- when (left(a.loc_no, 2) = '43') then 1
- when (left(a.loc_no, 2) = '44') then 0
- when (left(a.loc_no, 2) = '45') then 0
- when (left(a.loc_no, 2) = '46') then 1
- when (left(a.loc_no, 2) = '47') then 1
- when (left(a.loc_no, 2) = '48') then 0
- else 0
- end
- desc
+ ORDER BY
+ DATEPART( yyyy, a.modi_time ),
+ DATEPART( mm, a.modi_time ),
+ DATEPART( dd, a.modi_time ),
+ a.anfme,b.lev1,b.bay1
+ ASC
</select>
<select id="queryStockAllCache" resultMap="BaseResultMap">
@@ -623,13 +352,6 @@
<include refid="batchSeqA"></include>
-
- <if test="locNos != null and locNos.size > 0">
- and b.loc_no not in
- <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </if>
<if test="areaIds != null and areaIds.size > 0">
and a.area_id in
<foreach item="item" collection="areaIds" index="index" separator="," open="(" close=")">
@@ -637,10 +359,9 @@
</foreach>
</if>
-
order by
- DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
- desc,
+ DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+ asc,
NEWID()
</select>
--
Gitblit v1.9.1