Merge branch 'test'

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

@@ -304,6 +304,7 @@ public class WmsEnumUtil {
     /**
      * 产品入库，发运状态
      * WMS_产品报工明细信息 ：单据状态
+     * WMS_发泡打箱包装
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PRODUCT_INSTOCK_STATUS {
@@ -2962,4 +2963,63 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 库位校验源库位目标库位参数
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SRC_DEST_LOCATE {
+        SRC(10, "SRC", "源库位"),
+        DEST(20, "DEST", "目标库位");
+
+        private int value;
+        private String code;
+        private String description;
+
+        SRC_DEST_LOCATE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public static SRC_DEST_LOCATE codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value==(value)) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -130,10 +130,14 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam("交易类型名称")
     private String transTypeName;
 
+    @Column(name="FIX_ID")
+    @ApiParam(value = "设备编号")
+    public String fixId;
+
     public WmsMoveMaster(){};
 
     public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
-                         String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) {
+                         String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId) {
         this.id = id;
         this.orderNo = orderNo;
         this.organizeCode = organizeCode;
@@ -149,7 +153,7 @@ public class WmsMoveMaster extends BaseBean {
         this.destZoneNo = destZoneNo;
         this.transQty = transQty;
         this.rejectQty = rejectQty;
-
+        this.fixId = fixId;
 
     }
 

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

@@ -0,0 +1,76 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : WMS_包装箱条码表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-07-17 11:32
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_PACK_SN")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="包装箱条码表",description = "包装箱条码表")
+public class WmsPackSn extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "订单号")
+    private String orderNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam(value = "物料名称")
+    private String partNameAdd;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "SID")
+    @ApiParam("SID")
+    private Double sId;
+
+    @Column(name = "COMMIT_DATE")
+    @ApiParam(value = "提交日期")
+    private String commitDate;
+
+    @Column(name = "COMMIT_TIME")
+    @ApiParam(value = "提交时间")
+    private String commitTime;
+
+    @Column(name = "SN")
+    @ApiParam(value = "条码")
+    private String sn;
+
+    /**
+     * 状态:10=新建,20=已处理,30=处理出错 PRODUCT_INSTOCK_STATUS
+     */
+    @Column(name = "ORDER_STATUS")
+    @ApiParam(value = "状态")
+    private Integer orderStatus;
+
+    /**
+     * 数据来源:ZMMES=知明MES,TBMES=MES接口 SRC_STATUS
+     */
+    @Column(name = "SRC")
+    @ApiParam(value = "单据来源")
+    private String src;
+}

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

@@ -230,8 +230,11 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "ERP库存地")
     public String erpZoneNo;
 
-    public WmsStockSn(){}
+    @Transient
+    @ApiParam(value = "目标数量")
+    public Double destQty;
 
+    public WmsStockSn(){}
 
     public WmsStockSn(String partNo){
         this.partNo = partNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPackSnRepository.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.WmsPackSn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-07-17 13:36
+ * @Modify:
+ **/
+@Repository
+public interface WmsPackSnRepository extends BaseRepository<WmsPackSn, Long> {
+}