From 3761eebb084ae6f6102be00440e504c461dbbc8b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 17 Aug 2021 16:49:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=8D=8E=E5=9F=9F-=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=9B=98=E7=82=B9=E5=BC=80=E5=8F=91=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 58c5249..e3d1182 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -122,6 +124,11 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; + @Column(name = "package_no") + @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String packageNo; + @Transient @AnnoOutputColumn(hidden = true) @ApiParam(value = "实盘箱数", example = "1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index cbcbc49..b40cda9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -309,6 +309,11 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double weight ; + @Column(name = "STANDARD_BRACKET", columnDefinition = "decimal(18,8)") + @ApiParam(value = "标托", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double standardBracket; + public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue(); From 480f60e63b6bbc77dfeacc14a94c2929eab72320 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 17 Aug 2021 18:28:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E9=97=B4=E9=9A=94=E6=97=A0=E6=B3=95=E8=B0=83=E6=95=B4=E6=97=B6?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E6=AD=BB=E5=BE=AA=E7=8E=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98=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/bean/SysParam.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 04a0f31..c088593 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -52,15 +52,15 @@ public class SysParam extends BaseAPS { @Column(name="RECORD_RESULT") @ApiParam(value ="记录资源评估结果") - private Boolean recordResult; + private Boolean recordResult = false; @Column(name="SCHEDULE_RESULT") @ApiParam(value ="记录排程结果") - private Boolean scheduleResult; + private Boolean scheduleResult = false; @Column(name="SPLIT_BY_SHIFT") @ApiParam(value ="按班次分割下发的工作") - private Boolean splitByShift; + private Boolean splitByShift = true; @Column(name="RES_GANTT_LABEL") @ApiParam(value ="资源甘特图工作块显示标签") @@ -68,5 +68,5 @@ public class SysParam extends BaseAPS { @Column(name="FOUR_FIRST_SUPPLY") @ApiParam(value ="是否牵纱补满模") - private Boolean fourFirstSupply; + private Boolean fourFirstSupply = false; }