From 9b6e8bf9216081d4466a241cf4e7ddcd87c09515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Thu, 13 Jun 2019 21:42:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E6=8B=BC=E9=94=99?= =?UTF-8?q?=E7=9A=84=E5=8D=95=E8=AF=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 276f672..d12ebd1 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 @@ -55,7 +55,7 @@ public class WmsInterfaceDataMapper extends BaseBean { * 来源表的查询条件 */ @Column(name = "SRC_WHERE", length = 255) - public String scrWhere; + public String srcWhere; /** * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔 * 例如：SYNFLG=Y,SYNDATE={#XX} From 5ef906d88fe7bd43d546b35cda6964fb4d4a651a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 13 Jun 2019 21:44:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8E=BB=E6=8E=89=E7=94=9F=E6=88=90=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=85=A5=E5=BA=93=E5=8D=95=E9=80=BB=E8=BE=91+?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=AC=E5=85=B1=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E7=BB=84=E4=BB=B6+=E4=BB=BB=E5=8A=A1=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=B0=83=E8=AF=95=E9=82=AE=E4=BB=B6+?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=AD=A5=E9=AA=A4=E5=8F=82=E6=95=B0=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=B7=A5=E5=8E=82+=E4=BA=A4=E6=98=93=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=8E=BB=E6=8E=89=E4=BD=9C=E4=B8=9A=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=BC=96=E5=8F=B7=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java | 4 ---- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index 9c4aa2c..5812917 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -61,8 +61,4 @@ public class WmsTransType extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long tmId; - @Column(name = "OP_TYPE_ID") - @ApiParam(value = "作业类型编号", example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long opTypeId; } 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 61a71fb..f0dde37 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 @@ -1173,8 +1173,8 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getStringLikerPack(wmsActionStepType.getAtNameC(), "atNameC", result); DdlPreparedPack.getStringLikerPack(wmsActionStepType.getFunCallName(), "funCallName", result); - - getStringBuilderPack(wmsActionStepType, result); + DdlPreparedPack.getNumEqualPack(wmsActionStepType.getIsValid(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result; } From c90d70e54fa0696d202064d762099705ecf36628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Fri, 14 Jun 2019 00:39:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=20=E5=AE=8C=E5=96=84=20SAP=20-=20WMS=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/dbinterface/MappingItem.java | 2 +- .../pojo/wms/dbinterface/UpdateSyncItem.java | 26 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/UpdateSyncItem.java 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 e591fe0..f79829d 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 @@ -29,7 +29,7 @@ public class MappingItem { public String destName; /** * 目标字段的默认值，通过此默认值识别字段类型，一定要配置正确 - * 默认值中可以使用的动态变量： #sap_date, #sap_time, #date, #time, #guid + * 可以使用的表达式： #date, #time, #guid, #Q.warehouse(#zone) */ public Object defaultValue; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/UpdateSyncItem.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/UpdateSyncItem.java new file mode 100644 index 0000000..2761316 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/UpdateSyncItem.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.wms.dbinterface; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 回写接口库的值 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class UpdateSyncItem { + + /** + * 字段名 + */ + public String columnName; + + /** + * 写入的值 + * 支持表达式 + * #sap_date, #sap_time, #guid + */ + public String updateValue; +}