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

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

@@ -2763,8 +2763,47 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static String valueOfDescription(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 enum WMS_PART_TYPE_STR {
+        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品");
+
+        private String value;
+        private String description;
+
+        WMS_PART_TYPE_STR(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
     /**
      * 任务数据来源：检查子数据
      */
@@ -2918,6 +2957,16 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java

@@ -30,7 +30,7 @@ public class MesProduceCtgyPicture extends BaseBean {
 
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
-    private String produceCtgyCode;
+    private String produceCategoryCode;
 
     @Column(name = "SIDE_LOCATION")
     @ApiParam("面位")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -44,6 +46,7 @@ public class WmsPart extends BaseBean {
 
     @Column(name = "PART_TYPE")
     @ApiParam(value = "物料类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description")
     private String partType;
 
     @Column(name = "PART_TYPE_DESC")
@@ -169,6 +172,7 @@ public class WmsPart extends BaseBean {
 
     @Transient
     @ApiParam("库存水平")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_LEVEL_STATUS.class, refForeignKey = "value", value = "description")
     private String stockLevelStatus;
 
     @Column(name = "IS_PROD_LOT")

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

@@ -83,6 +83,10 @@ public class WmsRoutingRule extends BaseBean {
     @ApiParam(value = "线路代码")
     private String routingCode;
 
+    @Column(name = "DEST_LOCATE_NO")
+    @ApiParam(value = "目的库位")
+    private String destLocateNo;
+
     public WmsRoutingRule(){}
 
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/QuanWarnDto.java

@@ -0,0 +1,19 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+@Data
+@Api("库存预警入参")
+public class QuanWarnDto extends Pager {
+
+    private String organizeCode;
+    private Integer checked;
+    private String partNo;
+    private String partType;
+
+    public Integer getChecked() {
+        return checked == null? 0 : checked;
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveInfoModel.java

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 移动单统计输出model
+ * @Reference :
+ * @Author : gcj
+ * @CreateDate : 2019-10-31 20:04
+ * @Modify:
+ **/
+@Data
+@Api("移动单统计输出model")
+public class WmsMoveInfoModel {
+
+
+    @ApiParam(value = "操作时间")
+    private String modifyDateTime;
+    @ApiParam(value = "物料号")
+    private String partNo;
+    @ApiParam(value = "物料名称")
+    private String partNameRdd;
+    @ApiParam(value = "交易类型")
+    private String transTypeCode;
+    @ApiParam(value = "交易类型名称")
+    private String transTypeName;
+    @ApiParam(value = "业务类型")
+    private String busiTypeCode;
+    @ApiParam(value = "处理数量")
+    private String sumQty;
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+    @ApiParam(value = "操作状态")
+    private String itemStatus;
+    public WmsMoveInfoModel() {
+    }
+
+    public WmsMoveInfoModel(String modifyDateTime, String partNo, String partNameRdd, String transTypeCode, String transTypeName, String busiTypeCode, String sumQty, String organizeCode) {
+        this.modifyDateTime = modifyDateTime;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.busiTypeCode = busiTypeCode;
+        this.sumQty = sumQty;
+        this.organizeCode = organizeCode;
+    }
+}