From ea2eb6103d91a2c9673d26f4b58e27c72e5f2a1b Mon Sep 17 00:00:00 2001
From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com>
Date: Fri, 22 Mar 2019 15:24:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 7 +-
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 | 93 ++++++++++++++++++++++
.../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 +++++++++++++++++
15 files changed, 1194 insertions(+), 3 deletions(-)
create mode 100644 i3plus-pojo.iml
create mode 100644 modules/i3plus-pojo-base/i3plus-pojo-base.iml
create mode 100644 modules/i3plus-pojo-form/i3plus-pojo-form.iml
create mode 100644 modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml
create mode 100644 modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml
create mode 100644 modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml
create mode 100644 modules/i3plus-pojo-mes/i3plus-pojo-mes.iml
create mode 100644 modules/i3plus-pojo-model/i3plus-pojo-model.iml
create mode 100644 modules/i3plus-pojo-platform/i3plus-pojo-platform.iml
create mode 100644 modules/i3plus-pojo-report/i3plus-pojo-report.iml
create mode 100644 modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml
create mode 100644 modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml
create mode 100644 modules/i3plus-pojo-wms/i3plus-pojo-wms.iml
create mode 100644 modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml
diff --git a/.gitignore b/.gitignore
index 838e520..586e79f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,12 @@
### Example user template
# IntelliJ project files .gitignore
-.idea
-*.iml
out
gen
target
+.idea
+.iml
.jar
.class
-.md
\ No newline at end of file
+.md
+.log
diff --git a/i3plus-pojo.iml b/i3plus-pojo.iml
new file mode 100644
index 0000000..ec94526
--- /dev/null
+++ b/i3plus-pojo.iml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000..5dd064c
--- /dev/null
+++ b/modules/i3plus-pojo-base/i3plus-pojo-base.iml
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000..b36beb9
--- /dev/null
+++ b/modules/i3plus-pojo-form/i3plus-pojo-form.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000..d75c4ad
--- /dev/null
+++ b/modules/i3plus-pojo-hardswitch/i3plus-pojo-hardswitch.iml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000..d75c4ad
--- /dev/null
+++ b/modules/i3plus-pojo-jobflow/i3plus-pojo-jobflow.iml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000..b36beb9
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/i3plus-pojo-mes-pcn.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000..c1a72f3
--- /dev/null
+++ b/modules/i3plus-pojo-mes/i3plus-pojo-mes.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000..97807fd
--- /dev/null
+++ b/modules/i3plus-pojo-model/i3plus-pojo-model.iml
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000..c1a72f3
--- /dev/null
+++ b/modules/i3plus-pojo-platform/i3plus-pojo-platform.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000..b36beb9
--- /dev/null
+++ b/modules/i3plus-pojo-report/i3plus-pojo-report.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000..b36beb9
--- /dev/null
+++ b/modules/i3plus-pojo-softswitch/i3plus-pojo-softswitch.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000..b36beb9
--- /dev/null
+++ b/modules/i3plus-pojo-sweb/i3plus-pojo-sweb.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000..c1a72f3
--- /dev/null
+++ b/modules/i3plus-pojo-wms/i3plus-pojo-wms.iml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000..d75c4ad
--- /dev/null
+++ b/modules/i3plus-pojo-workflow/i3plus-pojo-workflow.iml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 6f8f13c552ff00f2f43e170e56f7495ca5ec386c Mon Sep 17 00:00:00 2001
From: "yihang.lv"
Date: Fri, 22 Mar 2019 15:36:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BA=93=E4=BD=8D=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
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 e43b5db..6726712 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
@@ -269,6 +269,20 @@ public class WmsHqlPack {
}
/**
+ * 根据类型查询库位分页
+ *
+ * @param wmsLocate
+ * @return
+ */
+ public static String packHqlWmsLocatesByType(WmsLocate wmsLocate) {
+ StringBuffer result = new StringBuffer();
+ //查询参数封装
+ HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
+ getStringBuilderPack(wmsLocate, result);
+ return result.toString();
+ }
+
+ /**
* 交易类型信息 分页查询
*
* @param wmsTransType
From 01dc635d386dd4956fe4d07666938d609481ea0a Mon Sep 17 00:00:00 2001
From: Silliter
Date: Fri, 22 Mar 2019 16:02:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E7=AE=A1=E5=AE=B6?=
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, 2 insertions(+)
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 e43b5db..08e1583 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
@@ -1250,6 +1250,8 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(), "orderNo", result);
// 设备编号
HqlPack.getStringEqualPack(wmsActionLog.getFixId(), "fixId", result);
+ // 交易类型代码
+ HqlPack.getStringEqualPack(wmsActionLog.getTransTypeCode(), "transTypeCode", result);
// 流程状态
HqlPack.getNumEqualPack(wmsActionLog.getActionStatus(), "actionStatus", result);