From 965a8d37cd07c61607d64fa69adbd5412dd19299 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 3 Apr 2020 15:20:59 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99maven?= =?UTF-8?q?=20profile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/pom.xml b/pom.xml index d6a60cc..ed5d0a1 100644 --- a/pom.xml +++ b/pom.xml @@ -221,38 +221,6 @@ - - - dev - - DEV - - - true - - - - test - - TEST - - - - docker - - DOCKER - - - - prod - - PROD - - - - - ${project.artifactId}-${project.version} - From 35023af12c9ff54196fdaa859bc9865b89cdc4a8 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 3 Apr 2020 19:02:54 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E3=80=907988=2020011--=E5=A4=9A=E7=BA=A7?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=89=93=E5=8D=B0=E6=97=B6=E6=AF=8D=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=8E=B0=E5=9C=A8=E6=97=A0=E6=B3=95=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index d7b809e..6b6f2b8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -3915,6 +3915,15 @@ public class WmsEnumUtil { } return tmp; } + + public static PRINT_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } } /** From a59a5e532e5cfd7fb5cfd6e2f5e344021b34417b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 3 Apr 2020 19:04:15 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E3=80=907988=2020011--=E5=A4=9A=E7=BA=A7?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=89=93=E5=8D=B0=E6=97=B6=E6=AF=8D=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=8E=B0=E5=9C=A8=E6=97=A0=E6=B3=95=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 6f59761..482c5a1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2590,7 +2590,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsPrintingQueue.getPrintNo(), "printNo", result); DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ETC_PRINT_STATUS.NOT_HIT.getValue(), "printStatus", result); - DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result); +// DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRINT_TYPE.SN.getValue(), "printType", result); getStringBuilderPack(wmsPrintingQueue, result); From 46e0f502d077e7db9059c7c647a1c880244e510d Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 3 Apr 2020 19:04:47 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E3=80=907988=2020011--=E5=A4=9A=E7=BA=A7?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=89=93=E5=8D=B0=E6=97=B6=E6=AF=8D=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=8E=B0=E5=9C=A8=E6=97=A0=E6=B3=95=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index f9e000a..e048183 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -314,6 +314,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "集装箱号") private String containerNo; + @Transient + @ApiParam(value = "箱数") + private Integer boxQty; + public WmsStockSn() { } From e2894143632ce5187b3aa5f2fb96ff706fefae8e Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 3 Apr 2020 22:23:33 +0800 Subject: [PATCH 05/10] Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev --- .../java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java | 10 +++++++++- .../cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java index 809f29c..d97a57a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java @@ -18,8 +18,16 @@ public class CellFeedModel { private String partNo; + private String partName; + private String itemPartNo; - private String qty; + private String itemPartName; + + private String shouldQty; + + private String remainQty; + + private String scanQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index d1e1299..236115b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -110,6 +110,9 @@ public class StationRequestBean implements Serializable { @ApiParam("当前流程状态") private MesRouteStatus curRouteStatus; + @ApiParam("展示组件") + private Object moduleService; + @Override public String toString() { return "StationRequestBean{" + From 7244fb38b17b07010bc2a010f6569bb83ab527e5 Mon Sep 17 00:00:00 2001 From: qianhs Date: Sun, 5 Apr 2020 23:16:15 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 b55e96d..784a25d 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 @@ -197,7 +197,7 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; } - public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String partNo, String partNameRdd, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -209,5 +209,6 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.workType = workType; this.orderNo = orderNo; + this.serialNumber=serialNumber; } } From 8c635c355765bdf1967e7def310229fe1bebaa01 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 6 Apr 2020 11:22:48 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 236115b..0a5b42e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -113,6 +113,8 @@ public class StationRequestBean implements Serializable { @ApiParam("展示组件") private Object moduleService; + @ApiParam("工步序号") + private Integer stepSeq; @Override public String toString() { return "StationRequestBean{" + From ba90a506216f52b7f76bccd4dc8f4be833ec80a7 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 6 Apr 2020 11:45:03 +0800 Subject: [PATCH 08/10] Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index ea3a703..0b19a64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -26,7 +26,7 @@ import java.io.Serializable; }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) }) -@Api("包装规格") +@Api("包装表") public class MesPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 5275923991324889995L; From ba4b45043723b57351f1fd1e258c14f9698a997a Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 6 Apr 2020 13:39:08 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 12 ++++++++++++ 1 file changed, 12 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 784a25d..c9781d7 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 @@ -211,4 +211,16 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; this.serialNumber=serialNumber; } + //料架分组队列展示组件 + public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, + Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) { + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + this.orderNo = orderNo; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.organizeCode = organizeCode; + } } From 14bb71f9f2b486bb30f51a64a028d5ef3ed45421 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Mon, 6 Apr 2020 17:10:25 +0800 Subject: [PATCH 10/10] =?UTF-8?q?[=E6=96=99=E6=9E=B6=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java index 05670be..dd891d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ActorMessageModel.java @@ -30,7 +30,7 @@ public class ActorMessageModel { } public static ActorMessageModel getFailure() { - return new ActorMessageModel(true, null); + return new ActorMessageModel(false, null); } public static ActorMessageModel getSuccess(Object data) { 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 c9781d7..2d3d15c 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 @@ -71,6 +71,8 @@ public class QueueOrderModel implements Serializable { @ApiParam("队列编号") private String orderNo; + @ApiParam("料架是否已打印") + private Integer isGroupPrinted; public QueueOrderModel() { } @@ -155,13 +157,14 @@ public class QueueOrderModel implements Serializable { this.orderNo = orderNo; } - public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) { + public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; this.queueGroupNo = queueGroupNo; this.groupNo = groupNo; this.prodCfgCode = prodCfgCode; + this.isGroupPrinted = isGroupPrinted; } public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,