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

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

@@ -26,6 +26,9 @@ public class MesPackageQueryModel extends MesPackage {
     @ApiParam("工作单元名称")
     private String workCellName;
 
+    @ApiParam("是否封箱Name")
+    private String isSealedName;
+
     public MesPackageQueryModel(String workCenterName, String workCellName) {
         this.workCenterName = workCenterName;
         this.workCellName = workCellName;
@@ -37,4 +40,13 @@ public class MesPackageQueryModel extends MesPackage {
         this.workCenterName = workCenterName;
         this.workCellName = workCellName;
     }
+
+    public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName,String isSealedName) {
+        super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo);
+        this.isSealedName=isSealedName;
+        this.processName=processName;
+        this.workCenterName = workCenterName;
+        this.workCellName = workCellName;
+    }
+
 }

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 产品条码返回model
+ * @author xiangming.liao
+ * @version 1.0
+ * @date 2021/01/06 10:43
+ **/
+@Data
+@ApiModel("产品条码返回model")
+public class CosmaReportProductSnModel extends MesProduceSn implements Serializable {
+
+    private static final long serialVersionUID = 5217363746963291483L;
+    @ApiParam("条码类型Name")
+    private String snTypeName;
+
+}