From a271672ff558572ed0ad41de8b4dd60a71cb18bf Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Wed, 2 Jun 2021 18:05:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=BF=BD=E6=BA=AF?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java index 0a15085..59571ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java @@ -64,4 +64,8 @@ public class MesExtendObjectCfg extends BaseBean implements Serializable { @Column(name = "FIELD_DESC") @ApiParam("扩展字段描述") private String fieldDesc; + + @Column(name = "ORIGINAL_FIELD_CODE") + @ApiParam("原始字段代码") + private String originalFieldCode; } From cda0f670ebad1949075df89539a508408c62dac0 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 4 Jun 2021 15:31:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?16198=2019081-=E5=B7=A5=E4=BD=8D=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 8dac34b..4721ce4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -192,7 +192,7 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @Transient @ApiParam("节拍时间") - private Integer cycleTime; + private Integer cycleTime = 0; public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; From c67f263e5dc74db7fe79bdbd29e56975d29e8a07 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 4 Jun 2021 18:10:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E4=B8=8D?= =?UTF-8?q?=E8=89=AF=E5=93=81=E5=A4=84=E7=90=86=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/CosmaDefectModel.java | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java new file mode 100644 index 0000000..9eeb99a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Reference: + * @Author: Dominic + * @CreateDate: 2019\11\28 19:50 + * @Modify: + **/ +@Data +public class CosmaDefectModel { + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("类型") + private String type; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("缺陷代码集合") + private List defectCodeList; + + @ApiParam("缺陷位置") + private String location; + + @ApiParam("操作人") + private String userName; + + @ApiParam("报废原因") + private String scrapCode; +}