From 36b4e67020c6f3a780c390355b6de2f7eab92595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sat, 18 Apr 2020 16:01:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=BB=BA=E6=A8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/template/BasImportTemplate.java | 12 ++++------ .../bean/template/BasImportTemplateDetails.java | 21 ++++++++++++++++- .../pojo/wms/modelbean/BasBeanFieldModel.java | 6 ++++- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 27 ++++++++++++++++++++++ 4 files changed, 56 insertions(+), 10 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java index 48936bc..81f5de7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java @@ -61,18 +61,14 @@ public class BasImportTemplate extends BaseBean{ @ApiParam(value = "更新类型", example = "0") private Integer updateType; - @Column(name="UNION_PK") - @ApiParam("联合主键") - private String unionPk; - - @Column(name="RELATION_FIELD") - @ApiParam("关联字段") - private String relationField; - @Column(name="SCRIPT_NO") @ApiParam("脚本编号") private String scriptNo; + @Column(name="START_ROW") + @ApiParam(value = "起始行", example = "0") + private Integer startRow; + @Transient @ApiParam("模板明细列表") private List templateDetailsList; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java index aa6bba6..d45be01 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java @@ -72,7 +72,7 @@ public class BasImportTemplateDetails extends BaseBean{ private Integer isRequire; @Column(name="DECIMAIL_SPLIT") - @ApiParam("十进制分隔符") + @ApiParam("小数点分隔符") private String decimalSplit; @Column(name="THOUSANDS_SPLIT") @@ -95,4 +95,23 @@ public class BasImportTemplateDetails extends BaseBean{ @Column(name="MAX_LENGTH") @ApiParam(value = "最大长度", example = "0") private Integer maxLength; + + @Column(name="RELATION_TABLE") + @ApiParam("关联表名") + private String relationTable; + + @Column(name="RELATION_FIELD") + @ApiParam("关联字段") + private String relationField; + + /** + * 是否主键 1-是，2-否 + */ + @Column(name="IS_PK") + @ApiParam(value = "是否主键", example = "0") + private Integer isPk; + + @Column(name="SHEET_NAME") + @ApiParam("工作薄名称") + private String sheetName; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java index ba1b3be..7b2421c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; import lombok.Data; /** @@ -13,9 +14,12 @@ import lombok.Data; @Api("数据库实例字段模型") public class BasBeanFieldModel { - @ApiParam("表明") + @ApiParam("表名") private String tableName; + @ApiParam("表描述") + private String tableDesc; + @ApiParam("字段英文名称") private String fieldEnName; 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 745b319..8829dc7 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 @@ -11,6 +11,8 @@ import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction; import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin; +import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate; +import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; @@ -3082,4 +3084,29 @@ public class WmsHqlPack { return result; } + + /** + * 导入模板信息分页查询条件 + * @param template + * @return + */ + public static DdlPackBean packHqlBasImportTemplate(BasImportTemplate template) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringLikerPack(template.getTemplateName(), "templateName", result); + DdlPreparedPack.getStringEqualPack(template.getTemplateCode(), "templateCode", result); + getStringBuilderPack(template, result); + return result; + } + + /** + * 导入模板明细信息分页查询条件 + * @param details + * @return + */ + public static DdlPackBean packHqlBasImportTemplateDetails(BasImportTemplateDetails details) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(details.getTemplateCode(), "templateCode", result); + getStringBuilderPack(details, result); + return result; + } }