From aa78fd8bd5c71d9408fb942d1c1838098a417044 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 10 Jun 2021 19:46:36 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E9=94=81=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesLockRecord.java | 59 ++++++++++++++++++++++ .../mes/repository/MesLockRecordRepository.java | 16 ++++++ 2 files changed, 75 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java new file mode 100644 index 0000000..7607f1f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java @@ -0,0 +1,59 @@ +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.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @Description :锁定记录 + * @Reference : + * @Author : dominic + * @CreateDate : 2021-06-10 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Inheritance(strategy = InheritanceType.JOINED) +@Table(name = "MES_LOCK_RECORD") +@Api("mes锁定记录表") +public class MesLockRecord extends BaseBean implements Serializable { + + private static final long serialVersionUID = 5132229443235106976L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位代码") + private String workCellCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "LOCK_REASON") + @ApiParam("锁定原因") + private String lockReason; + + @Column(name = "EMPLOYEE_NUMBER") + @ApiParam("工号") + private String employeeNumber; + + @Column(name = "LOCK_STATUS") + @ColumnDefault("1") + @ApiParam("锁定状态") + private Integer lockStatus; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.java new file mode 100644 index 0000000..94c05a6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLockRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesLockRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : dominic + * @CreateDate : 2021/6/10 19:36 + * @Modify: + **/ +@Repository +public interface MesLockRecordRepository extends BaseRepository { +} From dbdcbec03269fe0bd346764ff626e60c6f6e8abf Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 11 Jun 2021 09:22:19 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B7=A5=E5=BA=8F?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=8A=A5=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=96=99?= =?UTF-8?q?=E6=9E=B6=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java index be65d70..b849f71 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -8,6 +8,7 @@ import java.io.Serializable; /** * 产品履历报表-产品信息 + * * @author yumingxing * @version 1.0 * @date 2020/12/18 15:16 @@ -33,6 +34,9 @@ public class ProductSnModel implements Serializable { @ApiParam("CMS标签号") private String qrCode; + @ApiParam("料架号") + private String ctNo; + @ApiParam("产线") private String workCenterName; @@ -55,10 +59,8 @@ public class ProductSnModel implements Serializable { private String qcStatusName; - - - public ProductSnModel(String packageNo,String customerPartNo, String serialNumber, String partNo, - String qrCode, String workCenterName, String processName, + public ProductSnModel(String packageNo, String customerPartNo, String serialNumber, String partNo, + String qrCode, String ctNo, String workCenterName, String processName, String workCellName, String createDatetime, String createUser, Integer qcStatus) { this.packageNo = packageNo; @@ -66,6 +68,7 @@ public class ProductSnModel implements Serializable { this.serialNumber = serialNumber; this.partNo = partNo; this.qrCode = qrCode; + this.ctNo = ctNo; this.workCenterName = workCenterName; this.processName = processName; this.workCellName = workCellName; From 35e41f94e18d576817a317453830dbb3e45d966e Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 11 Jun 2021 11:15:14 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=8D=A1=E6=96=AF=E9=A9=AC=E9=94=81?= =?UTF-8?q?=E5=AE=9A=E8=AE=B0=E5=BD=95=E8=A1=A8=E9=94=81=E5=AE=9A=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E8=B5=8B=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.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/MesLockRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java index 7607f1f..8d3d516 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java @@ -55,5 +55,5 @@ public class MesLockRecord extends BaseBean implements Serializable { @Column(name = "LOCK_STATUS") @ColumnDefault("1") @ApiParam("锁定状态") - private Integer lockStatus; + private Integer lockStatus = 1; } From 29d62c4334e1dd513bf13e47b3d21867f70468c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 15 Jun 2021 18:05:06 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E3=80=903484=2020063-=E5=BE=85=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=8A=A5=E5=B7=A5=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?-20210610=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/bean/MesFailureModeApproval.java | 60 ++++++++++++++++++++++ .../MesFailureModeApprovalRepository.java | 14 +++++ 2 files changed, 74 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeApproval.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModeApprovalRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeApproval.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeApproval.java new file mode 100644 index 0000000..e957f35 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFailureModeApproval.java @@ -0,0 +1,60 @@ +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: + * @Author: dominic + * @Date: 2020/12/03 20:29 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FAILURE_MODE_APPROVAL") +@Api("MES_失效模式审批人员") +public class MesFailureModeApproval extends BaseBean implements Serializable { + + private static final long serialVersionUID = -5274274774653791153L; + + @Column(name = "PATTERN_CODE") + @ApiParam("模式代码") + private String patternCode; + + @Column(name = "PATTERN_NAME") + @ApiParam("模式代码名称") + private String patternName; + + @Column(name = "DEPARTMENT_NAME_RDD") + @ApiParam("部门名称") + private String departmentNameRdd; + + @Column(name = "DEPARTMENT_ID") + @ApiParam("部门id") + private Long departmentId; + + @Column(name = "USER_NAME") + @ApiParam("人员名称") + private String userName; + + @Column(name = "USER_ID") + @ApiParam("人员id") + private Long userId; + + @Column(name = "PERSONNEL_LEVEL") + @ApiParam("人员级别") + private Integer personnelLevel; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModeApprovalRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModeApprovalRepository.java new file mode 100644 index 0000000..21636c6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFailureModeApprovalRepository.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.MesFailureModeApproval; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\13 11:53 + * @Modify: + **/ +public interface MesFailureModeApprovalRepository extends BaseRepository { +} From bef841570793efe2e6b9e90bf013901f45026cd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=8F=8C=E5=8F=8C?= Date: Tue, 15 Jun 2021 22:49:35 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'modules/i3plus-pojo?= =?UTF-8?q?-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetai?= =?UTF-8?q?l.java'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 泰国需求：接口表增加PACKAGE_NO字段索引 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 64587ab..cc831dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -29,7 +29,8 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_PACKAGE_DETAIL", indexes = { @Index(columnList = "SERIAL_NUMBER"), - @Index(columnList = "PART_NO") + @Index(columnList = "PART_NO"), + @Index(columnList = "PACKAGE_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "IF_CODE"}) }) From b545d4928a73b4286c2de71b94c45177a4cd4377 Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 16 Jun 2021 17:14:58 +0800 Subject: [PATCH 06/10] =?UTF-8?q?SYSMENU=20=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index 59afede..b05afcb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -99,6 +99,11 @@ public class SysMenu extends BaseBean { @AnnoOutputColumn(required = false) private String menuIcon; + @Column(name="MENU_BACKGROUND_IMAGE") + @ApiParam(value ="资源背景图片" , access ="资源背景图片") + @AnnoOutputColumn(required = false) + private String menuBackgroundImage; + @Column(name="MENU_DESCRIPTION") @ApiParam(value ="资源描述" , access ="配置描述") @AnnoOutputColumn(required = false) From 0170a86f60d8697e912541ab4749df6cf8231a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 16 Jun 2021 17:52:30 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E3=80=903484=2020063-=E5=BE=85=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=8A=A5=E5=B7=A5=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?-20210610=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 37 ++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 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 8277381..27fb77b 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 @@ -2102,8 +2102,8 @@ public class MesEnumUtil { MES_JISA(640, "jisaExcelService", "JISA导入"), MES_CONTROL_PLAN(650, "controlPlanExcelService", "控制计划导入"), MES_HOLIDAY_VACATION(660, "holidayVacationExcelService", "节假日导入"), - MES_PENDING_REPORT_TYPE(670, "PendingReportTypeExcelService", "待处理报工类型导入"), - MES_FAILURE_MODE_PARTS(680, "FailureModePartsExcelService", "失效模式零件导入"); + MES_PENDING_REPORT_TYPE(670, "pendingReportTypeExcelService", "待处理报工类型导入"), + MES_FAILURE_MODE_PARTS(680, "failureModePartsExcelService", "失效模式零件导入"); private int value; private String service; @@ -8467,4 +8467,37 @@ public class MesEnumUtil { return description; } } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PERSONNEL_LEVEL { + + ONE(10, "一级"), + TWO(20, "二级"); + + private int value; + private String description; + + PERSONNEL_LEVEL(int value, String description) { + this.value = value; + this.description = 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 int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } From 6947405f4455f47e9c146a70ab72d7424759dc87 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 17 Jun 2021 16:31:44 +0800 Subject: [PATCH 08/10] =?UTF-8?q?16328=2020135--=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E9=9B=B6=E4=BB=B6=E7=A0=81?= =?UTF-8?q?=E8=BF=99=E4=B8=AA=E5=AD=97=E6=AE=B5--2021-06-23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java index 8d3d516..0617ce2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLockRecord.java @@ -44,6 +44,10 @@ public class MesLockRecord extends BaseBean implements Serializable { @ApiParam("工序代码") private String processCode; + @Column(name = "SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + @Column(name = "LOCK_REASON") @ApiParam("锁定原因") private String lockReason; From 8b5447f5cab0e505e5537753a8da443f30f72faf Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 17 Jun 2021 22:25:19 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=81=9C=E6=9C=BA=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java | 13 +++++++++++++ .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java | 4 ++++ .../cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java index a8890ef..ff9e619 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.andon.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import java.io.Serializable; /** @@ -77,6 +78,18 @@ public class AndonBoardModel implements Serializable { @ApiParam("停线时间比率") private String downtimeRate; + @ApiParam("周") + private Integer week; + + @ApiParam(value = "事件原因代码") + public String ecCode; + + @ApiParam(value = "事件原因描述") + public String ecNameRdd; + + @ApiParam(value = "小时") + public String hour; + public int getTotalTimeVal() { return totalTime == null ? 0 : totalTime; } 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 27fb77b..6c1626f 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 @@ -4796,7 +4796,8 @@ public class MesEnumUtil { CANCEL(30, "取消"), OFFLINE(40, "下线"), SHIPMENT(50, "发运"), - SPECIAL(60, "特殊标识"); + SPECIAL(60, "特殊标识"), + FORCE_REPORT_WORK(70, "强制报工"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index 4ece2f1..0f467f2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -77,4 +77,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable { @Transient @ApiParam("收货日期") private String receiptDate; + + @Transient + @ApiParam("选配类型") + private Integer optionType; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java index ed7aaad..743fe36 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MgnBjAblePickModel.java @@ -22,6 +22,7 @@ public class MgnBjAblePickModel { private String clientInfo; private String ip; private Integer port; + private boolean isBackOff; private Integer timeout = 3000; private Integer sleepTime = 2000; From 33b4b60c38362fa07ee192c7cb1752eca8dea7a8 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 18 Jun 2021 10:11:44 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E7=8E=87=E8=B6=8B?= =?UTF-8?q?=E5=8A=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/report/ScrapRateTrendReportModel.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java new file mode 100644 index 0000000..b8506ca --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapRateTrendReportModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.mes.model.report; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Description : 报废率趋势model + * @Reference : + * @Author : dominic + * @CreateDate : 2021/6/17 19:12 + * @Modify: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@ApiModel("报废率趋势model") +public class ScrapRateTrendReportModel { + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("修改时间") + private String modifyDatetime; + + @ApiParam("操作类型") + private Integer operateType; + + @ApiParam("报废原因") + private String scrapCode; +}