diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java index 808c05f..2265b41 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java @@ -60,6 +60,9 @@ public class PaintWorkOrderSnModel extends BaseBean { @ApiParam("父阶物料名称") private String parentPartName; + @ApiParam("实际包装数量") + private Integer compQty; + private List prodPackageList; private String partNameRdd; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java index 28f65f5..b554be7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -21,6 +21,9 @@ public class ProdPackModel implements Serializable { @ApiParam("产品条码") public String productSn; + @ApiParam("过程条码") + private String serialNumber; + // 包装主表--包装编号 @ApiParam("一检箱条码") public String packageNo; @@ -60,15 +63,15 @@ public class ProdPackModel implements Serializable { public ProdPackModel() { } - public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) { - this.productSn = productSn; + public ProdPackModel(String serialNumber, String packageNo, String createDatetime, Integer printStatus) { + this.serialNumber = serialNumber; this.packageNo = packageNo; this.createDatetime = createDatetime; this.printStatus = printStatus; } - public ProdPackModel(String productSn, String packageNo, String custSn, Integer printStatus, String modifyDatetime) { - this.productSn = productSn; + public ProdPackModel(String serialNumber, String packageNo, String custSn, Integer printStatus, String modifyDatetime) { + this.serialNumber = serialNumber; this.packageNo = packageNo; this.custSn = custSn; this.printStatus = printStatus;