From 9da9a568f59431770ffb539da1b5a3bbf818312e Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 21 Apr 2020 15:27:13 +0800 Subject: [PATCH] mes --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java index 73200ff..34d947e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java +++ b/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 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; } } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java index 27cfed2..3fc6e54 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java +++ b/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; + } }