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

@@ -4331,4 +4331,50 @@ public class MesPcnEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * MES_产品颜色 	类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_COLOR_TYPE {
+
+        PRODUCT_COLOR(10, "产品颜色"),
+        MATERIAL_COLOR(20, "物料颜色");
+
+        private int value;
+        private String description;
+
+        MES_COLOR_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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 static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -194,7 +194,8 @@ public class WmsEnumUtil {
         SUB(20, "SUB", "委外采购"),
         TAR(30, "TAR", "多角贸易采购"),
         TAP(40, "TAP", "多角代采购"),
-        AMP(50, "AMP", "AMP收货");
+        AMP(50, "AMP", "AMP收货"),
+        INNER(60, "INNER", "内部收货");
 
         private int value;
         private String code;
@@ -790,7 +791,8 @@ public class WmsEnumUtil {
         CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "AGV料车出库"),
         CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "AGV料车入库"),
         AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"),
-        FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库");
+        FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库"),
+        INTERNAL_SHIPPING(600, "INTERNAL_SHIPPING", "内部发运");
         private int value;
         private String code;
         private String description;

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

@@ -52,7 +52,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
 
     @Column(name = "SEQ")
     @ApiParam("排序号")
-    private Double seq;
+    private String seq;
 
     @Column(name = "STATUS")
     @ApiParam("状态")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OnLineSnModel.java

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 动作请求参数
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+public class OnLineSnModel {
+
+    @ApiParam("扫描信息")
+    private String scanInfo;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("用户信息")
+    private String userInfo;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java

@@ -112,6 +112,9 @@ public class TorqueCollectionModel implements Serializable {
     @ApiParam("实际合格数")
     private Double actualQualifiedCount;
 
+    @ApiParam("是否已经发送了新的组合码")
+    private boolean hasSendAsciiWhenYellow;
+
     @ApiParam("工步信息行颜色")
     private String color;
 

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/IfPickData.java

@@ -47,8 +47,8 @@ public class IfPickData extends BaseBean implements Serializable {
     @ApiParam("物料编号")
     private String partNo;
 
-    @Column(name = "BIN位代码")
-    @ApiParam("物料编号")
+    @Column(name = "BIN_NO")
+    @ApiParam("BIN位代码")
     private String binNo;
 
     @Column(name = "QTY")

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

@@ -11,7 +11,12 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 /**
  * @Description : 库存移动单条码信息
@@ -163,6 +168,10 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("供应商编号")
     private String vendorNo;
 
+    @Column(name = "SRC_SN")
+    @ApiParam("原条码")
+    public String srcSn;
+
     @Transient
     @ApiParam("业务类型编码")
     @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")

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

@@ -41,7 +41,7 @@ public class WmsRfidOperateRecord extends BaseBean {
     @Column(name="OPERATE_TYPE")
     @ApiParam("操作类型")
     @AnnoOutputColumn(refClass = WmsEnumUtil.PACKAGE_TYPE.class)
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "PACKAGE_TYPE")
     public Integer operateType;
 
     @Column(name="SRC_LOCATE")