From e5c74320930584c95bddb17d4797e3c23e49a5a7 Mon Sep 17 00:00:00 2001 From: liangyao Date: Tue, 8 Dec 2020 14:43:10 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=A2=86=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 214993b..088b222 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -419,11 +419,10 @@ public class WmsDocMovementMaster extends BaseBean { this.custTel = custTel; } - public WmsDocMovementMaster(String orderNo,String createDatetime,Double qty,Double snp,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) { + public WmsDocMovementMaster(String orderNo,String createDatetime,Double qty,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) { this.orderNo = orderNo; this.createDatetime = createDatetime; this.qty = qty; - this.snp = snp; this.orderStatus = orderStatus; this.organizeCode = organizeCode; this.createUser = createUser; From d176895a5d2d6b0cbce6610c366be15801f0c3a5 Mon Sep 17 00:00:00 2001 From: liangyao Date: Tue, 8 Dec 2020 16:32:54 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=A2=86=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 088b222..6a02dc3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -375,6 +375,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("完成时间") public String complateDatetime; + @Transient + @ApiParam("应拣数") + public Integer inQty; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } @@ -419,10 +423,10 @@ public class WmsDocMovementMaster extends BaseBean { this.custTel = custTel; } - public WmsDocMovementMaster(String orderNo,String createDatetime,Double qty,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) { + public WmsDocMovementMaster(String orderNo,String createDatetime,Integer inQty,Integer orderStatus,String organizeCode,String createUser,String planDate,String planTime) { this.orderNo = orderNo; this.createDatetime = createDatetime; - this.qty = qty; + this.inQty = inQty; this.orderStatus = orderStatus; this.organizeCode = organizeCode; this.createUser = createUser; From b1e09f09a3df1f367cdbc2f9a1ff6d888e47750b Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 8 Dec 2020 18:02:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?mes=E6=B7=BB=E5=8A=A0stationwebsocket=20?= =?UTF-8?q?=E7=9A=84busiType=E7=B1=BB=E5=9E=8B=20=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index bb8bf78..ac04bbd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2681,7 +2681,8 @@ public class MesPcnEnumUtil { ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"), ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"), TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"), - MESSAGE_POOL("messagePool", "消息池"); + MESSAGE_POOL("messagePool", "消息池"), + FORCE_LOGOUT("forceLogout", "websocket强制下线"); private String value; private String description; @@ -6009,6 +6010,7 @@ public class MesPcnEnumUtil { } return null; } + public static String codeOfDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { From 3b3f0c98db30a7b4362ecf98abd08fdd9302f812 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 8 Dec 2020 18:10:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9D=A4=E6=B3=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index df42ed8..79bab3b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -138,4 +138,14 @@ public class WmsTaskInfo extends BaseBean { this.custNo = custNo; this.vendorNo = vendorNo; } + + public WmsTaskInfo(String orderNo, Integer taskStatus, String transTypeCode, String createUser, String createDatetime, String organizeCode, String userNo) { + this.orderNo = orderNo; + this.taskStatus = taskStatus; + this.transTypeCode = transTypeCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.organizeCode = organizeCode; + this.userNo = userNo; + } } From 0c50abaea8e31b734ffb4e78927cc3251720edec Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 8 Dec 2020 18:11:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 8daabbc..1f4955c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -86,7 +86,7 @@ public class DdlPreparedPack { * @param isShowTime 是否包含时分秒 */ public static void timeBuilder(String date, String columnName, DdlPackBean packBean, Boolean showTaday, boolean isShowTime) { - if (date != null && date.trim().length() > 0) { + if (date != null && date.trim().length() > 2) { String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); if (date != null && date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))) { //只有一个逗号