Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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;

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())) {
+        if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectValueRdd())) {
-            DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValue", packBean);
+            DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValueRdd", packBean);
         }
         if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectType())) {
             DdlPreparedPack.getNumEqualPack(mesEquNotifyObjectCfg.getNotifyObjectType(), "notifyObjectType", packBean);

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;
     }
 }