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/QueueOrderModel.java

@@ -91,6 +91,9 @@ public class QueueOrderModel implements Serializable {
     @ApiParam("产品位置")
     private String produceCategoryCode;
 
+    @ApiParam("项目代码")
+    private String prodCfgTypeCode;
+
     public QueueOrderModel() {
     }
 
@@ -221,6 +224,47 @@ public class QueueOrderModel implements Serializable {
         this.produceCategoryCode = produceCategoryCode;
     }
 
+    //getWaitQueueOrderModelNoSnMgn
+    public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                           String partNo, String partNameRdd, String workType, Double finsihQty, Double qty, String pptCode, String produceCategoryCode, String prodCfgTypeCode,
+                           String vinCode) {
+        this.serialNumber = serialNumber;
+        this.id = id;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.custFlagNo = custFlagNo;
+        this.prodCfgNameRdd = prodCfgNameRdd;
+        this.categoryNameRdd = categoryNameRdd;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workType = workType;
+        this.finsihQty = finsihQty;
+        this.qty = qty;
+        this.orderNo = orderNo;
+        this.pptCode = pptCode;
+        this.produceCategoryCode = produceCategoryCode;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.vinCode = vinCode;
+    }
+
+    //getAlreadyQueueOrderModelNoSnMgn
+    public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+                           String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode) {
+        this.id = id;
+        this.queueSeq = queueSeq;
+        this.queDetailSeq = queDetailSeq;
+        this.custFlagNo = custFlagNo;
+        this.prodCfgNameRdd = prodCfgNameRdd;
+        this.categoryNameRdd = categoryNameRdd;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workType = workType;
+        this.orderNo = orderNo;
+        this.serialNumber = serialNumber;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.vinCode = vinCode;
+    }
+
     //getAlreadyQueueOrderModelNoSn
     public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String partNo, String partNameRdd, String workType) {

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

@@ -283,7 +283,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode);
         if (!StringUtils.isEmpty(mesArea.getAreaCode())) {
-            DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesArea.getAreaCode(), "areaCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesArea.getAreaName())) {
+            DdlPreparedPack.getStringLikerPack(mesArea.getAreaName(), "areaName", packBean);
         }
 
         return packBean;
@@ -326,6 +329,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesWorkCell.getWorkCellCode())) {
             DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
         }
+        if (!StringUtils.isEmpty(mesWorkCell.getWorkCellName())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkCell.getWorkCellName(), "workCellName", packBean);
+        }
 
         return packBean;
     }
@@ -1199,7 +1205,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesWorkCellPoint(MesWorkCellPoint workCellPoint, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(workCellPoint, organizeCode);
         if (!StringUtils.isEmpty(workCellPoint.getWorkCellCode())) {
-            DdlPreparedPack.getStringEqualPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean);
+            DdlPreparedPack.getStringLikerPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(workCellPoint.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(workCellPoint.getWorkCenterCode(), "workCenterCode", packBean);
         }
         return packBean;
     }
@@ -1901,6 +1910,9 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) {
             DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "codeType", packBean);
         }
+        if (!StringUtils.isEmpty(mesLabelTemplate.getTemplateName())) {
+            DdlPreparedPack.getStringLikerPack(mesLabelTemplate.getTemplateName(), "templateName", packBean);
+        }
         return packBean;
     }