From 16b37165b10c0e47fd7ee0bb6cd7091775a35fbe Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 20 十月 2025 14:46:44 +0800
Subject: [PATCH] 修复堆垛机线程堆垛机号为空
---
src/main/resources/mapper/WrkMastMapper.xml | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 2bda822..78d045c 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.WrkMastMapper">
+<mapper namespace="com.zy.mapper.WrkMastMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMast">
+ <resultMap id="BaseResultMap" type="com.zy.entity.WrkMast">
<id column="wrk_no" property="wrkNo" />
<result column="inv_wh" property="invWh" />
<result column="ymd" property="ymd" />
@@ -86,6 +86,9 @@
<select id="selectPakInStep1" resultMap="BaseResultMap">
select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=2 and barcode=#{barcode} and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
</select>
+ <select id="selectPakInStepBarcode" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where barcode = #{barcode}
+ </select>
<select id="selectPakInStep11" resultMap="BaseResultMap">
select top 1 * from asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=1 and (io_type=1 or io_type=10) order by io_pri desc,io_time,wrk_no ASC
@@ -108,7 +111,7 @@
</select>
<select id="selectPakOutStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and wrk_sts=12 and io_type>100 order by io_pri desc,io_time desc,wrk_no ASC
+ select top 1 * from dbo.asr_wrk_mast where source_sta_no=#{sourceStaNo} and (wrk_sts=12 or wrk_sts = 16) and io_type>100 order by io_pri desc,wrk_sts ASC,io_time desc,wrk_no ASC
</select>
<select id="selectLocMove" resultMap="BaseResultMap">
@@ -180,6 +183,16 @@
order by io_time,wrk_no
</select>
<select id="selectPakoutEmpty" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (11,12,13,14) and io_type != 11 and sta_no = #{staNo} order by io_time,wrk_no
+ select top 1 * from dbo.asr_wrk_mast where io_type = 110 and sta_no = #{staNo} order by io_time,wrk_no
+ </select>
+ <select id="selectPickStep2" resultMap="BaseResultMap">
+ select top 1 * from asr_wrk_mast where barcode = #{barcode} and (wrk_sts=14 and io_type=107) or (wrk_sts=2 and io_type=57)
+ </select>
+ <select id="selectByWrkNo" resultMap="BaseResultMap">
+ select * from asr_wrk_mast
+ where wrk_no = #{wrkNo}
+ </select>
+ <select id="selectBy104" resultType="com.zy.entity.WrkMast">
+ select top 1 * from asr_wrk_mast awm where awm.sta_no = 104 and awm.wrk_sts = 11 order by awm.appe_time
</select>
</mapper>
--
Gitblit v1.9.1