Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java

@@ -41,6 +41,8 @@ public class RequestModel {
 
     private ActionRequestModel actionRequestBean;//工单状态
 
+    private String serialNumber;//过程条码
+
     public RequestModel(List<MesQueueOrder> queueOrderList, Double currentSeq, Double nextSeq) {
         this.queueOrderList = queueOrderList;
         this.currentSeq = currentSeq;
@@ -166,4 +168,8 @@ public class RequestModel {
     public void setDestStatus(Integer destStatus) {
         this.destStatus = destStatus;
     }
+
+    public String getSerialNumber() { return serialNumber; }
+
+    public void setSerialNumber(String serialNumber) { this.serialNumber = serialNumber; }
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java

@@ -334,4 +334,11 @@ public class PtlHqlPack {
         DdlPreparedPack.getNumEqualPack(areaRoute.getRouteType(), "routeType", packBean);
         return packBean;
     }
+
+    public static DdlPackBean getPtlArea(PtlArea area, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(area, organizeCode);
+        DdlPreparedPack.getStringLikerPack(area.getAreaNo(), "areaNo", packBean);
+        DdlPreparedPack.getStringLikerPack(area.getAreaName(), "areaName", packBean);
+        return packBean;
+    }
 }