From 224e3a9a513bc624fcdcefec6a313b1aa891c94c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 7 Jun 2021 13:08:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=92=8C=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E7=9A=84=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 78 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 11 ++- 2 files changed, 88 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 6b0573d..09a9a27 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1908,6 +1908,84 @@ public class WmsEnumUtil { } /** + * PO 单据质检状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PO_QC_STATUS { + INQUALITY(10, "INQUALITY", "质检中"), + NORMAL(20, "NORMAL", "合格"), + ABNORMAL(30, "ABNORMAL", "不合格"); + private int value; + private String code; + private String description; + + private PO_QC_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static PO_QC_STATUS codeOfs(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** * 质检业务类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index 020e7e3..9003e5f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -56,11 +56,20 @@ public class WmsQCMaster extends BaseBean { * 状态:1=创建,5=待处理,10=已完成,90=已关闭,91=已取消 */ @Column(name = "ORDER_STATUS") - @ApiParam(value = "状态", example = "1") + @ApiParam(value = "单据状态", example = "1") @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_STATUS.class, refForeignKey = "value", value = "description") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "QC_INFO_STATUS") public Integer orderStatus; + /** + * 状态:10=质检中,20=合格,30=不合格 + */ + @Column(name = "QC_STATUS") + @ApiParam(value = "质检状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.PO_QC_STATUS.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "PO_QC_STATUS") + public Integer qcStatus; + @Column(name = "REMARK") @ApiParam("备注") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) From d952e7a8e903c4638ec32476f660f99bc2cf3a39 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 7 Jun 2021 16:55:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=88=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E7=AA=97=E5=8F=A3=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=8C=E7=AA=97=E5=8F=A3=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index f210869..2494f18 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -15,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; @@ -198,6 +198,14 @@ public class WmsASNMaster extends BaseBean { @Transient private List orderNoList; + @Transient + @ApiParam(value = "窗口开始时间") + public String windowStartTime; + + @Transient + @ApiParam(value = "窗口结束时间") + public String windowEndTime; + public WmsASNMaster() { } From 8b4bd8d8ab3daa42dbeb2dd0b0b4ac9b5cf07ba9 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Mon, 7 Jun 2021 17:07:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E4=B8=AD=E8=88=AA-=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=A7=94=E5=A4=96=E5=8F=91=E8=BF=90=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=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 | 6 +++++- 1 file changed, 5 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 73b4351..1d73d6f 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 @@ -369,6 +369,10 @@ public class WmsStockSn extends BaseBean { @ApiParam("是否寄售 1-是 2-否") private Integer consignation; + @Column(name = "REMARK") + @ApiParam("备注") + public String remark; + @Transient @ApiParam(value = "是否最早批次") public String isFifo; @@ -575,7 +579,7 @@ public class WmsStockSn extends BaseBean { @Transient @ApiParam("泊位") private String zdoc; - + @ApiParam("打印类型") private Integer printType; From 712555609078eecc43c30a6e93616695d0b52edd Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Mon, 7 Jun 2021 19:44:02 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 97c1591..d7dd874 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -6,8 +6,6 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; @@ -16,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; import javax.persistence.Table; import javax.persistence.Transient; import java.util.List; @@ -170,6 +170,10 @@ public class WmsCSOrderDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class, refForeignKey = "value", value = "description") public List differenceTypeList; + @ApiParam(value = "状态 (10-创建 20-开启盘点 30-盘点中 40-盘点完成 50-已解冻 60-已关闭)", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.CS_ORDER_STATUS.class, refForeignKey = "value", value = "description") + public Integer orderStatus; + public Integer getDifferenceTypeVal() { return this.differenceType == null ? -1: this.differenceType; From 4d5cdc710ed9f965a7aac789cd416c97943599f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 8 Jun 2021 09:33:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=9016023=2019081-=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E5=AE=89=E7=81=AF=E5=91=BC=E5=8F=AB=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=8F=8D=E5=BA=94=E3=80=81=E5=91=BC=E5=8F=AB=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88=E5=92=8C=E5=A4=84?= =?UTF-8?q?=E7=90=86-20210525=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 0e4b269..d3770f8 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -298,6 +298,14 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { private Integer brokenTime; @Transient + @ApiParam(value ="响应时长(分钟)") + private Double sumDowntime; + + @Transient + @ApiParam(value ="故障时长(分钟)") + private Double sumBrokenTime; + + @Transient @ApiParam(value ="故障字符串") private String faultStr;