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/WmsEnumUtil.java

@@ -254,7 +254,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ORDER_STATUS {
-        CREATE(10, "新建"),
+        CREATE(1, "新建"),
         RECEIPT(10, "收货中"),
         RECEIPT_FINISH(20, "收货完成"),
         WAREHOUSING(30, "入库中"),
@@ -500,6 +500,40 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 库位状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOCATE_STATUS {
+        CREATE(10, "空库位"), FINISH(20, "非空"), FAIL(30, "已满");
+
+        private int value;
+        private String description;
+
+        LOCATE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return 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;
+        }
+    }
+
+    /**
      * 外部单据：移库单移动类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -1753,6 +1787,4 @@ public class WmsEnumUtil {
             return description;
         }
     }
-
-
 }

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

@@ -1,7 +1,10 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails;
+import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -12,48 +15,7 @@ import java.util.List;
  * @Modify:
  **/
 @Data
-public class WmsMoveDetailsModel {
+public class WmsMoveDetailsModel implements Serializable {
-    public String orderNo;
+    private WmsMoveDetails details;
-
+    private List<WmsMoveSn> moveSn;
-    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

@@ -1,7 +1,9 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMaster;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -12,14 +14,7 @@ import java.util.List;
  * @Modify:
  **/
 @Data
-public class WmsMoveMasterModel {
+public class WmsMoveMasterModel implements Serializable {
-    public String orderNo;
+    private WmsMoveMaster moveMaster;
-
-    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

@@ -1,42 +0,0 @@
-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-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java

@@ -7,12 +7,10 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-import org.springframework.data.annotation.Transient;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import java.util.List;
 
 /**
  * @Description : 库存移动单主表信息
@@ -49,4 +47,15 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam(value = "交易类型代码")
     private String transTypeCode;
 
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam(value = "错误信息")
+    private String errorMessage;
+
+    @Column(name="IS_URGENT")
+    @ApiParam(value = "是否紧急", example = "0")
+    public Integer isUrgent;
+
+    @Column(name = "CAR_NO")
+    @ApiParam(value = "车牌号")
+    private String carNo;
 }

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

@@ -52,4 +52,17 @@ public class WmsTransType extends BaseBean {
     @ApiParam("中文流程名称")
     private String agNameC;
 
+    @Column(name = "TRANS_TYPE_DESC")
+    @ApiParam(value = "类型说明")
+    private String transTypeDesc;
+
+    @Column(name = "TM_ID")
+    @ApiParam(value = "交易处理组件", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long tmId;
+
+    @Column(name = "OP_TYPE_ID")
+    @ApiParam(value = "作业类型编号", example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long opTypeId;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransModuleRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTransModule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层仓用方法控制
+ * @Reference :
+ * @Author : siliter
+ * @CreateDate : 2019-03-06 9:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsTransModuleRepository extends BaseRepository<WmsTransModule, Long> {
+}