diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdItem.java b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdItem.java
index 9e95461..1374927 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdItem.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/md/domain/MdItem.java
@@ -40,8 +40,8 @@ public class MdItem extends BaseEntity {
private Integer attr1;
private Integer attr2;
/* 预留字段3 - 为空或者0表示普通物料-1表示大物料 */
- private String attr3;
- private String attr4;
+ private Integer attr3;
+ private Integer attr4;
private Long count;
@@ -204,19 +204,19 @@ public class MdItem extends BaseEntity {
this.attr2 = attr2;
}
- public String getAttr3() {
+ public Integer getAttr3() {
return attr3;
}
- public void setAttr3(String attr3) {
+ public void setAttr3(Integer attr3) {
this.attr3 = attr3;
}
- public String getAttr4() {
+ public Integer getAttr4() {
return attr4;
}
- public void setAttr4(String attr4) {
+ public void setAttr4(Integer attr4) {
this.attr4 = attr4;
}
@@ -249,9 +249,9 @@ public class MdItem extends BaseEntity {
", maxStock=" + maxStock +
", highValue='" + highValue + '\'' +
", attr1=" + attr1 +
- ", attr2='" + attr2 + '\'' +
- ", attr3='" + attr3 + '\'' +
- ", attr4='" + attr4 + '\'' +
+ ", attr2=" + attr2 +
+ ", attr3=" + attr3 +
+ ", attr4=" + attr4 +
", count=" + count +
'}';
}
diff --git a/ktg-mes/src/main/resources/mapper/md/MdItemMapper.xml b/ktg-mes/src/main/resources/mapper/md/MdItemMapper.xml
index d326671..fbaf1f4 100644
--- a/ktg-mes/src/main/resources/mapper/md/MdItemMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/md/MdItemMapper.xml
@@ -52,6 +52,8 @@
high_value,
attr1,
attr2,
+ attr3,
+ attr4,
create_by,
create_time,
remark
@@ -66,8 +68,8 @@
AND (item_type_id = #{itemTypeId} OR item_type_id in (select item_type_id
- from md_item_type
- where find_in_set(#{itemTypeId}, ancestors)))
+ from md_item_type
+ where find_in_set(#{itemTypeId}, ancestors)))
AND item_name like concat('%', #{itemName}, '%')
@@ -84,38 +86,38 @@