Merge remote-tracking branch 'origin/master'

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;
 

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,