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/bean/MesPackage.java

@@ -156,6 +156,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("明细总数")
     private Integer detailTotal = 0;
 
+    @Transient
+    @ApiParam("托包规数量")
+    private Double qty2;
+
     public MesPackage() {
     }
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java

@@ -206,6 +206,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("电检结果")
     private String electricResult;
 
+    @Transient
+    @ApiParam("包规数量")
+    private Double packageQty;
+
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java

@@ -396,6 +396,10 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getNumEqualPack(mesPackage.getPackLevel(), "packLevel", packBean);
         }
 
+        if (!StringUtils.isEmpty(mesPackage.getWorkOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPackage.getWorkOrderNo(), "workOrderNo", packBean);
+        }
+
         if (!StringUtils.isEmpty(mesPackage.getPackageNo())) {
             DdlPreparedPack.getStringLikerPack(mesPackage.getPackageNo(), "packageNo", packBean);
         }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java

@@ -204,4 +204,10 @@ public class WmsDocFgDetail extends BaseBean {
 
     public WmsDocFgDetail() {
     }
+
+    public WmsDocFgDetail(String sn, String mfgLocNo, String partNo) {
+        this.sn = sn;
+        this.mfgLocNo = mfgLocNo;
+        this.partNo = partNo;
+    }
 }