From 3a5f43f97b62731e92221ad130a84e7536a89bc5 Mon Sep 17 00:00:00 2001 From: jiajack Date: Thu, 11 Apr 2019 15:01:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4iml=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i3plus-pojo.iml | 66 --------------- modules/i3plus-pojo-base/i3plus-pojo-base.iml | 89 -------------------- modules/i3plus-pojo-form/i3plus-pojo-form.iml | 90 --------------------- .../i3plus-pojo-hardswitch.iml | 74 ----------------- .../i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml | 74 ----------------- .../i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml | 90 --------------------- modules/i3plus-pojo-mes/i3plus-pojo-mes.iml | 90 --------------------- modules/i3plus-pojo-model/i3plus-pojo-model.iml | 94 ---------------------- .../i3plus-pojo-platform/i3plus-pojo-platform.iml | 90 --------------------- modules/i3plus-pojo-report/i3plus-pojo-report.iml | 90 --------------------- .../i3plus-pojo-softswitch.iml | 90 --------------------- modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml | 90 --------------------- modules/i3plus-pojo-wms/i3plus-pojo-wms.iml | 90 --------------------- .../i3plus-pojo-workflow/i3plus-pojo-workflow.iml | 74 ----------------- 14 files changed, 1191 deletions(-) delete mode 100644 i3plus-pojo.iml delete mode 100644 modules/i3plus-pojo-base/i3plus-pojo-base.iml delete mode 100644 modules/i3plus-pojo-form/i3plus-pojo-form.iml delete mode 100644 modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml delete mode 100644 modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml delete mode 100644 modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml delete mode 100644 modules/i3plus-pojo-mes/i3plus-pojo-mes.iml delete mode 100644 modules/i3plus-pojo-model/i3plus-pojo-model.iml delete mode 100644 modules/i3plus-pojo-platform/i3plus-pojo-platform.iml delete mode 100644 modules/i3plus-pojo-report/i3plus-pojo-report.iml delete mode 100644 modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml delete mode 100644 modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml delete mode 100644 modules/i3plus-pojo-wms/i3plus-pojo-wms.iml delete mode 100644 modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml diff --git a/i3plus-pojo.iml b/i3plus-pojo.iml deleted file mode 100644 index ec94526..0000000 --- a/i3plus-pojo.iml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-base/i3plus-pojo-base.iml b/modules/i3plus-pojo-base/i3plus-pojo-base.iml deleted file mode 100644 index 5dd064c..0000000 --- a/modules/i3plus-pojo-base/i3plus-pojo-base.iml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-form/i3plus-pojo-form.iml b/modules/i3plus-pojo-form/i3plus-pojo-form.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-form/i3plus-pojo-form.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml b/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml deleted file mode 100644 index d75c4ad..0000000 --- a/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml b/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml deleted file mode 100644 index d75c4ad..0000000 --- a/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml b/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml b/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-model/i3plus-pojo-model.iml b/modules/i3plus-pojo-model/i3plus-pojo-model.iml deleted file mode 100644 index 97faa2e..0000000 --- a/modules/i3plus-pojo-model/i3plus-pojo-model.iml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml b/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-report/i3plus-pojo-report.iml b/modules/i3plus-pojo-report/i3plus-pojo-report.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-report/i3plus-pojo-report.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml b/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml b/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml deleted file mode 100644 index b36beb9..0000000 --- a/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml b/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml deleted file mode 100644 index c1a72f3..0000000 --- a/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml b/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml deleted file mode 100644 index d75c4ad..0000000 --- a/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 73d1378f0d02fdbf066a708839ccdb34c634741f Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Thu, 11 Apr 2019 15:15:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=9D=A1=E7=A0=81=E7=9A=84sql=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5?= 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9271606..4ed65da 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 @@ -1656,8 +1656,8 @@ public class WmsHqlPack { */ public static String packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsDocMovementSn.getPartNo(), "partNo", result); + HqlPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); getStringBuilderPack(wmsDocMovementSn, result); From f1993e69c8c47ea3c24f6fba3593619e6b1e1186 Mon Sep 17 00:00:00 2001 From: "yihang.lv" Date: Thu, 11 Apr 2019 18:50:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?sweb=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 47cee30..0cee07c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -18,9 +18,9 @@ public class SwebEnumUtil { public enum ORDER_MASTER_STATUS { CREATE(10, "新建"), RECEIPT(20, "已发布"), - RECEIPT_FINISH(30, "已确认"), + SURE(30, "已确认"), CLOSED(40, "已打印"), - CANCELLED(50, "已发货"); + DELIVERY(50, "已发货"); private int value; private String description; @@ -66,9 +66,9 @@ public class SwebEnumUtil { public enum ORDER_DETAILS_STATUS { CREATE(10, "新建"), RECEIPT(20, "已发布"), - RECEIPT_FINISH(30, "已确认"), + SURE(30, "已确认"), CLOSED(40, "已打印"), - CANCELLED(50, "已发货"); + DELIVERY(50, "已发货"); private int value; private String description;