From 2e5837667e60378a06c7d8d1a4b095c4ba6e2d06 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 17 十一月 2025 09:29:08 +0800
Subject: [PATCH] 限制优化
---
src/main/resources/mapper/WrkMastMapper.xml | 138 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 113 insertions(+), 25 deletions(-)
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 55424bc..b07af7d 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" />
@@ -55,15 +55,39 @@
<result column="log_mk" property="logMk" />
<result column="log_err_time" property="logErrTime" />
<result column="log_err_memo" property="logErrMemo" />
+ <result column="Pdc_type" property="pdcType" />
<result column="barcode" property="barcode" />
- <result column="Pdc_type" property="PdcType" />
+<!-- <result column="Pdc_type" property="PdcType" />-->
<result column="ctn_no" property="ctnNo" />
<result column="full_plt" property="fullPlt" />
-
+ <result column="rgv_no" property="rgvNo" />
+ <result column="rgv_ssta_no" property="rgvSstaNo" />
+ <result column="rgv_dsta_no" property="rgvDstaNo" />
+ <result column="rgv_create_time" property="rgvCreateTime" />
+ <result column="rgv_finish_time" property="rgvFinishTime" />
+ <result column="work_no_other" property="workNoOther" />
</resultMap>
+
+ <select id="selectByIoTypeAndWrkSts" resultMap="BaseResultMap">
+ select top 1 * from asr_wrk_mast where io_type = #{ioType} and wrk_sts = #{wrkSts} order by io_time
+ </select>
+
+ <select id="selectInGzxCount" resultType="java.lang.Integer">
+ select
+ count(*)
+ from
+ asr_wrk_mast m
+ where
+ m.sta_no = #{site}
+ and (m.whs_type is null or EXISTS (select 1 from asr_bas_devp d where d.wrk_no = m.wrk_no))
+ </select>
<select id="selectByLocNo" resultMap="BaseResultMap">
select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} and (ctn_no is null or ctn_no != 'Y')
+ </select>
+
+ <select id="selectByLocNo1" resultMap="BaseResultMap">
+ select top 1 * from asr_wrk_mast where source_loc_no = #{sourceLocNo} or loc_no = #{sourceLocNo}
</select>
<select id="selectToBeCompleteData" resultMap="BaseResultMap">
@@ -82,13 +106,16 @@
<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
</select>
<select id="selectPakInStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
</select>
<select id="selectPakInStep3" resultMap="BaseResultMap">
@@ -104,7 +131,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">
@@ -119,26 +146,26 @@
select top 1 * from dbo.asr_wrk_mast where 1=1 and (wrk_sts=3 or wrk_sts=12) and crn_no=#{crnNo} order by io_time,wrk_no
</select>
- <!-- 鍏ュ簱浠诲姟 -->
- <select id="selectWorkingPakin" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = 180 order by io_time,wrk_no
- </select>
+<!-- <!– 鍏ュ簱浠诲姟 –>-->
+<!-- <select id="selectWorkingPakin" resultMap="BaseResultMap">-->
+<!-- select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = 180 order by io_time,wrk_no-->
+<!-- </select>-->
- <!-- 鍑哄簱浠诲姟 -->
- <select id="selectWorkingPakout" resultMap="BaseResultMap">
- select top 1 *
- from dbo.asr_wrk_mast
- where (wrk_sts in (11,12)
- or (wrk_sts in (14,15) and wrk_no in
- (
- select wrk_no
- from asr_bas_devp
- where wrk_no > 0)
- ))
- and io_type != 11
- and source_sta_no = 180
- order by io_time,wrk_no
- </select>
+<!-- <!– 鍑哄簱浠诲姟 –>-->
+<!-- <select id="selectWorkingPakout" resultMap="BaseResultMap">-->
+<!-- select top 1 *-->
+<!-- from dbo.asr_wrk_mast-->
+<!-- where (wrk_sts in (11,12)-->
+<!-- or (wrk_sts in (14,15) and wrk_no in-->
+<!-- (-->
+<!-- select wrk_no-->
+<!-- from asr_bas_devp-->
+<!-- where wrk_no > 0)-->
+<!-- ))-->
+<!-- and io_type != 11-->
+<!-- and source_sta_no = 180-->
+<!-- order by io_time,wrk_no-->
+<!-- </select>-->
<select id="selectCrnWorking" resultMap="BaseResultMap">
select top 1 * from dbo.asr_wrk_mast where 1=1 and wrk_sts in (3,4,11,12) and crn_no=#{crnNo} order by io_time,wrk_no
@@ -152,4 +179,65 @@
select * from dbo.asr_wrk_mast where 1=1 and wrk_sts = 14 and io_type in (103,104,107)
</select>
+ <select id="selectPakOutStep11" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no=#{sourceStaNo} and wrk_sts=11 and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ </select>
+
+ <!-- 鍏ュ嚭搴撴ā寮忕浉鍏� -->
+ <select id="selectWorkingPakin" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts in (2,3,4) and io_type != 11 and source_sta_no = #{sourceStaNo} order by io_time,wrk_no
+ </select>
+
+ <select id="selectWorkingPakout" resultMap="BaseResultMap">
+ select top 1 *
+ from dbo.asr_wrk_mast
+ where (wrk_sts in (11,12)
+ or (wrk_sts in (14,15) and wrk_no in
+ (
+ select wrk_no
+ from asr_bas_devp
+ where wrk_no > 0)
+ ))
+ and io_type != 11
+ and source_sta_no = #{sourceStaNo}
+ order by io_time,wrk_no
+ </select>
+ <select id="selectPakoutEmpty" resultMap="BaseResultMap">
+ 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>
+ <select id="selectCountByKb" resultType="java.lang.Integer">
+SELECT
+ count(*)
+FROM
+ asr_wrk_mast w
+WHERE
+ (w.sta_no = 1031
+ AND w.wrk_sts != 11
+ AND w.wrk_sts != 15)
+ OR (
+ w.wrk_sts = 15
+ AND EXISTS (
+ SELECT
+ 1
+ FROM
+ asr_bas_devp d
+ WHERE
+ d.wrk_no = w.wrk_no
+ AND d.dev_no IN (1031, 1032, 1033)
+ )
+)
+ </select>
+ <select id="selectCountHisByIoTypeAndIoTime" resultType="java.lang.Integer">
+ select count (*) from asr_wrk_mast_log where io_type = #{ioType} and io_time = #{ioTime}
+ </select>
</mapper>
--
Gitblit v1.9.1