From d05a858bd12423c94b20c04e27dae390e6d141e3 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 27 Nov 2019 19:41:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?6565=20=E4=BF=AE=E6=94=B9fastdfs=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AE=8C=E6=88=90=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java index 49f72e3..0cfa2c7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.model.mes; - import io.swagger.annotations.ApiParam; import lombok.Data; @@ -71,6 +70,10 @@ public class StationRequestBean implements Serializable { @ApiParam("托盘号") private String tray; + @ApiParam("完成数量") + private Integer finishCount; + @ApiParam("工步列表") private List stepList; + } From 7df617b290038bfc8251bf7aad0b93cbfc06c058 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 27 Nov 2019 20:07:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E8=B4=A8=E6=A3=80=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E9=9C=80=E8=A6=81=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=8C=89=E7=85=A7ASN=E5=92=8C=E9=9B=B6=E4=BB=B6?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=98=BE=E7=A4=BA=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E6=98=8E=E7=BB=86=E4=B8=AD=E8=B4=A8=E4=B8=AD=E8=A6=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E3=80=91?= =?UTF-8?q?bug6651?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) 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 7d79a3b..33ed3df 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 @@ -95,7 +95,23 @@ public class WmsQCMaster extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isPart; + @Transient + @ApiParam(value = "零件号") + public String partNo; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } + + public WmsQCMaster () { + + } + + public WmsQCMaster (String orderNo, String vendorNo, String refType, String refSrc, String partNo) { + this.orderNo = orderNo; + this.vendorNo = vendorNo; + this.refType = refType; + this.refSrc = refSrc; + this.partNo = partNo; + } } From f038ed7234b6540ebbc68721d91ae3f8beff1a99 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 28 Nov 2019 09:16:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 51 +++++++++++++++++++++- .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 4 -- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 23cb6b4..cb8dae6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -1305,7 +1305,10 @@ public class MesEnumUtil { MES_WORK_CENTER(150, "生产线"), MES_WORK_CELL(160, "工位"), MES_WC_EQUIPMENT(170, "工位设备关系表"), - MES_SHIFT(180, "班次"); + MES_SHIFT(180, "班次"), + MES_SHIFT_GROUP(190, "班组"), + MES_WORK_CELL_PARAM_CFG(200, "工作单元参数配置"), + MES_PROCESS_BOM(210, "工序BOM表"); private int value; private String description; @@ -3481,4 +3484,50 @@ public class MesEnumUtil { } } + /** + * MesWorkCellParamCfg 工作单元参数配置 是否必须校验 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_WORK_CELL_PARAM_CFG_IS_CHECK { + + RUNNING(1, "是"), + STOPPED(2, "否"); + + private int value; + private String description; + + MES_WORK_CELL_PARAM_CFG_IS_CHECK(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(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 Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index f41bd25..0cbb477 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -9,14 +8,11 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -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.Arrays; -import java.util.List; /** * @Description: