From 7a134dc0cb3f14d2a866f14d597349a1d098173f Mon Sep 17 00:00:00 2001 From: qinjia zou Date: Wed, 20 Nov 2019 10:37:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E6=AC=A7=E6=B4=B2-=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=BF=AB=E9=80=9F=E5=85=A5=E5=BA=93=E3=80=91bug6389?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 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 a4862cb..2d2f84a 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 @@ -1053,7 +1053,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_QC_STATUS { - NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "ISOLATED", "报废"); + NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废"); private int value; private String code; From 89943f65866c56b0d2cea73ff0fbf689d828ee86 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 20 Nov 2019 11:03:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E8=A1=A8=E5=A4=9A=E9=80=89=E6=9E=9A=E4=B8=BE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 7 +++--- .../i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java | 24 --------------------- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 25 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index f5d5503..5ae21a4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.*; import cn.estsh.i3plus.pojo.aps.holders.EResource; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; @@ -84,17 +83,17 @@ public class Resource extends BaseCode { @Column(name="EFFICIENCY_EFFECT") @ApiParam(value ="效率影响类型") - @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class) + @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer EfficiencyEffect; @Column(name="TIME_ROUND") @ApiParam(value ="时间圆整影响") - @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class) + @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer timeRound; @Column(name="TIME_TAIL_ROUND") @ApiParam(value ="时间尾数影响") - @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class) + @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer timeTailRound; @Column(name="LOCK_TYPE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java deleted file mode 100644 index f1da6b4..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :资源效率影响的计划类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-10-17 - * @Modify: - **/ -public enum EFFICIENCY_EFFECT { - PREV_SET(1), // 前设置 - PRODUCE(2), // 生产 - POST_SET(4); // 后设置 - - private int _value; - - EFFICIENCY_EFFECT(int value){ - _value = value; - } - - public int value() { - return this._value; - } -} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index b84ac79..e2c94c3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -324,6 +324,31 @@ public class ApsEnumUtil { } /** + * 资源效率影响类型 + */ + public enum EFFICIENCY_EFFECT { + PREV_SET(1, "前设置"), // 前设置 + PRODUCE(2, "生产"), // 生产 + POST_SET(4, "后设置"); // 后设置 + + private int value; + private String description; + + EFFICIENCY_EFFECT(int value, String description){ + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * 预置的资源选择规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 695ab094d20f2ee1200e24eaf1e349d45db87bb3 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 20 Nov 2019 11:24:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E8=A1=A8=E5=A4=9A=E9=80=89=E6=9E=9A=E4=B8=BE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=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/base/enumutil/ApsEnumUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index e2c94c3..11d5fe1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -326,6 +326,7 @@ public class ApsEnumUtil { /** * 资源效率影响类型 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum EFFICIENCY_EFFECT { PREV_SET(1, "前设置"), // 前设置 PRODUCE(2, "生产"), // 生产 From 054502b657abf9d1f363507390ef8caee02d16b8 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 20 Nov 2019 11:34:56 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1193?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index 6fe4ca3..59ebe07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -37,6 +37,10 @@ public class IfDismantleRecord extends BaseBean { @ApiParam("产线") private String workCenterCode; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + @Column(name = "PARENT_PART_NO") @ApiParam("产品物料编码") private String parentPartNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java index 6ab949d..65b038b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -19,8 +20,8 @@ import java.math.BigDecimal; @Data @NoArgsConstructor @AllArgsConstructor -@Api("动作函数关系model") -public class IfRawPartDataModel implements Serializable { +@Api("原材料信息model") +public class IfRawPartDataModel extends BaseBean { @ApiParam("id") private Long id; From 5943854c5b1dbc15e007965487489eb9686d9ef3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 20 Nov 2019 13:27:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java index 5b3c105..53b974e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -51,6 +51,9 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("客户名称") private String customerName; + @ApiParam("客户零件号") + private String customerPartNo; + @ApiParam("客户物料名称") private String customerPartName;