Merge branch '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

@@ -4768,7 +4768,8 @@ public class WmsEnumUtil {
         LINE_PULL(30, "巡线拉动"),
         PLANNED_PULL(40, "计划拉动"),
         ANDON_PULL(50, "安灯拉动"),
-        EXTERNAL_PULL(60, "手工拉动");
+        EXTERNAL_PULL(60, "手工拉动"),
+        WORKORDER_PULL(70, "工单拉动");
 
         private int value;
         private String description;

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

@@ -40,4 +40,24 @@ public class MesContainer extends BaseBean {
     @Column(name = "USE_STATUS")
     @ApiParam(value = "使用状态")
     private String useStatus;
+
+    @Column(name = "IP_ADDRESS")
+    @ApiParam(value = "IP")
+    private String ipAddress;
+
+    @Column(name = "PORT")
+    @ApiParam(value = "端口")
+    private String port;
+
+    @Column(name = "UNLOCK_DO")
+    @ApiParam(value = "接收DO")
+    private String unlockDo;
+
+    @Column(name = "RED_LIGHT_DO")
+    @ApiParam(value = "红灯DO")
+    private String redLightDo;
+
+    @Column(name = "TIME_SECOND")
+    @ApiParam(value = "处理时间(秒)")
+    private String timeSecond;
 }

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

@@ -58,4 +58,7 @@ public class MesProdWorkCenter extends BaseBean implements Serializable {
 
     @ApiParam("物料名称")
     private String partName;
+
+    @ApiParam("工作中心名称")
+    private String workCenterName;
 }

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

@@ -173,4 +173,8 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
     @Column(name = "IS_CHECK")
     @ApiParam("是否复核校验")
     private Integer isCheck;
+
+    @Column(name = "PICK_QTY")
+    @ApiParam("拣货数量")
+    private Integer pickQty;
 }

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

@@ -84,6 +84,9 @@ public class ProductInfoManageModel {
     @ApiParam("主队列编号")
     private String orderNo;
 
+    @ApiParam("校验VIN")
+    private String checkVinCode;
+
     @ApiParam("总队列类型")
     private List<Integer> queueTypeList;
 

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

@@ -52,6 +52,11 @@ public class MesPpDetails extends BaseBean{
     @ApiParam(value = "工单数量", example = "0")
     public Double qty;
 
+    @Column(name = "TRANS_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "处理数量", example = "0")
+    public Double transQty = 0D;
+
     @Column(name="PART_GROUP_NO")
     @ApiParam("零件组号")
     public String partGroupNo;