kelvin/wms-gj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Kelvin 2024-12-19 09:15:05 +08:00
commit 105ac642b5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ktg-mes/src/main/java/com/ktg/mes/wm/domain/UcmCtBase.java
View File

@ -33,7 +33,7 @@ public class UcmCtBase extends BaseEntity {
private String type; private String type;
/** /**
* 预留字段1 * 预留字段1，表示当前料箱所在库位ID
*/ */
private String attr1; private String attr1;

5
ktg-mes/src/main/resources/mapper/wm/UcmCtBaseMapper.xml
View File

@ -55,6 +55,9 @@
<if test="type != null and type != ''"> <if test="type != null and type != ''">
and TYPE = #{type} and TYPE = #{type}
</if> </if>
<if test="attr1 != null">
and ATTR1 = #{attr1}
</if>
<if test="attr3 != null"> <if test="attr3 != null">
and ATTR3 = #{attr3} and ATTR3 = #{attr3}
</if> </if>
@ -78,6 +81,7 @@
ucb.CODE, ucb.CODE,
ucb.TYPE, ucb.TYPE,
ucb.REMARK, ucb.REMARK,
ucb.ATTR1,
ucb.ATTR3, ucb.ATTR3,
ucb.CREATE_BY, ucb.CREATE_BY,
ucb.CREATE_TIME, ucb.CREATE_TIME,
@ -102,6 +106,7 @@
ucb.CODE, ucb.CODE,
ucb.TYPE, ucb.TYPE,
ucb.REMARK, ucb.REMARK,
ucb.ATTR1,
ucb.ATTR3, ucb.ATTR3,
ucb.CREATE_BY, ucb.CREATE_BY,
ucb.CREATE_TIME, ucb.CREATE_TIME,