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; } } 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; +} 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; 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..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,14 +1221,14 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsActionModule(WmsActionModule wmsActionModule) { 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; }