From 518121d2718b87d99b12c1b29601dd2c07f6f42d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 21 十月 2025 15:03:14 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/asrs/LocDetlMapper.xml | 103 +++++++++++++++++++++++----------------------------
1 files changed, 46 insertions(+), 57 deletions(-)
diff --git a/src/main/resources/mapper/asrs/LocDetlMapper.xml b/src/main/resources/mapper/asrs/LocDetlMapper.xml
index 1ac6295..94c24a6 100644
--- a/src/main/resources/mapper/asrs/LocDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/LocDetlMapper.xml
@@ -27,7 +27,6 @@
<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="volume" property="volume" />
<result column="three_code" property="threeCode" />
<result column="supp" property="supp" />
@@ -51,6 +50,7 @@
<result column="box_type1" property="boxType1" />
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
+ <result column="cstateid" property="cstateid" />
</resultMap>
<sql id="batchSeq">
@@ -319,6 +319,24 @@
<include refid="batchSeqNew"></include>
</update>
+ <update id="updateWeight">
+ update asr_loc_detl
+ set weight = #{weight}
+ , modi_time = getdate()
+ where 1=1
+ and loc_no = #{locNo}
+ and matnr = #{matnr}
+ <include refid="batchSeqNew"></include>
+ </update>
+
+ <update id="updateBarcode">
+ update asr_loc_detl
+ set zpallet = #{barcode}
+ , modi_time = getdate()
+ where 1=1
+ and loc_no = #{locNo}
+ </update>
+
<sql id="stockOutCondition">
<if test="loc_no!=null and loc_no!='' ">
and a.loc_no like '%' + #{loc_no} + '%'
@@ -333,7 +351,7 @@
and a.anfme like '%' + #{anfme} + '%'
</if>
<if test="startTime!=null and endTime!=null">
- and a.modi_time between #{startTime} and #{endTime}
+ and a.appe_time between #{startTime} and #{endTime}
</if>
<if test="crnNo!=null and crnNo!='' ">
and b.crn_no=#{crnNo}
@@ -343,6 +361,9 @@
</if>
<if test="specs!=null and specs!='' ">
and a.specs like '%' + #{specs} + '%'
+ </if>
+ <if test="standby1!=null and standby1!='' ">
+ and a.standby1 like '%' + #{standby1} + '%'
</if>
</sql>
@@ -377,11 +398,13 @@
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
, a.batch
+ , a.standby1
, sum(a.anfme) as anfme
+ , sum(a.weight) as weight
from asr_loc_detl a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr, a.batch
+ group by a.matnr, a.batch , a.standby1
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -542,6 +565,9 @@
<if test="orderNo != null and orderNo != ''">
and a.order_no = #{orderNo}
</if>
+ <if test="cstateid != null and cstateid != ''">
+ and a.cstateid = #{cstateid}
+ </if>
<include refid="batchSeqA"></include>
@@ -554,60 +580,7 @@
</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
+ a.loc_no, DATEPART(yyyy,a.appe_time),DATEPART(mm,a.appe_time),DATEPART(dd,a.appe_time), a.anfme
desc
</select>
@@ -631,6 +604,9 @@
</select>
<select id="sum" resultType="java.lang.Integer">
SELECT SUM(anfme) FROM asr_loc_detl
+ </select>
+ <select id="sum2" resultType="java.lang.Integer">
+ SELECT SUM(weight) FROM asr_loc_detl
</select>
<select id="unreason" resultMap="BaseResultMap">
SELECT
@@ -766,4 +742,17 @@
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
+ <select id="getSameDetlList" 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
+ WHERE 1 = 1
+ AND ld.matnr = #{matnr}
+ AND lm.loc_sts = 'F'
+ AND lm.row1 in
+ <foreach collection="rows" item="item" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ ORDER BY ld.appe_time ASC
+ </select>
+
</mapper>
--
Gitblit v1.9.1