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

 Conflicts:

	modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java

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

@@ -248,6 +248,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("组内编号")
     private Integer groupNo;
 
+    @Transient
+    @ApiParam("总数")
+    private long sumQty;
+
     public MesProduceSn() {
     }
 
@@ -257,6 +261,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
         this.qty = qty;
     }
 
+
+    public MesProduceSn(String workCenterCode, String partNo, String partNameRdd, long sumQty) {
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sumQty = sumQty;
+    }
+
     public MesProduceSn(Long id, String serialNumber, String productSn, String partNo, String partNameRdd, Double qty, Integer qcStatus, Integer snStatus,
                         Integer printCount, Integer printStatus, String workCenterCode, String workCellCode, String routeCode, String processCode,
                         String nextProcessCode, String inWorkCenterTime, String outWorkCenterTime, String shippingTime, String workOrderNo,

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

@@ -159,4 +159,8 @@ public class MesQcOrder extends BaseBean implements Serializable {
     @Transient
     @ApiParam("班长")
     private String squadLeader;
+
+    @Transient
+    @ApiParam("质检单集合")
+    private List<String> orderNoList;
 }

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

@@ -78,11 +78,11 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
 
     @Column(name = "QTY")
     @ApiParam("数量")
-    private Integer qty;
+    private Integer qty = 0;
 
     @Column(name = "FINISH_QTY")
     @ApiParam("已检数量")
-    private Integer finishQty;
+    private Integer finishQty = 0;
 
     @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java

@@ -30,6 +30,7 @@ public class WmsJobParamModel implements Serializable {
     private String zoneNos;//存储区
     private String id;//id
     private String groupName;//组名称
+    private String lineNo;//产线
 
 
     public int getMinuteDiffVal() {

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -3218,6 +3218,9 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result);
+        if (details.getIsRequire() != null) {
+            DdlPreparedPack.getNumEqualPack(details.getIsRequire(), "isRequire", result);
+        }
         getStringBuilderPack(details, result);
         return result;
     }