From 51f9d92d36e31e4ff09280ca96a5ffdff844cfd7 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 10 Aug 2020 16:37:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3esop=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/QueueOrderModel.java | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 5f310b4..f4b82d7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/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) { From 4bdd2b770b5ccd0daa313b1b7a67d2be025ee2bc Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 10 Aug 2020 16:43:10 +0800 Subject: [PATCH 2/4] Fix Bug #10486 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index ffe7ac6..9b16fbb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1199,7 +1199,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; } From f495ffed5415df4d9ad1155d92a5b2130cf87ee3 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 10 Aug 2020 17:07:20 +0800 Subject: [PATCH 3/4] Fix Bug #10477 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 9b16fbb..692a297 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -326,6 +326,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; } @@ -1904,6 +1907,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; } From 8c2fd8a587d03f3975fbd77ba7cb4e5943e5c916 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 10 Aug 2020 17:09:54 +0800 Subject: [PATCH 4/4] Fix Bug #10476 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 692a297..7acc4df 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/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;