From 498fbea67b220743c20cf06291584ab0bceed8d8 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 20 Mar 2019 21:51:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java index 104bb82..d861209 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,6 +33,11 @@ public class SysTask extends BaseBean { @ApiParam(value ="名称") private String name; + // 软件类型 CommonEnumUtil.SOFT_TYPE + @Column(name="TASK_SOFT_TYPE") + @ApiParam(value = "软件类型") + private Integer taskSoftType; + @Column(name="TASK_PACKAGE") @ApiParam(value ="任务包名") private String taskPackage; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java index 4a3d8de..5ac2217 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java @@ -71,6 +71,10 @@ public class SysTaskPlan extends BaseBean { @ApiParam(value ="定时任务名称") private String taskNameRdd; + @Column(name="TASK_SOFT_TYPE_RDD") + @ApiParam(value ="任务所属模块") + private Integer taskSoftTypeRdd; + @Column(name="TASK_CYCLE_START_DATE_TIME_RDD") @ApiParam(value ="任务开始时间") private String taskCycleStartDateTimeRdd; From 5f746792c5d5e126bafea02ce411d946de0427ea Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 21 Mar 2019 14:11:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=BE=AE=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E8=B0=83=E6=95=B4=20=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=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/platform/bean/SysDictionary.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index e7222a2..75819f7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -40,9 +40,9 @@ public class SysDictionary extends BaseBean { private String dictionaryCode; //枚举 CommonEnumUtil.SOFT_TYPE - @Column(name="SOFT_TYPE") - @ApiParam(value ="微服务软件类型") - private Integer softType; + @Column(name="DICTIONARY_SOFT_TYPE") + @ApiParam(value ="字典所属模块") + private Integer dictionarySoftType; // 根节点-1 @Column(name="PARENT_ID") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index c7f9c85..4087ce4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -407,7 +407,7 @@ public class CoreHqlPack { // and HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result); HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result); + HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); // not HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); @@ -428,7 +428,7 @@ public class CoreHqlPack { // and HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(dictionary.getSoftType(),"softType",result); + HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); // not HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); From 5f76a142768655bfcc68436c8335cf53b0b513a3 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 21 Mar 2019 15:52:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 13 +++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 5012840..6333860 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -12,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.util.Date; /** @@ -134,4 +135,16 @@ public class WmsStockSn extends BaseBean { @Column(name = "CUST_SN") @ApiParam(value = "客户条码") private String custSn; + + @ApiParam(value = "仓库名称") + @Transient + public String whNameRdd; + + @ApiParam(value = "存储区名称") + @Transient + public String zoneNameRdd; + + @ApiParam(value = "库位名称") + @Transient + public String locateNameRdd; } 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 b474e3b..dac5fb6 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 @@ -1320,9 +1320,15 @@ public class WmsHqlPack { public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result); - HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getWhNo(), "whNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getZoneNo(), "zoneNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getPartNo(), "partNo", result); + HqlPack.getNumEqualPack(wmsStockSn.getLocateNo(), "locateNo", result); HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); + HqlPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); + HqlPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); getStringBuilderPack(wmsStockSn, result); return result.toString(); }