From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/resources/mapper/LocDetlMapper.xml | 313 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 290 insertions(+), 23 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 678cb77..8e6b7de 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -5,24 +5,107 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocDetl">
<result column="loc_no" property="locNo" />
+ <result column="zpallet" property="zpallet" />
+ <result column="anfme" property="anfme" />
<result column="matnr" property="matnr" />
<result column="maktx" property="maktx" />
- <result column="lgnum" property="lgnum" />
- <result column="type" property="type" />
+ <result column="batch" property="batch" />
+ <result column="order_no" property="orderNo" />
+
+ <result column="specs" property="specs" />
+ <result column="model" property="model" />
<result column="color" property="color" />
- <result column="supplier" property="supplier" />
- <result column="warehouse" property="warehouse" />
<result column="brand" property="brand" />
- <result column="anfme" property="anfme" />
- <result column="altme" property="altme" />
- <result column="zpallet" property="zpallet" />
- <result column="bname" property="bname" />
- <result column="memo" property="memo" />
+ <result column="unit" property="unit" />
+ <result column="price" property="price" />
+ <result column="sku" property="sku" />
+ <result column="units" property="units" />
+ <result column="barcode" property="barcode" />
+ <result column="origin" property="origin" />
+ <result column="manu" property="manu" />
+ <result column="manu_date" property="manuDate" />
+ <result column="item_num" property="itemNum" />
+ <result column="safe_qty" property="safeQty" />
+ <result column="weight" property="weight" />
+ <result column="length" property="length" />
+ <result column="volume" property="volume" />
+ <result column="three_code" property="threeCode" />
+ <result column="supp" property="supp" />
+ <result column="supp_code" property="suppCode" />
+ <result column="be_batch" property="beBatch" />
+ <result column="dead_time" property="deadTime" />
+ <result column="dead_warn" property="deadWarn" />
+ <result column="source" property="source" />
+ <result column="inspect" property="inspect" />
+ <result column="danger" property="danger" />
+
<result column="modi_user" property="modiUser" />
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
+ <result column="memo" property="memo" />
+ <result column="stock_freeze" property="stockFreeze" />
</resultMap>
+
+ <sql id="batchSeq">
+ <choose>
+ <when test="batch != null and batch != ''">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ </sql>
+
+ <select id="selectItem" resultMap="BaseResultMap">
+ select top 1 *
+ from asr_loc_detl
+ where 1=1
+ and loc_no = #{locNo}
+ and matnr = #{matnr}
+ <choose>
+ <when test="suppCode != null and suppCode != ''">
+ and supp_code = #{suppCode}
+ </when>
+<!-- <otherwise>-->
+<!-- and (supp_code IS NULL OR supp_code = '')-->
+<!-- </otherwise>-->
+ </choose>
+ <include refid="batchSeq"></include>
+ </select>
+
+ <delete id="deleteItem">
+ delete from asr_loc_detl
+ where 1=1
+ and loc_no = #{locNo}
+ and matnr = #{matnr}
+ <include refid="batchSeq"></include>
+ <include refid="locdetlCondition"></include>
+ </delete>
+
+ <update id="updateAnfme">
+ update asr_loc_detl
+ set anfme = #{anfme}
+ , modi_time = getdate()
+ where 1=1
+ and loc_no = #{locNo}
+ and matnr = #{matnr}
+ <include refid="locdetlCondition"></include>
+ <include refid="batchSeq"></include>
+ </update>
+
+ <sql id="locdetlCondition">
+ <if test="threeCode!=null and threeCode!='' ">
+ and three_code = #{threeCode}
+ </if>
+ <if test="suppCode!=null and suppCode!='' ">
+ and supp_code = #{suppCode}
+ </if>
+ <if test="deadTime!=null and deadTime!='' ">
+ and dead_time = #{deadTime}
+ </if>
+ </sql>
<sql id="stockOutCondition">
<if test="loc_no!=null and loc_no!='' ">
@@ -36,9 +119,6 @@
</if>
<if test="anfme!=null and anfme!='' ">
and a.anfme like '%' + #{anfme} + '%'
- </if>
- <if test="altme!=null and altme!='' ">
- and a.altme like '%' + #{altme} + '%'
</if>
<if test="startTime!=null and endTime!=null">
and a.modi_time between #{startTime} and #{endTime}
@@ -106,21 +186,22 @@
</select>
<select id="selectPakoutByRule" resultMap="BaseResultMap">
- select * from asr_loc_detl
+ select a.* from asr_loc_detl a left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and matnr = #{matnr}
+ and b.loc_sts = 'F'
+ and a.matnr = #{matnr}
order by
- DATEPART(yyyy,modi_time),DATEPART(mm,modi_time),DATEPART(dd,modi_time)
+ DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time)
desc,
case
- when (left(loc_no, 2) = '01') then 0
- when (left(loc_no, 2) = '02') then 1
- when (left(loc_no, 2) = '03') then 1
- when (left(loc_no, 2) = '04') then 0
- when (left(loc_no, 2) = '05') then 0
- when (left(loc_no, 2) = '06') then 1
- when (left(loc_no, 2) = '07') then 1
- when (left(loc_no, 2) = '08') then 0
+ 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
else 0
end
desc
@@ -133,4 +214,190 @@
<select id="countLocNoNum" resultType="integer">
select count(*) from asr_loc_detl where loc_no = #{loc_no}
</select>
+
+ <select id="queryStockPre" resultType="com.zy.common.model.QueryStockPreDo">
+ select
+ *
+ from
+ (
+ select
+ no = 1,
+ orderBy = 'true',
+ b.bay1 as bay,
+ sum(anfme) as count
+ 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.row1 >= 31
+ and b.row1 <= 32
+ group by b.bay1
+ union
+ select
+ no = 2,
+ orderBy = 'true',
+ b.bay1 as bay,
+ sum(anfme) as count
+ 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.row1 >= 2
+ and b.row1 <= 17
+ group by b.bay1
+ union
+ select
+ no = 3,
+ orderBy = 'false',
+ b.bay1 as bay,
+ sum(anfme) as count
+ 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.row1 >= 18
+ and b.row1 <= 30
+ group by b.bay1
+ ) a
+ order by no, count desc
+ </select>
+
+ <select id="queryStock" 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
+ <if test="no!=null and no == 1">
+ and b.row1 >= 31
+ and b.row1 <= 32
+ </if>
+ <if test="no!=null and no == 2">
+ and b.row1 >= 2
+ and b.row1 <= 17
+ </if>
+ <if test="no!=null and no == 3">
+ and b.row1 >= 18
+ and b.row1 <= 30
+ </if>
+ and a.matnr = #{matnr}
+ and b.bay1 = #{bay}
+ and b.loc_sts = 'F'
+ order by b.row1
+ <if test="orderBy != null and orderBy != '' and orderBy == 'false'">
+ desc
+ </if>
+ </select>
+
+ <select id="queryStockAnfme" resultType="java.lang.Double">
+ select sum(anfme) as count from man_loc_detl
+ where 1=1
+ and matnr = #{matnr}
+ <if test="batch != null and batch != ''">
+ and batch = #{batch}
+ </if>
+ </select>
+
+ <select id="queryStockTotal" resultType="com.zy.asrs.entity.result.StockVo">
+ select
+ matnr,
+ batch,
+ count(anfme) as count
+ from asr_loc_detl
+ where 1=1
+ group by matnr,batch
+ </select>
+ <select id="sum" resultType="java.lang.Integer">
+ SELECT SUM(anfme) FROM asr_loc_detl
+ </select>
+ <select id="unreason" resultMap="BaseResultMap">
+ SELECT
+ *
+ FROM
+ [dbo].[asr_loc_detl]
+ WHERE
+ DATALENGTH( batch ) != 11 or
+ batch LIKE '%[a-z]%'
+ </select>
+
+ <select id="selectSameDetl" 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
+ LEFT JOIN (
+ select
+ loc_no,
+ count(1) as count
+ from asr_loc_detl
+ where 1=1
+ group by loc_no
+ ) dual on dual.loc_no = lm.loc_no
+ WHERE 1 = 1
+ AND ld.matnr = #{matnr}
+ AND (lm.loc_sts = 'F')
+ AND dual.count = 1
+ ORDER BY lm.modi_time ASC
+ </select>
+
+ <select id="selectSameLevDetl" 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
+ LEFT JOIN (
+ select
+ loc_no,
+ count(1) as count
+ from asr_loc_detl
+ where 1=1
+ group by loc_no
+ ) dual on dual.loc_no = lm.loc_no
+ WHERE 1 = 1
+ AND ld.matnr = #{matnr}
+ AND (lm.loc_sts = 'F')
+ AND dual.count = 1
+ AND lm.lev1 = #{lev}
+ ORDER BY lm.modi_time ASC
+ </select>
+
+ <select id="searchByLike" resultMap="BaseResultMap">
+ select *
+ from asr_loc_detl
+ where
+ 1 = 1
+ <if test="orderNo != null and orderNo != ''">
+ and order_no like '%' + #{orderNo} + '%'
+ </if>
+ <if test="locNo != null and locNo != ''">
+ and loc_no like '%' + #{locNo} + '%'
+ </if>
+ <if test="specs != null and specs != ''">
+ and specs like '%' + #{specs} + '%'
+ </if>
+ <if test="matnr != null and matnr != ''">
+ and matnr like '%' + #{matnr} + '%'
+ </if>
+ <if test="maktx != null and maktx != ''">
+ and maktx like '%' + #{maktx} + '%';
+ </if>
+ </select>
+
+ <select id="selectByLocNo" resultMap="BaseResultMap">
+ select * from asr_loc_detl
+ where 1=1
+ and loc_no = #{locNo}
+ </select>
+
+ <update id="updateStockFreeze">
+ update asr_loc_detl
+ set stock_freeze = #{stockFreeze}
+ , modi_time = getdate()
+ where 1=1
+ and loc_no = #{locNo}
+ and matnr = #{matnr}
+ </update>
</mapper>
--
Gitblit v1.9.1