Merge remote-tracking branch 'origin/test' into test

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

@@ -46,6 +46,10 @@ public class MesLabelTemplate extends BaseBean implements Serializable {
     @ApiParam("方法代码")
     private String methodCode;
 
+    @Column(name = "BATCH_METHOD_CODE")
+    @ApiParam("批量方法代码")
+    private String batchMethodCode;
+
     @ApiParam(value = "第二个模板内容")
     private String otherTemplateContent;
 

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

@@ -98,6 +98,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("客户代码")
     private String custCode;
 
+    @Column(name = "IN_LOCATION_TIME")
+    @ApiParam("入库时间")
+    private String inLocationTime;
+
     @Transient
     @ApiParam("封箱状态")
     private String sealStatus;
@@ -140,6 +144,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("目标库位代码")
     private String destLocationCode;
 
+    @Transient
+    @ApiParam("不良处理类型")
+    private String defectActionType;
+
     public MesPackage() {
     }
 
@@ -150,4 +158,13 @@ public class MesPackage extends BaseBean implements Serializable {
         this.qty = qty;
         this.packSpecQty = packSpecQty;
     }
+
+    public MesPackage(String partNo, String partNameRdd,String packageNo, Double qty, String defectActionType, String createDatetime) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.packageNo = packageNo;
+        this.qty = qty;
+        this.defectActionType = defectActionType;
+        this.createDatetime = createDatetime;
+    }
 }

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

@@ -67,6 +67,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     @ApiParam("配置代码")
     private String prodCfgCode;
 
+    @Column(name = "IS_SMALL_SIZE")
+    @ApiParam("是否小尺寸物料")
+    private Integer isSmallSize = 1;
+
     @Transient
     @ApiParam("物料名称")
     private String partName;

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description:
@@ -19,6 +20,9 @@ public class MesPaintSnPrintModel implements Serializable {
     @ApiParam("过程条码")
     private String serialNumber;
 
+    @ApiParam("过程条码数组")
+    private List<String> serialNumberList;
+
     @ApiParam("产品条码")
     private String produceSn;