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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -1047,4 +1047,38 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+
+    //messageReceiverType
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MESSAGE_RECEIVER_TYPE {
+        INTERNAL(1, "内部人员接收"),
+        EXTERNAL(2, "外部人员接收"),
+        URGENT(3, "紧急联系人接收");
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private MESSAGE_RECEIVER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-model/pom.xml

@@ -29,6 +29,11 @@
             <artifactId>i3plus-pojo-report</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-wms</artifactId>
+        </dependency>
+
     </dependencies>
 
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ActionButlerModel.java

@@ -1,28 +0,0 @@
-package cn.estsh.i3plus.pojo.model.wms;
-
-import lombok.Data;
-
-/**
- * @Description : 流程管家模型
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2018-11-28 15:50
- * @Modify:
- **/
-@Data
-public class ActionButlerModel {
-
-    private String orderNo;
-
-    private String sn;
-
-    private String aLId;
-
-    private String userNo;
-
-    private String fixNo;
-
-    private String barCode;
-
-    private String funCallName;
-}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 库存移动明细模型
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2019-03-06 15:50
+ * @Modify:
+ **/
+@Data
+public class WmsMoveDetailsModel {
+    public String orderNo;
+
+    public Integer item;
+
+    public String partNo;
+
+    public String partNameRdd;
+
+    public String vendorNo;
+
+    public String custNo;
+
+    public Double qty;
+
+    public Double transQty;
+
+    public String unit;
+
+    public String srcWhNo;
+
+    public String srcZoneNo;
+
+    public String srcLocateNo;
+
+    public String destWhNo;
+
+    public String destZoneNo;
+
+    public String destLocateNo;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    public Integer itemStatus;
+
+    /**
+     * ASN,PO,SO
+     */
+    public Integer refType;
+
+    public String refSrc;
+
+    private List<WmsMoveSnModel> moveDetails;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 库存移动单模型
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2019-03-06 15:50
+ * @Modify:
+ **/
+@Data
+public class WmsMoveMasterModel {
+    public String orderNo;
+
+    public Integer orderStatus;
+
+    public String reMark;
+
+    private String transTypeCode;
+
+    private List<WmsMoveDetailsModel> moveDetails;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveSnModel.java

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+/**
+ * @Description : 库存移动条码模型
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2019-03-06 15:50
+ * @Modify:
+ **/
+@Data
+public class WmsMoveSnModel {
+    public String orderNo;
+
+    public Integer item;
+
+    public String partNo;
+
+    public String partNameRdd;
+
+    public String unit;
+
+    public String sn;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    public Integer itemStatus;
+
+    public String reMark;
+
+    public String lotNo;
+
+    public String packAgeNo;
+
+    public Double qty;
+
+    public String srcLocateNo;
+
+    public String destLocateNo;
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java

@@ -55,6 +55,10 @@ public class SysConfig extends BaseBean {
     @ApiParam(value ="参数值")
     private String configValue;
 
+    @Column(name="CONFIG_VALUE_OPTION")
+    @ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{key:'',value:''}")
+    private String configValueOption;
+
     @Column(name="CONFIG_DESCRIPTION")
     @ApiParam(value ="参数描述")
     private String configDescription;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java

@@ -55,8 +55,12 @@ public class SysMessage extends BaseBean {
     @ApiParam(value ="发送者名称" )
     private String messageSenderNameRdd;
 
+    @Column(name="MESSAGE_RECEIVER_TYPE")
+    @ApiParam(value ="收件人类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1")
+    private Integer messageReceiverType;
+
     @Column(name="MESSAGE_RECEIVERS_ID")
-    @ApiParam(value ="发送者id" )
+    @ApiParam(value ="收件者id" )
     private String messageReceiversId;
 
     @Column(name="MESSAGE_RECEIVERS_NAME_RDD")

modules/i3plus-pojo-wms/pom.xml

@@ -16,11 +16,6 @@
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>
-            <artifactId>i3plus-pojo-model</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-base</artifactId>
         </dependency>
     </dependencies>

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java

@@ -1,7 +1,5 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
-import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
-import cn.estsh.i3plus.pojo.model.wms.OptionModel;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -45,7 +43,7 @@ public class WmsActionResponseBean<Obj> {
     public List<String> informations;
 
     @ApiParam("可选项")
-    public List<OptionModel> options;
+    public List<WmsOptionModel> options;
 
     @ApiParam("选中的明细数据")
     public Obj details;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOperationBean.java

@@ -1,13 +1,11 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.model.wms.OptionModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description : PDA传输到后台的实体bean对象

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOptionModel.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.model.wms;
+package cn.estsh.i3plus.pojo.wms.bean;
 
 import lombok.Data;
 
@@ -10,7 +10,7 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class OptionModel {
+public class WmsOptionModel {
 
     private String code;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java

@@ -106,4 +106,8 @@ public class WmsPart extends BaseBean {
     @Column(name="LOT_CHECK_RULE")
     @ApiParam(value ="批次校验规则")
     private String lotCheckRule;
+
+    @Column(name="IN_LOCATE_NO")
+    @ApiParam(value ="默认入库库位")
+    private String inLocateNo;
 }