From d3bf3d3917d8201d64e8e2c66e99afb7099487f9 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 23 十月 2025 17:01:23 +0800
Subject: [PATCH] 13
---
src/main/resources/mapper/LocDetlMapper.xml | 177 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 101 insertions(+), 76 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 42dec5e..fbc5a32 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -53,10 +53,10 @@
<sql id="batchSeq">
<choose>
<when test="batch != null and batch != ''">
- and batch = #{batch}
+ and sku = #{batch}
</when>
<otherwise>
- and (batch IS NULL OR batch = '')
+ and (sku IS NULL OR sku = '')
</otherwise>
</choose>
</sql>
@@ -67,7 +67,14 @@
where 1=1
and loc_no = #{locNo}
and matnr = #{matnr}
- <include refid="batchSeq"></include>
+ <choose>
+ <when test="batch != null and batch != ''">
+ and sku = #{batch}
+ </when>
+ <otherwise>
+ and (sku IS NULL OR sku = '')
+ </otherwise>
+ </choose>
</select>
<delete id="deleteItem">
@@ -75,7 +82,14 @@
where 1=1
and loc_no = #{locNo}
and matnr = #{matnr}
- <include refid="batchSeq"></include>
+ <choose>
+ <when test="batch != null and batch != ''">
+ and sku = #{batch}
+ </when>
+ <otherwise>
+ and (sku IS NULL OR sku = '')
+ </otherwise>
+ </choose>
</delete>
<update id="updateAnfme">
@@ -85,7 +99,14 @@
where 1=1
and loc_no = #{locNo}
and matnr = #{matnr}
- <include refid="batchSeq"></include>
+ <choose>
+ <when test="batch != null and batch != ''">
+ and sku = #{batch}
+ </when>
+ <otherwise>
+ and (sku IS NULL OR sku = '')
+ </otherwise>
+ </choose>
</update>
<sql id="stockOutCondition">
@@ -245,8 +266,9 @@
</if>
order by
- DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
- desc,
+ sku,
+ <!-- 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
@@ -447,8 +469,9 @@
</if>
order by
- a.anfme asc,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time)
- desc,
+ sku,
+ <!-- a.anfme asc,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time)
+ desc,-->
NEWID(),
case
when (left(a.loc_no, 2) = '01') then 0
@@ -545,72 +568,73 @@
</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
- </select>
+ sku,
+ <!-- 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
+ </select>
- <select id="queryStockFour" resultMap="BaseResultMap">
- select a.*
- from asr_loc_detl a
- left join asr_loc_mast b on a.loc_no = b.loc_no
- where 1=1
- and b.loc_sts = 'F'
- and a.matnr = #{matnr}
- and b.crn_no in (7)
- <!-- <choose>-->
+ <select id="queryStockFour" resultMap="BaseResultMap">
+ select a.*
+ from asr_loc_detl a
+ left join asr_loc_mast b on a.loc_no = b.loc_no
+ where 1=1
+ and b.loc_sts = 'F'
+ and a.matnr = #{matnr}
+ and b.crn_no in (7)
+ <!-- <choose>-->
<!-- <when test="batch != null and batch != ''">-->
<!-- and a.batch = #{batch}-->
<!-- </when>-->
@@ -642,8 +666,9 @@
</if>
order by
- DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
- desc,
+ sku,
+ <!-- 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
--
Gitblit v1.9.1