diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java index 84449e1..236b41d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java @@ -19,6 +19,9 @@ public class ProduceDispPassRateModel { @ApiParam("统计时间") private String statisticalTime; + @ApiParam("产品条码") + private String srialNumber; + //统计选项(10=全部,20=冻结,30=报废) @ApiParam("统计选项") private Integer statisticalOption; @@ -44,6 +47,16 @@ public class ProduceDispPassRateModel { this.ratio = ratio; } + public ProduceDispPassRateModel(String statisticalTime, String srialNumber, Integer statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) { + this.statisticalTime = statisticalTime; + this.srialNumber = srialNumber; + this.statisticalOption = statisticalOption; + this.freezeQty = freezeQty; + this.scrapQty = scrapQty; + this.produceSumQty = produceSumQty; + this.ratio = ratio; + } + public ProduceDispPassRateModel() { } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java index 7437761..03629f3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSerialSn.java @@ -34,7 +34,8 @@ import javax.persistence.Table; @Index(columnList = "BATCH_NO"), @Index(columnList = "STOCK_SN"), @Index(columnList = "PART_NO"), - @Index(columnList = "SERIAL_SN") + @Index(columnList = "SERIAL_SN"), + @Index(columnList = "ORGANIZE_CODE") }) @DynamicInsert @DynamicUpdate diff --git a/pom.xml b/pom.xml index e57347e..f8d2d25 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,7 @@ i3plus-pojo pom 1.0-TEST-SNAPSHOT + modules/i3plus-pojo-base modules/i3plus-pojo-platform