Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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() {
     }
 }

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

pom.xml

@@ -16,6 +16,7 @@
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
     <version>1.0-TEST-SNAPSHOT</version>
+
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>