From 2ce5028d07ad38be7bdc17a0850d4459117ccfe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=90=8D=E5=96=9C?= <liumingxiy@outlook.com>
Date: Thu, 19 Dec 2024 09:12:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=99=E7=AE=B1?=
 =?UTF-8?q?=E7=9A=84=E5=BA=93=E4=BD=8D=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ktg-mes/src/main/java/com/ktg/mes/wm/domain/UcmCtBase.java | 2 +-
 ktg-mes/src/main/resources/mapper/wm/UcmCtBaseMapper.xml   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/UcmCtBase.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/UcmCtBase.java
index c31952d..428fa2f 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/UcmCtBase.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/UcmCtBase.java
@@ -33,7 +33,7 @@ public class UcmCtBase extends BaseEntity {
     private String type;
 
     /**
-     * 预留字段1
+     * 预留字段1，表示当前料箱所在库位
      */
     private String attr1;
 
diff --git a/ktg-mes/src/main/resources/mapper/wm/UcmCtBaseMapper.xml b/ktg-mes/src/main/resources/mapper/wm/UcmCtBaseMapper.xml
index 094e046..89ec864 100644
--- a/ktg-mes/src/main/resources/mapper/wm/UcmCtBaseMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/UcmCtBaseMapper.xml
@@ -55,6 +55,9 @@
             <if test="type != null  and type != ''">
                 and TYPE = #{type}
             </if>
+            <if test="attr1 != null">
+                and ATTR1 = #{attr1}
+            </if>
             <if test="attr3 != null">
                 and ATTR3 = #{attr3}
             </if>
@@ -78,6 +81,7 @@
                ucb.CODE,
                ucb.TYPE,
                ucb.REMARK,
+               ucb.ATTR1,
                ucb.ATTR3,
                ucb.CREATE_BY,
                ucb.CREATE_TIME,
@@ -102,6 +106,7 @@
                ucb.CODE,
                ucb.TYPE,
                ucb.REMARK,
+               ucb.ATTR1,
                ucb.ATTR3,
                ucb.CREATE_BY,
                ucb.CREATE_TIME,

From 47b4f94cd48f9a2018b0589f29694db4e664319c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=90=8D=E5=96=9C?= <liumingxiy@outlook.com>
Date: Thu, 19 Dec 2024 09:13:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ktg-mes/src/main/java/com/ktg/mes/wm/domain/UcmCtBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/UcmCtBase.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/UcmCtBase.java
index 428fa2f..86ba565 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/UcmCtBase.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/UcmCtBase.java
@@ -33,7 +33,7 @@ public class UcmCtBase extends BaseEntity {
     private String type;
 
     /**
-     * 预留字段1，表示当前料箱所在库位
+     * 预留字段1，表示当前料箱所在库位ID
      */
     private String attr1;