From f9e742b17c47d9f0df3a56caa09f18c8f99aa3f8 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 03 七月 2025 17:44:37 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/LocDetlMapper.xml | 191 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 188 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 03b3a85..c6ccebc 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -44,6 +44,7 @@
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
<result column="memo" property="memo" />
+ <result column="bom_code" property="bomCode" />
</resultMap>
<sql id="batchSeq">
@@ -66,6 +67,55 @@
<include refid="batchSeq"></include>
</select>
+ <select id="selectItem2" resultMap="BaseResultMap">
+ select top 1 *
+ from asr_loc_detl
+ where 1=1
+ and loc_no = #{locNo}
+ and matnr = #{matnr}
+ <choose>
+ <when test="threeCode != null">
+ and three_code = #{threeCode}
+ </when>
+ <otherwise>
+ and (three_code IS NULL)
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="bomCode != null">
+ and bom_code = #{bomCode}
+ </when>
+ <otherwise>
+ and (bom_code IS NULL)
+ </otherwise>
+ </choose>
+ <include refid="batchSeq"></include>
+ </select>
+
+ <delete id="deleteItem2">
+ delete from asr_loc_detl
+ where 1=1
+ and loc_no = #{locNo}
+ and matnr = #{matnr}
+ <choose>
+ <when test="threeCode != null">
+ and three_code = #{threeCode}
+ </when>
+ <otherwise>
+ and (three_code IS NULL)
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="bomCode != null">
+ and bom_code = #{bomCode}
+ </when>
+ <otherwise>
+ and (bom_code IS NULL)
+ </otherwise>
+ </choose>
+ <include refid="batchSeq"></include>
+ </delete>
+
<delete id="deleteItem">
delete from asr_loc_detl
where 1=1
@@ -81,6 +131,32 @@
where 1=1
and loc_no = #{locNo}
and matnr = #{matnr}
+ <include refid="batchSeq"></include>
+ </update>
+
+ <update id="updateAnfme2">
+ update asr_loc_detl
+ set anfme = #{anfme}
+ , modi_time = getdate()
+ where 1=1
+ and loc_no = #{locNo}
+ and matnr = #{matnr}
+ <choose>
+ <when test="threeCode != null">
+ and three_code = #{threeCode}
+ </when>
+ <otherwise>
+ and (three_code IS NULL)
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="bomCode != null">
+ and bom_code = #{bomCode}
+ </when>
+ <otherwise>
+ and (bom_code IS NULL)
+ </otherwise>
+ </choose>
<include refid="batchSeq"></include>
</update>
@@ -108,6 +184,15 @@
</if>
<if test="zpallet!=null and zpallet!='' ">
and a.zpallet like '%' + #{zpallet} + '%'
+ </if>
+ <if test="bomCode!=null and bomCode!='' ">
+ and a.bom_code like '%' + #{bomCode} + '%'
+ </if>
+ <if test="threeCode!=null and threeCode!='' ">
+ and a.three_code like '%' + #{threeCode} + '%'
+ </if>
+ <if test="orderNo!=null and orderNo!='' ">
+ and a.order_no like '%' + #{orderNo} + '%'
</if>
</sql>
@@ -165,6 +250,8 @@
select
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
+ , min(a.maktx) as maktx
+ , min(a.specs) as specs
, sum(a.anfme) as anfme
from asr_loc_detl a
where 1=1
@@ -216,7 +303,7 @@
<!-- and (a.batch IS NULL OR a.batch = '')-->
<!-- </otherwise>-->
<!-- </choose>-->
- <if test="batch != null">
+ <if test="batch != null and batch != ''">
and a.batch = #{batch}
</if>
<if test="orderNo != null and orderNo != ''">
@@ -231,7 +318,96 @@
</if>
order by
- DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
+ DATEPART(yyyy,a.appe_time),DATEPART(mm,a.appe_time),DATEPART(dd,a.appe_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="queryStockByBomcode" 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}
+ <!-- <choose>-->
+ <!-- <when test="batch != null and batch != ''">-->
+ <!-- and a.batch = #{batch}-->
+ <!-- </when>-->
+ <!-- <otherwise>-->
+ <!-- and (a.batch IS NULL OR a.batch = '')-->
+ <!-- </otherwise>-->
+ <!-- </choose>-->
+ <if test="batch != null">
+ and a.batch = #{batch}
+ </if>
+ <if test="orderNo != null and orderNo != ''">
+ and a.order_no = #{orderNo}
+ </if>
+
+ <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="bomCode != null and bomCode != ''">
+ and a.bom_code = #{bomCode}
+ </if>
+ order by
+ DATEPART(yyyy,a.appe_time),DATEPART(mm,a.appe_time),DATEPART(dd,a.appe_time), a.anfme
desc,
NEWID(),
case
@@ -300,11 +476,13 @@
<select id="queryStockTotal" resultType="com.zy.asrs.entity.result.StockVo">
select
matnr,
+ maktx,
+ specs,
batch,
count(anfme) as count
from asr_loc_detl
where 1=1
- group by matnr,batch
+ group by matnr,maktx,specs,batch
</select>
<select id="sum" resultType="java.lang.Integer">
SELECT SUM(anfme) FROM asr_loc_detl
@@ -325,5 +503,12 @@
where loc_no=#{locNo}
</select>
+ <select id="getBomQyt" resultType="double">
+ select SUM(anfme) anfme
+ from asr_loc_detl
+ where bom_code = #{bomCode}
+ and matnr = #{matnr}
+ </select>
+
</mapper>
--
Gitblit v1.9.1