diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java index 0882b81..b018ee8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java @@ -41,6 +41,10 @@ public class MesEquNotifyObjectCfg extends BaseBean { @ApiParam("对象值") private String notifyObjectValue; + @Column(name="NOTIFY_OBJECT_VALUE_RDD") + @ApiParam("对象值") + private String notifyObjectValueRdd; + @Column(name="NOTIFY_OBJECT_TYPE") @ApiParam("对象类型") private Integer notifyObjectType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 6887621..33494dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1454,8 +1454,8 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectName())) { DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectName(), "notifyObjectName", packBean); } - if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectValue())) { - DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValue", packBean); + if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectValueRdd())) { + DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValueRdd", packBean); } if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectType())) { DdlPreparedPack.getNumEqualPack(mesEquNotifyObjectCfg.getNotifyObjectType(), "notifyObjectType", packBean); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 8af7dae..c905237 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -182,11 +182,12 @@ public class WmsPart extends BaseBean { public WmsPart() { } - public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty) { + public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) { this.partNo = partNo; this.partName = partName; this.max = maxQty; this.min = minQty; this.qty = cqty; + this.partType = partType; } }