From 669f4a3c5480172a83b94f604f3cd0448ce8aad4 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 03 三月 2023 15:48:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 2 +-
src/main/resources/mapper/WrkMastMapper.xml | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 6f5652b..1f7a1bd 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -309,7 +309,7 @@
@ApiModelProperty(value= "")
@TableField("Pdc_type")
- private String PdcType;
+ private String pdcType;
@ApiModelProperty(value= "")
@TableField("ctn_no")
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index bef9d78..a90895b 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -58,7 +58,7 @@
<result column="log_err_time" property="logErrTime" />
<result column="log_err_memo" property="logErrMemo" />
<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" />
@@ -114,7 +114,7 @@
</select>
<select id="selectPakOutStep111215" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and wrk_sts in (11,12,13,14,15,16) and io_type>100 order by io_pri desc,io_time,wrk_no asc
+ select top 1 * from dbo.asr_wrk_mast where crn_no=#{crnNo} and source_sta_no = #{sourceStaNo} and wrk_sts in (11,12,13,14,15,16) and io_type>100 order by io_pri desc,io_time,wrk_no asc
</select>
<select id="selectWorkingOfPakOutBySource" resultMap="BaseResultMap">
@@ -185,6 +185,12 @@
and crn_no = #{crnNo}
</if>
</select>
+ <select id="selectAll" resultMap="BaseResultMap">
+ select * from dbo.asr_wrk_mast where 1=1
+ and wrk_sts!=1 and wrk_sts!=11
+ and wrk_sts!=18 and wrk_sts!=9 and wrk_sts < 20 and io_type!=11
+ and source_sta_no=#{staNo}
+ </select>
<select id="selectPakinWorkingByGroupLoc" resultMap="BaseResultMap">
select top 1 *
--
Gitblit v1.9.1