From 897bf0f381e16c51cea0581e8bd8913d8bb9d047 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 06 十二月 2025 15:46:13 +0800
Subject: [PATCH] 1. 添加AGV站点与堆垛机站点绑定关系 2. 获取并板入库托盘 3. 生成AGV任务 4. 生成堆垛机任务
---
src/main/resources/mapper/LocDetlMapper.xml | 308 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 305 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index dc9f9e8..e99489c 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -48,15 +48,206 @@
<result column="standby1" property="standby1" />
<result column="standby2" property="standby2" />
<result column="standby3" property="standby3" />
+ <result column="box_type1" property="boxType1" />
+ <result column="box_type2" property="boxType2" />
+ <result column="box_type3" property="boxType3" />
</resultMap>
<sql id="batchSeq">
+ <choose>
+ <when test="batch != null and batch != ''">
+ and d.batch = #{batch}
+ </when>
+ <otherwise>
+ and (d.batch IS NULL OR d.batch = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="brand != null and brand != ''">
+ and d.brand = #{brand}
+ </when>
+ <otherwise>
+ and (d.brand IS NULL OR d.brand = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby1 != null and standby1 != ''">
+ and d.standby1 = #{standby1}
+ </when>
+ <otherwise>
+ and (d.standby1 IS NULL OR d.standby1 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby2 != null and standby2 != ''">
+ and d.standby2 = #{standby2}
+ </when>
+ <otherwise>
+ and (d.standby2 IS NULL OR d.standby2 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby3 != null and standby3 != ''">
+ and d.standby3 = #{standby3}
+ </when>
+ <otherwise>
+ and (d.standby3 IS NULL OR d.standby3 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType1 != null and boxType1 != ''">
+ and d.box_type1 = #{boxType1}
+ </when>
+ <otherwise>
+ and (d.box_type1 IS NULL OR d.box_type1 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType2 != null and boxType2 != ''">
+ and d.box_type2 = #{boxType2}
+ </when>
+ <otherwise>
+ and (d.box_type2 IS NULL OR d.box_type2 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType3 != null and boxType3 != ''">
+ and d.box_type3 = #{boxType3}
+ </when>
+ <otherwise>
+ and (d.box_type3 IS NULL OR d.box_type3 = '')
+ </otherwise>
+ </choose>
+ </sql>
+ <sql id="batchSeqA">
+ <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="brand != null and brand != ''">
+ and a.brand = #{brand}
+ </when>
+ <otherwise>
+ and (a.brand IS NULL OR a.brand = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby1 != null and standby1 != ''">
+ and a.standby1 = #{standby1}
+ </when>
+ <otherwise>
+ and (a.standby1 IS NULL OR a.standby1 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby2 != null and standby2 != ''">
+ and a.standby2 = #{standby2}
+ </when>
+ <otherwise>
+ and (a.standby2 IS NULL OR a.standby2 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby3 != null and standby3 != ''">
+ and a.standby3 = #{standby3}
+ </when>
+ <otherwise>
+ and (a.standby3 IS NULL OR a.standby3 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType1 != null and boxType1 != ''">
+ and a.box_type1 = #{boxType1}
+ </when>
+ <otherwise>
+ and (a.box_type1 IS NULL OR a.box_type1 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType2 != null and boxType2 != ''">
+ and a.box_type2 = #{boxType2}
+ </when>
+ <otherwise>
+ and (a.box_type2 IS NULL OR a.box_type2 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType3 != null and boxType3 != ''">
+ and a.box_type3 = #{boxType3}
+ </when>
+ <otherwise>
+ and (a.box_type3 IS NULL OR a.box_type3 = '')
+ </otherwise>
+ </choose>
+ </sql>
+ <sql id="batchSeqNew">
<choose>
<when test="batch != null and batch != ''">
and batch = #{batch}
</when>
<otherwise>
and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="brand != null and brand != ''">
+ and brand = #{brand}
+ </when>
+ <otherwise>
+ and (brand IS NULL OR brand = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby1 != null and standby1 != ''">
+ and standby1 = #{standby1}
+ </when>
+ <otherwise>
+ and (standby1 IS NULL OR standby1 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby2 != null and standby2 != ''">
+ and standby2 = #{standby2}
+ </when>
+ <otherwise>
+ and (standby2 IS NULL OR standby2 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="standby3 != null and standby3 != ''">
+ and standby3 = #{standby3}
+ </when>
+ <otherwise>
+ and (standby3 IS NULL OR standby3 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType1 != null and boxType1 != ''">
+ and box_type1 = #{boxType1}
+ </when>
+ <otherwise>
+ and (box_type1 IS NULL OR box_type1 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType2 != null and boxType2 != ''">
+ and box_type2 = #{boxType2}
+ </when>
+ <otherwise>
+ and (box_type2 IS NULL OR box_type2 = '')
+ </otherwise>
+ </choose>
+ <choose>
+ <when test="boxType3 != null and boxType3 != ''">
+ and box_type3 = #{boxType3}
+ </when>
+ <otherwise>
+ and (box_type3 IS NULL OR box_type3 = '')
</otherwise>
</choose>
</sql>
@@ -101,7 +292,7 @@
<select id="selectItem" resultMap="BaseResultMap">
select top 1 *
- from asr_loc_detl
+ from asr_loc_detl d
where 1=1
and loc_no = #{locNo}
and matnr = #{matnr}
@@ -113,7 +304,7 @@
where 1=1
and loc_no = #{locNo}
and matnr = #{matnr}
- <include refid="batchSeq"></include>
+ <include refid="batchSeqNew"></include>
</delete>
<update id="updateAnfme">
@@ -123,7 +314,7 @@
where 1=1
and loc_no = #{locNo}
and matnr = #{matnr}
- <include refid="batchSeq"></include>
+ <include refid="batchSeqNew"></include>
</update>
<sql id="stockOutCondition">
@@ -163,6 +354,7 @@
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
and b.loc_sts = 'F'
+ and a.frozen = '0'
<include refid="stockOutCondition"></include>
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -174,6 +366,7 @@
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
and b.loc_sts = 'F'
+ and a.frozen = '0'
<include refid="stockOutCondition"></include>
</select>
@@ -265,6 +458,93 @@
<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>
+
+ 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>
+
+ <select id="queryStockAll" 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="orderNo != null and orderNo != ''">
+ and a.order_no = #{orderNo}
+ </if>
+
+ <include refid="batchSeqA"></include>
+
<if test="locNos != null and locNos.size > 0">
and b.loc_no not in
@@ -449,6 +729,28 @@
and lm.row1 in (31,32)
order by row1
</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="getStockStatis2" resultType="com.zy.asrs.entity.LocDetl">
select * from
(
--
Gitblit v1.9.1