From 01e7224d1ec034495278189478bb0870993444aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 3 Jun 2020 13:46:39 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E3=80=90=E5=90=88=E5=B9=B6=E5=86=B2?= =?UTF-8?q?=E7=AA=81=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/MesProdModelCfg.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java index be8e632..5bcc4c8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdModelCfg.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -81,4 +82,12 @@ public class MesProdModelCfg extends BaseBean implements Serializable { @Column(name = "PROCESS_LABEL_TEMPLATE") @ApiParam("过程标签模板") private String processLabelTemplate; + + @Transient + @ApiParam("产品颜色") + private String produceColor; + + @Transient + @ApiParam("Vin") + private String vinCode; } From 1a079a1b898b04f736becc939edd8d3fa9e8bbaf Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 28 May 2020 16:07:24 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat(=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8):=20=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Pojo 实体创建 2. Service 实现唯一校验 3. 使用CRUD Controller 实现API 接口 --- .../estsh/i3plus/pojo/report/bean/BrCssStyle.java | 45 ++++++++++++++++++++++ .../report/repository/BrCssStyleRepository.java | 15 ++++++++ 2 files changed, 60 insertions(+) create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java create mode 100644 modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java new file mode 100644 index 0000000..05eb399 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrCssStyle.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.report.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:33 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BR_CSS_STYLE") +@Api(value="自定义样式") +public class BrCssStyle extends BaseBean { + + private static final long serialVersionUID = 8651392479116992679L; + + @Column(name="STYLE_CODE") + @ApiParam(value ="样式编码") + private String styleCode; + + @Column(name="STYLE_CONTENT") + @ApiParam(value ="样式内容") + private String styleContent; + + @Column(name="STYLE_DESCRIPTION") + @ApiParam(value ="样式描述") + private String styleDescription; + +} diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java new file mode 100644 index 0000000..6123774 --- /dev/null +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/repository/BrCssStyleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.report.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.report.bean.BrCssStyle; +import cn.estsh.i3plus.pojo.report.bean.BrElement; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-28 下午3:39 + * @Modify: + **/ +public interface BrCssStyleRepository extends BaseRepository { +} From adb95f100fbb5aa4561259c1b1334e71b98a2fcc Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 1 Jun 2020 15:24:14 +0800 Subject: [PATCH 3/6] =?UTF-8?q?Ics=20=E6=97=A5=E5=BF=97=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/common/ThreadModel.java | 31 ++++++++++++++++++++++ .../pojo/platform/platbean/SysLogConsole.java | 5 ++++ .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 2 +- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java new file mode 100644 index 0000000..2244887 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.model.common; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-29 下午3:40 + * @Modify: + **/ +@Data +public class ThreadModel implements Serializable { + + @ApiParam(value ="自定义调用ID") + private Long requestId; + @ApiParam(value ="当前用户ID") + private Long userId; + @ApiParam(value ="当前用户名称") + private String userName; + @ApiParam(value ="用户登录IP") + private String userHost; + @ApiParam(value ="用户登录浏览器") + private String userBrowser; + @ApiParam(value ="用户登录操作系统") + private String userOs; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index b9e2fea..da9d71f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -47,6 +47,7 @@ public class SysLogConsole extends BaseBean { @Column(name="LOG_PID") @ApiParam(value ="应用PID") + @JsonSerialize(using = ToStringSerializer.class) private Long logPid; @Column(name="LOG_PORT") @@ -89,6 +90,10 @@ public class SysLogConsole extends BaseBean { private String userLoginName; /******** 日志信息 ********/ + @Column(name="REQUEST_ID") + @ApiParam(value ="请求ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long requestId; @Column(name="EXECUTE_THREAD_ID") @ApiParam(value ="执行线程") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index b06be17..a515e18 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -109,7 +109,7 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "是否推送MQ") private Integer isPushMQ; - @Column(name = "RESULT_SOFT_TYPE") + @Column(name = "RESULT_SOFT_TYPE",columnDefinition = "int default 0") @ApiParam(value = "同步调用微服务") private Integer resultSoftType; public String getResultSoftTypeTxt() { From d753bdc5b6381b5de330d8783b78dca7d18bd55d Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 3 Jun 2020 13:50:44 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=B1=82):=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=93=8D=E4=BD=9C=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?AOP=E5=AF=B9DAO=E7=9A=84=E6=96=B9=E6=B3=95=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=88=86=E5=88=87=E6=95=B0=E6=8D=AE=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 62b5ceb..b43dcc8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -2519,4 +2519,12 @@ public class CommonEnumUtil { return tmp; } } + + /** + * 业务表：库存条码状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DYNAMIC_DATA_SOURCE_TYPE { + MASTER,NODE + } } From a8dd9831e028c5fff042a3fadae544dbe303c30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 3 Jun 2020 19:23:19 +0800 Subject: [PATCH 5/6] Start Task #2021,2022 Cost:8h Left:8h --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 ++++++++++++++ .../i3plus/pojo/mes/bean/MesAgvStopRecord.java | 72 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 4 ++ .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 4 ++ .../mes/repository/MesAgvStopRecordRepository.java | 14 +++++ 5 files changed, 140 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 50621d2..17bcbcd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -4099,4 +4099,50 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 停机类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STOP_MACHINE_TYPE { + TIMER_TIME_OUT(10, "计时器超时停机"), + DELAY_HELP(20, "延时帮助停机"), + URGENT_STOP(30, "急停停机"); + + private int value; + private String description; + + STOP_MACHINE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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 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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java new file mode 100644 index 0000000..fb1dcd3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAgvStopRecord.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :停机记录表 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-03 15:38 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_AGV_STOP_RECORD") +@Api("MES_停机记录表") +public class MesAgvStopRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -8961182851767690154L; + @Column(name = "STOP_TYPE") + @ApiParam("停机类型") + private Integer stopType; + + @Column(name = "PRODUCT_SN") + @ApiParam("产品条码") + private String productSn; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("物料名称") + private String partName; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "STOP_START_TIME") + @ApiParam("停机开始时间") + private String stopStartTime; + + @Column(name = "STOP_END_TIME") + @ApiParam("停机结束时间") + private String stopEndTime; + + @Column(name = "STOP_REASON") + @ApiParam("停机原因") + private String stopReason; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index fddbb26..cb0f1b4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -44,6 +44,10 @@ public class MesDefect extends BaseBean implements Serializable { @ApiParam("缺陷类型") private String defectType; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + @Transient @ApiParam("缺陷类型名称") private String defectTypeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 57687ae..bd996b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -132,6 +132,10 @@ public class MesQueueOrder extends BaseBean implements Serializable { @ApiParam("队列类型名称") private String queueTypeName; + @Transient + @ApiParam("产品颜色") + private String colorName; + public int getStatusVal() { return this.status == null ? 0 : this.status; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.java new file mode 100644 index 0000000..4acb5ea --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesAgvStopRecordRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesAgvStopRecord; + +/** + * @Description: 停机记录数据操作层 + * @Reference: + * @Author: siliter.yuan + * @CreateDate: 2020\06\03 10:34 + * @Modify: + **/ +public interface MesAgvStopRecordRepository extends BaseRepository { +} From 3c1f8cf6b19e5af248ef88e81983c58f49a8cec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 3 Jun 2020 19:48:08 +0800 Subject: [PATCH 6/6] Finish Task #1889 Cost:24h --- .../i3plus/pojo/mes/bean/MesProdBindRecord.java | 3 ++ .../i3plus/pojo/mes/model/DefectTypeModel.java | 19 ++++++++ .../pojo/mes/model/RepairAndDefectModel.java | 56 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/ScatterBomModel.java | 26 ++++++++++ .../i3plus/pojo/mes/model/SkinCheckModel.java | 40 ++++++++++++++++ 5 files changed, 144 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 61a2dc8..90a96f1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -112,6 +112,9 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam("原材料零件名称") private String itemPartName; + @ApiParam("生产队列号") + private String orderNo; + public int getIsFeedVal() { return this.isFeed == null ? 0 : this.isFeed; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java new file mode 100644 index 0000000..3620dd2 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DefectTypeModel.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class DefectTypeModel implements Serializable { + + // 缺陷/维修 + @ApiParam("业务类型") + private String busiType; + + @ApiParam("List结果集") + private List resultList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java new file mode 100644 index 0000000..247288e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RepairAndDefectModel.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class RepairAndDefectModel implements Serializable { + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("生产工单号") + private String workOrderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("缺陷代码") + private String defectCode; + + @ApiParam("缺陷名称") + private String defectName; + + @ApiParam("缺陷位置") + private String defectLocation; + + @ApiParam("面位") + private String sideLocation; + + @ApiParam("维修状态") + private Integer repairStatus; + + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("维修代码") + private String repairCode; + + @ApiParam("维修名称") + private String repairName; + + @ApiParam("缺陷原因代码") + private String dcCode; + + @ApiParam("缺陷原因描述") + private String dcName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java new file mode 100644 index 0000000..6fe1eaf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ScatterBomModel.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ScatterBomModel implements Serializable { + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partName; + + @ApiParam("个数") + private Double qty; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java new file mode 100644 index 0000000..1f6afc7 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkinCheckModel.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesProduceCtgyPicture; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class SkinCheckModel implements Serializable { + + @ApiParam("主队列编号") + private String orderNo; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("生产号") + private String vinCode; + + @ApiParam("产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("车型") + private String prodCfgTypeCode; + + @ApiParam("等级") + private String gradeCode; + + @ApiParam("面位") + private String sideLocation; + + // 产品位置图片 + private List produceCtgyPictureList; + +}