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

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

@@ -36,7 +36,11 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
 
     @Column(name = "MIN_CAPACITY")
     @ApiParam("最小库存")
-    private Integer minCapacity;
+    private Integer minCapacity = 0;
+
+    @Column(name = "MAX_CAPACITY")
+    @ApiParam("最大库存")
+    private Integer maxCapacity = 0;
 
     @Column(name = "TOTAL_CAPACITY")
     @ApiParam("总容量")

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

@@ -59,6 +59,4 @@ 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/model/mgnbj/Head.java

@@ -36,4 +36,7 @@ public class Head implements Serializable {
     @XStreamAlias("status")
     private String status;
 
+    @XStreamAlias("vehicleName")
+    private String vehicleName;
+
 }

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

@@ -25,6 +25,9 @@ public class Part implements Serializable {
     @XStreamAlias("qty")
     private String qty;
 
+    @XStreamAlias("componentGroup")
+    private String componentGroup;
+
     @ApiParam("是否是baseModule")
     private boolean isBaseModule;
 
@@ -49,7 +52,6 @@ public class Part implements Serializable {
     @ApiParam("配方顺序")
     private String recipeSeq;
 
-
     @ApiParam("Mes物料号")
     private String partNo;
 

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,7 +37,7 @@ public class Pn implements Serializable {
     private List<Part> parts;
 
     @XStreamAlias("optioncode")
-    private List<CodeRule> codeRules;
+    private List<CodeRule> codeRules = new ArrayList<>();
 
     @ApiParam("新vin号")
     private String newVin;

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

@@ -76,6 +76,11 @@ public class MesPpMaster extends BaseBean{
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer seq = 0;
 
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String remark;
+
     public Integer getOrderStatus() {
         return orderStatus == null ? 0 : this.orderStatus.intValue();
     }