From 46a361a291469ad629fa334dfc4d0016d71fdc18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Tue, 11 Jun 2019 23:14:16 +0800 Subject: [PATCH 1/5] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=20SAP=20-=20WMS=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BD=AC=E6=8D=A2=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java | 15 +++++++++++++++ .../pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java index dcc37c8..036f65e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/MappingItem.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.dbinterface; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * WMS - SAP 字段映射关系 @@ -12,12 +13,17 @@ import lombok.Data; */ @Data @AllArgsConstructor +@NoArgsConstructor public class MappingItem { /** * 来源字段名称 */ public String srcName; /** + * 目标对象的名称 + */ + public String destBeanName; + /** * 目标对象的属性名称 */ public String destName; @@ -25,4 +31,13 @@ public class MappingItem { * 当来源数据中无此字段时的默认值 */ public String defaultValue; + + @Override + public String toString() { + return "srcName:" + + this.srcName + ", destBeanName:" + + this.destBeanName + ", destName" + + this.destName + ", defaultValue:" + + this.defaultValue; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 1314211..464ddeb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -73,7 +73,7 @@ public class WmsInterfaceDataMapper extends BaseBean { @Column(name = "COPY_BY_ORGS", length = 50) public String copyByOrgs; /** - * 目标实体对象的名字 + * 目标实体对象的名字，多个字段用半角逗号分隔 */ @Column(name = "DEST_BEAN_NAME", length = 50) public String destBeanName; From 10c276fb161333108271e6ff3d5f3b4c933f5a0e Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 12 Jun 2019 12:24:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/iface/IResultSetCall.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java new file mode 100644 index 0000000..d15f322 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.base.iface; + +import java.sql.ResultSet; +import java.sql.SQLException; + +/** + * @Description : 实现此接口，对数据集进行自定义封装 + * @Reference : + * @Author : alwaysfrin + * @CreateDate : 2019-06-11 16:12 + * @Modify: + **/ +public interface IResultSetCall { + + /** + * 数据集默认方法 + * @param rs 数据集 + * @return 泛型对象 + * @throws SQLException + */ + T invoke(ResultSet rs) throws SQLException; +} From 2adff745fb7966546ee3a5e62090097b7da81d62 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 12 Jun 2019 16:26:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E3=80=80=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 550edcf..102685a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -55,7 +55,7 @@ public class BlockFormEnumUtil { public static int codeOfValue(String code) { int tmp = 1; for (int i = 0; i < values().length; i++) { - if (values()[i].code.equals(code.toLowerCase())) { + if (values()[i].code.toLowerCase().equals(code.toLowerCase())) { tmp = values()[i].value; } } From 4261207e54f53c6844777c8b43cbfbdd39d56f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 12 Jun 2019 18:00:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=88=E6=94=B6=E8=B4=A7=EF=BC=89=EF=BC=9A?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E5=8E=82+=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=EF=BC=9A=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=80=BC=E5=8F=AF=E4=BB=A5=E4=B8=BA=E7=A9=BA+=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=EF=BC=9A=E6=9C=AA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E9=9C=80=E8=A6=81=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 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 c8db411..d6c0f64 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 @@ -1222,13 +1222,13 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amName", result); + DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amDesc", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result); DdlPreparedPack.getStringEqualPack(wmsActionModule.getOpTypeCode(), "opTypeCode", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsShowInfo(), "isShowInfo", result); - - getStringBuilderPack(wmsActionModule, result); + DdlPreparedPack.getNumEqualPack(wmsActionModule.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result; } From 052652dd3666e3fc5609f32063fb96c7692f09d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 12 Jun 2019 18:10:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=88=E6=94=B6=E8=B4=A7=EF=BC=89=EF=BC=9A?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89=E5=8A=A0?= =?UTF-8?q?=E5=B7=A5=E5=8E=82+=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=EF=BC=9A=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=80=BC=E5=8F=AF=E4=BB=A5=E4=B8=BA=E7=A9=BA+=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=EF=BC=9A=E6=9C=AA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E9=9C=80=E8=A6=81=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= 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 d6c0f64..61a71fb 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 @@ -1221,7 +1221,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsActionModule(WmsActionModule wmsActionModule) { DdlPackBean result = new DdlPackBean(); - //查询参数封装 + // 查询参数封装 DdlPreparedPack.getStringLikerPack(wmsActionModule.getAmName(), "amDesc", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getId(), "id", result); DdlPreparedPack.getNumEqualPack(wmsActionModule.getAmType(), "amType", result);