From 85f157c6a60d23d7671729f765541e33581dbbf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 27 Feb 2020 15:38:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=BE=E7=BD=AEPTL=5FBOM=E4=B8=AD?= =?UTF-8?q?=E7=88=B6=E7=89=A9=E6=96=99=E6=8F=8F=E8=BF=B0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E4=B8=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java index ea940a6..6aec23d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -35,7 +35,7 @@ public class PtlBom extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; - @Column(name = "PART_NAME", columnDefinition = "varchar(20) default '1'", nullable = false) + @Column(name = "PART_NAME", columnDefinition = "varchar(255) default '1'", nullable = false) @ApiParam("父物料描述") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partName; From a6208289565862e381d52372535d350fce1dadd2 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 27 Feb 2020 08:55:16 +0100 Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=907555=20=E9=9C=80=E8=A6=81=E5=9C=A8?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E7=8A=B6=E6=80=81=E6=8A=A5=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=90=9C=E7=B4=A2=E4=BF=9D=E8=B4=A8=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=9C=A8=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E5=8C=BA=E9=97=B4=E5=86=85=E8=BF=87=E6=9C=9F=E7=9A=84?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 8 ++++++++ .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 2 files changed, 10 insertions(+) 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 8a53a3d..f72a66b 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 @@ -295,6 +295,14 @@ public class WmsStockSn extends BaseBean { private String parentReturnPart; @Transient + @ApiParam("保质期开始时间") + private String qualityDateTimeStart; + + @Transient + @ApiParam("保质期结束时间") + private String qualityDateTimeEnd; + + @Transient @ApiParam(value = "预计完成时间") private String planCompleteTime; 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 6b4788b..5d86cfd 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 @@ -1301,6 +1301,8 @@ public class WmsHqlPack { DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); + DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart(), + wmsStockSn.getQualityDateTimeEnd(), "qualityDate", result, false); if (wmsStockSn.getIsValid() != null) { DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result); } From 632ad62c45e8073c235560aa49265e96193cd178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 27 Feb 2020 16:02:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=9A=E6=9F=A5=E8=AF=A2=E7=B1=BB=E5=90=8D=E9=9C=80=E4=BD=9C?= =?UTF-8?q?=E4=B8=BA=E5=8A=A8=E6=80=81=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java index dbcfbd7..624ccdb 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java @@ -24,4 +24,7 @@ public class WmsSearchGroupModel { @ApiParam(value = "分页组件") private Pager pager; + + @ApiParam(value = "实体类名") + private String objClassName; } From 377391abafb04a0f59fd83b6f0f3f12dcf81be68 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 27 Feb 2020 17:59:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=BF=9B=E5=BA=A6=E6=98=8E=E7=BB=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java index 6a67f59..7344176 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java @@ -12,5 +12,5 @@ import lombok.Data; @Data public class RuleGroupProgress { private String message; - private Long progress; + private Integer progress; }