diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index fc5e470..ad0869f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -185,6 +185,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("客户名称") private String custName; + @Transient + @ApiParam("汇总数量") + private Integer gatherQty = 0; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 7cbd75b..94dacc2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -91,6 +91,9 @@ public class GenSerialNoModel { @ApiParam("客户工厂代码") private String custProdLineCode; + @ApiParam("工序代码") + private String processCode; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java index ad4b799..982b340 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnPackageSnTraceReportModel.java @@ -45,10 +45,14 @@ public class MgnPackageSnTraceReportModel { @ApiParam(value = "修改日期查询用,查询结束日期") public String createDateTimeEnd; + + @ApiParam(value = "工单号") + public String workOrderNo; + public MgnPackageSnTraceReportModel() { } - public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName) { + public MgnPackageSnTraceReportModel(String packageNo, String packageNo2, String serialNumber, String partNo, String partNameRdd, Integer isSealed, String createDatetime, String workCenterCode, String workCenterName, String workOrderNo) { this.packageNo = packageNo; this.packageNo2 = packageNo2; this.serialNumber = serialNumber; @@ -58,5 +62,7 @@ public class MgnPackageSnTraceReportModel { this.createDatetime = createDatetime; this.workCenterCode = workCenterCode; this.workCenterName = workCenterName; + this.workOrderNo = workOrderNo; + } }