From 55470b5fa4880dd7ac7838792cdf4ad4aaa7b0c3 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期二, 03 九月 2024 12:33:26 +0800
Subject: [PATCH] 123
---
src/main/resources/mapper/LocDetlMapper.xml | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 218 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index ff0437d..24dbdd0 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -44,6 +44,20 @@
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
<result column="memo" property="memo" />
+
+
+ <result column="i_no" property="iNo" />
+ <result column="temp1" property="temp1" />
+ <result column="temp2" property="temp2" />
+ <result column="temp3" property="temp3" />
+ <result column="pg_no" property="sPgNO" />
+ <result column="pro_type" property="proType" />
+ <result column="auto_id" property="autoId" />
+ <result column="out_order_no" property="outOrderNo" />
+ <result column="lu_hao" property="luHao" />
+ <result column="ware_id" property="wareId" />
+ <result column="ware_mame" property="wareName" />
+ <result column="packing" property="packing" />
</resultMap>
<sql id="batchSeq">
@@ -94,6 +108,9 @@
<if test="maktx!=null and maktx!='' ">
and a.maktx like '%' + #{maktx} + '%'
</if>
+ <if test="model!=null and model!='' ">
+ and a.model like '%' + #{model} + '%'
+ </if>
<if test="anfme!=null and anfme!='' ">
and a.anfme like '%' + #{anfme} + '%'
</if>
@@ -102,6 +119,22 @@
</if>
<if test="crnNo!=null and crnNo!='' ">
and b.crn_no=#{crnNo}
+ </if>
+ <if test="batch!=null and batch!='' ">
+ and a.batch like '%' + #{batch} + '%'
+ </if>
+ <if test="specs!=null and specs!='' ">
+ and a.specs like '%' + #{specs} + '%'
+ </if>
+
+ <if test="sPgNO!=null and sPgNO!='' ">
+ and a.pg_no like '%' + #{sPgNO} + '%'
+ </if>
+ <if test="outOrderNo!=null and outOrderNo!='' ">
+ and a.out_order_no like '%' + #{outOrderNo} + '%'
+ </if>
+ <if test="zpallet!=null and zpallet!='' ">
+ and a.zpallet like '%' + #{zpallet} + '%'
</if>
</sql>
@@ -202,25 +235,46 @@
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>-->
+
+ <choose>
+ <when test="sPgNO != null and sPgNO != ''">
+ and a.pg_no = #{sPgNO}
+ </when>
+ <otherwise>
+ and (pg_no IS NULL OR pg_no = '')
+ </otherwise>
+ </choose>
+ <if test="batch != null and batch != ''">
+ and a.batch = #{batch}
+ </if>
<!-- <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 batch != ''">
- and a.batch = #{batch}
- </if>
- <if test="orderNo != null and orderNo != ''">
- and a.order_no = #{orderNo}
+ <!-- <when test="batch != null and batch != ''">-->
+ <!-- and batch = #{batch}-->
+ <!-- </when>-->
+ <!-- <otherwise>-->
+ <!-- and (batch IS NULL OR batch = '')-->
+ <!-- </otherwise>-->
+ <!-- </choose>-->
+ <!-- <if test="orderNo != null and orderNo != ''">-->
+ <!-- and a.order_no = #{orderNo}-->
+ <!-- </if>-->
+ <if test="model != null and model != ''">
+ and a.model = #{model}
+ and (a.pg_no is null or LEN(LTRIM(RTRIM(pg_no))) = 0)
</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=")">
+ <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</if>
@@ -320,5 +374,155 @@
where loc_no=#{locNo}
</select>
+ <update id="updateMatTurn">
+ UPDATE a
+ SET a.matnr=b.matnr,
+ a.specs=b.specs,
+ a.maktx=b.maktx,
+ a.unit=b.unit
+ FROM asr_loc_detl a
+ INNER JOIN man_mat b ON a.matnr=#{matnrOld} AND b.matnr=#{matnr};
+ </update>
+ <select id="selectSameDetlTodayBatch" 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.row1 >= #{start}
+ AND lm.row1 <= #{end}
+ AND lm.loc_sts = 'F'
+ AND DateDiff(dd, ld.appe_time, getdate()) = 0
+ <choose>
+ <when test="batch != null and batch != ''">
+ and ld.batch = #{batch}
+ </when>
+ <otherwise>
+ and (ld.batch IS NULL OR ld.batch = '')
+ </otherwise>
+ </choose>
+ ORDER BY ld.appe_time ASC
+ </select>
+
+ <select id="selectLocDetlUnilateralMoveShuttleMapY" resultType="java.util.Map">
+ select ld.matnr,ld.batch,ld.brand,count(*) count from asr_loc_mast lm
+ left join asr_loc_detl ld
+ on lm.loc_no = ld.loc_no
+ where lm.row1 in (1)
+ and loc_sts = 'F'
+ and loc_type3 = 0
+ group by ld.matnr,ld.batch,ld.brand
+ </select>
+
+ <select id="selectLocDetlUnilateralMoveShuttleMapN" resultType="java.util.Map">
+ select ld.matnr,ld.batch,ld.brand,count(*) count from asr_loc_mast lm
+ left join asr_loc_detl ld
+ on lm.loc_no = ld.loc_no
+ where lm.row1 in (31,32)
+ and loc_sts = 'F'
+ and loc_type3 = 0
+ group by ld.matnr,ld.batch,ld.brand
+ </select>
+
+ <select id="selectLocDetlUnilateralMoveShuttleY" resultMap="BaseResultMap">
+ select ld.* from asr_loc_mast lm
+ left join asr_loc_detl ld
+ on lm.loc_no = ld.loc_no
+ where loc_sts = 'F'
+ and ld.matnr = #{matnr}
+ and ld.batch = #{batch}
+ and ld.brand = #{grade}
+ and lm.loc_type3 = 0
+ and lm.row1 in (1)
+ order by row1
+ </select>
+
+ <select id="selectLocDetlUnilateralMoveShuttleN" resultMap="BaseResultMap">
+ select ld.* from asr_loc_mast lm
+ left join asr_loc_detl ld
+ on lm.loc_no = ld.loc_no
+ where loc_sts = 'F'
+ and ld.matnr = #{matnr}
+ and ld.batch = #{batch}
+ and ld.brand = #{grade}
+ and lm.loc_type3 = 0
+ and lm.row1 in (31,32)
+ order by row1
+ </select>
+
+
+
+
+
+ <resultMap id="stockStatisDTO" type="com.zy.asrs.entity.StockStatisDTO">
+ <id column="matnr" property="matnr" />
+ <id column="maktx" property="maktx" />
+ <id column="specs" property="specs" />
+ <id column="asrsQty" property="lkQty" />
+ <id column="erpQty" property="erpQty" />
+
+ <id column="pgNo" property="pgNo" />
+ <id column="outOrderNo" property="outOrderNo" />
+ <id column="batch" property="batch" />
+ <id column="model" property="model" />
+ </resultMap>
+
+ <select id="asrsAndErpList" resultMap="stockStatisDTO">
+ SELECT * FROM(
+ SELECT ROW_NUMBER ( ) OVER ( ORDER BY d.matnr ) AS row, * FROM (
+ SELECT * FROM asr_show_diff WHERE 1 = 1
+ <if test="different != null and different == 1 ">
+ and asrsQty != erpQty
+ </if>
+ <if test="different != null and different == 0 ">
+
+ </if>
+ <if test="matnr != null and matnr != ''">
+ AND matnr like '%' + #{matnr}+ '%'
+ </if>
+ <if test="model != null and model != ''">
+ AND model like '%' + #{model}+ '%'
+ </if>
+ <if test="maktx != null and maktx != ''">
+ AND maktx like '%' + #{maktx}+ '%'
+ </if>
+ <if test="specs != null and specs != ''">
+ AND specs like '%' + #{specs}+ '%'
+ </if>
+ <if test="sPgNO != null and sPgNO != ''">
+ AND pgNO like '%' + #{sPgNO} + '%'
+ </if>
+ <if test="outOrderNo != null and outOrderNo != ''">
+ AND outOrderNo like '%' + #{outOrderNo} + '%'
+ </if>
+ ) d ) e WHERE 1=1 and e.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ </select>
+
+ <select id="asrsAndErpCount" resultType="java.lang.Long">
+ SELECT count(*) FROM asr_show_diff WHERE 1 = 1
+ <if test="different != null and different == 1 ">
+ and asrsQty != erpQty
+ </if>
+ <if test="different != null and different == 0 ">
+
+ </if>
+ <if test="matnr != null and matnr != ''">
+ AND matnr like '%' + #{matnr}+ '%'
+ </if>
+ <if test="model != null and model != ''">
+ AND model like '%' + #{model}+ '%'
+ </if>
+ <if test="maktx != null and maktx != ''">
+ AND maktx like '%' + #{maktx}+ '%'
+ </if>
+ <if test="specs != null and specs != ''">
+ AND specs like '%' + #{specs}+ '%'
+ </if>
+ <if test="sPgNO != null and sPgNO != ''">
+ AND pgNO like '%' + #{sPgNO} + '%'
+ </if>
+ <if test="outOrderNo != null and outOrderNo != ''">
+ AND outOrderNo like '%' + #{outOrderNo} + '%'
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.1