From fa25769c50cf87f6239ddb0294acc6cb4d95272a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 21 Oct 2019 17:35:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?mes=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 | 329 +++++++++++++++++---- 1 file changed, 278 insertions(+), 51 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 060c91f..0ef45a6 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 @@ -12,6 +12,282 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { /** + * mes设备作业任务明细-执行状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_ACTION_STATUS { + + PENDING(10, "待处理"), + COMPLETE(20, "已完成"), + CANCEL(30, "取消"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_ACTION_STATUS(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; + } + + } + + /** + * mes设备作业任务明细-整体结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_FINAL_RESULT { + + YES(10, "合格"), + NO(20, "不合格"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_FINAL_RESULT(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; + } + + } + + /** + * mes设备作业任务明细-维修标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_REPAIR_FLAG { + + FALSE(10, "否"), + TRUE(20, "是"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_REPAIR_FLAG(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; + } + + } + + /** + * mes设备作业状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_STATUS { + + CREATE(10, "创建"), + LANDED(20, "下达"), + OPEN(30, "开启"), + CLOSE(40, "关闭"), + CANCEL(50, "取消"); + + private int value; + private String description; + + MES_EQU_TASK_STATUS(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; + } + + } + + /** + * mes设备作业任务来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_SOURCE { + + PLAN(10, "周期计划"), + CREATE(20, "手工创建"), + ANDON(30, "ANDON"); + + private int value; + private String description; + + MES_EQU_TASK_SOURCE(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; + } + + } + + /** + * mes设备作业通知标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_NOTIFY_FLAG { + + FALSE(10, "未通知"), + TRUE(20, "已通知"); + + private int value; + private String description; + + MES_EQU_TASK_NOTIFY_FLAG(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; + } + + } + + /** + * mes导入模块 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_INSERT_EXCEL { + + MES_PLAN_ORDER(10, "生产计划"), + MES_EQUIPMENT(20, "设备台账"), + MES_EQU_TASK_STANDARD(30, "设备作业要求"); + + private int value; + private String description; + + MES_INSERT_EXCEL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + // 根据value返回枚举类型,主要在switch中使用 + public static MES_INSERT_EXCEL getByValue(int value) { + for (MES_INSERT_EXCEL mesInsertExcel : values()) { + if (mesInsertExcel.getValue() == value) { + return mesInsertExcel; + } + } + return null; + } + + + 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; + } + + } + + /** * mes设备作业通知配置-通知类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -417,56 +693,7 @@ public class MesEnumUtil { * mes设备作业要求-作业类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_INSERT_EXCEL { - - MES_PLAN_ORDER(10, "生产计划"), - MES_EQUIPMENT(20, "设备台账"), - MES_EQU_TASK_STANDARD(30, "设备作业要求"); - - private int value; - private String description; - - MES_INSERT_EXCEL(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - // 根据value返回枚举类型,主要在switch中使用 - public static MES_INSERT_EXCEL getByValue(int value) { - for (MES_INSERT_EXCEL mesInsertExcel : values()) { - if (mesInsertExcel.getValue() == value) { - return mesInsertExcel; - } - } - return null; - } - - - 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; - } - - } - - /** - * mes设备作业要求-作业类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_EQU_TASK_STANDARD_TASK_TYPE { + public enum MES_EQU_TASK_TYPE { CHECK(10, "点检"), MAINTAIN(20, "保养"), @@ -475,7 +702,7 @@ public class MesEnumUtil { private int value; private String description; - MES_EQU_TASK_STANDARD_TASK_TYPE(int value, String description) { + MES_EQU_TASK_TYPE(int value, String description) { this.value = value; this.description = description; } From 689f6057c1c56aafaafac4f4d4ae491c6ea92ac9 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 21 Oct 2019 17:48:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java | 6 ++++++ .../java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index 3a35968..d61b983 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -154,6 +154,12 @@ public class UserDetailModel extends BaseBean { @ApiParam(value ="用户所有组织信息") private List infoOrganizeIdList; + @ApiParam(value ="账号ID集合信息") + private List userIdList; + + @ApiParam(value ="用户ID集合信息") + private List userInfoIdList; + public SysUser getSysUser(){ SysUser user = new SysUser(); user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 572f63f..4e34946 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -524,10 +524,13 @@ public class CoreHqlPack { DdlPackBean result = DdlPackBean.getDdlPackBean(user); DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result); + DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result); + DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result); DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result); DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result); DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result); + DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList,"id",result); result.setOrderByStr(user.orderBy()); @@ -651,6 +654,10 @@ public class CoreHqlPack { DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result); DdlPreparedPack.getInPackList(idList,"id",result); + if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){ + DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result); + } + // Like DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result); DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result); From bdb818930bfb6002e57703ba59652e005c24fe3f Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 21 Oct 2019 19:20:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B9=BF=E6=92=AD?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonDisposalCfg.java | 8 ++ .../pojo/andon/bean/AndonDisposalMaintenCfg.java | 15 --- .../i3plus/pojo/andon/bean/AndonManageQueue.java | 8 ++ .../i3plus/pojo/andon/bean/AndonManageRecord.java | 148 ++------------------- .../i3plus/pojo/andon/bean/AndonQueueAttach.java | 8 ++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 7 +- 6 files changed, 35 insertions(+), 159 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index 96463f0..2c61463 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -51,6 +51,14 @@ public class AndonDisposalCfg extends BaseBean { @ApiParam(value = "呼叫原因描述") private String acNameRdd; + @Column(name = "EC_CODE") + @ApiParam(value = "事件方法代码") + private String ecCode; + + @Column(name = "EC_NAME_RDD") + @ApiParam(value = "事件方法描述") + private String ecNameRdd; + @AnnoOutputColumn(refClass = AndonEnumUtil.KNOWLEDGE_AUDIT_STATUS.class,refForeignKey = "value",value = "description") @Column(name = "FLOW_STATUS") @ApiParam(value = "审批状态") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java index a0b4eed..83e1572 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java @@ -30,27 +30,12 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Api("Andon自处理维护配置") public class AndonDisposalMaintenCfg extends BaseBean { - @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") - private String workCellCode; @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型代码") private String alarmCode; - @Column(name = "AC_CODE") - @ApiParam(value = "呼叫原因代码") - private String acCode; - - @Column(name = "EM_CODE") - @ApiParam(value = "处理措施代码") - private String emCode; - @Column(name = "RP_WHERE") @ApiParam(value = "有效时长") private Integer rpWhere; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 573ca3e..6f0f112 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -250,6 +250,14 @@ public class AndonManageQueue extends BaseManageQueue { @ApiParam(value ="规格型号") private String scale; + @Transient + @ApiParam(value ="当前件数") + private Integer currentProdNum; + + @Transient + @ApiParam(value ="生产累计件数") + private Integer totalProdNum; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index f47728f..a5d557a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonFormat; @@ -35,116 +36,38 @@ import javax.persistence.*; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯记录") -public class AndonManageRecord extends BaseBean { - - @Column(name = "ANDON_ORDER_NO") - @ApiParam(value = "安灯队列编号") - private String andonOrderNo; - - @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") - private String alarmCode; - - @Column(name = "ACTION_CODE") - @ApiParam(value = "安灯动作代码") - private String actionCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME_RDD") - @ApiParam(value = "工作中心名称") - private String workCenterNameRdd; - - @Column(name = "WORK_CELL_NAME_RDD") - @ApiParam(value = "工作单元名称") - private String workCellNameRdd; - - @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") - private String workCellCode; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam(value = "设备代码") - private String equipmentCode; - - @Column(name = "EQUIPMENT_NAME_RDD") - @ApiParam(value = "设备名称") - private String equipmentNameRdd; - - @Column(name = "SHIFT_CODE") - @ApiParam(value = "班次代码") - private String shiftCode; - - @Column(name = "SHIFT_NAME_RDD") - @ApiParam(value = "班次名称") - private String shiftNameRdd; - - @Column(name = "STATUS_CODE") - @ApiParam(value = "安灯状态代码") - private String statusCode; +public class AndonManageRecord extends BaseManageQueue { @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") private Double seq; - @Column(name = "PRIORITY_LEVEL") - @ApiParam(value = "优先级别", example = "1") - private Integer priorityLevel; - - @Column(name="CALL_TIME",updatable = false) - @ApiParam(value = "呼叫时间") - @AnnoOutputColumn(hidden = true) - public String callTime; - @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String callTimeStr; - @Column(name="CONFIRM_TIME",updatable = false) - @ApiParam(value = "响应时间") - @AnnoOutputColumn(hidden = true) - public String confirmTime; - @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="响应时间",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String confirmTimeStr; - @Column(name="RESET_TIME",updatable = false) - @ApiParam(value = "解决时间") - @AnnoOutputColumn(hidden = true) - public String resetTime; - @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="解决时间",example = "2018-01-01 01:00:00") @AnnoOutputColumn(hidden = true) public String resetTimeStr; - @Column(name = "CALL_USER") - @ApiParam(value = "呼叫人") - private String callUser; - @Transient @ApiParam(value = "呼叫人名字") private String callUserName; - @Column(name = "CONFIRM_USER") - @ApiParam(value = "响应人") - private String confirmUser; - @Transient @ApiParam(value = "响应人名字") private String confirmUserName; - @Column(name = "RESET_USER") - @ApiParam(value = "解决人") - private String resetUser; @Transient @ApiParam(value = "解决人名字") @@ -177,69 +100,10 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "转呼通知等级") private String scRpLevel; - @Column(name = "AC_CODE") - @ApiParam(value = "呼叫原因代码") - private String acCode; - - @Column(name = "AC_NAME_RDD") - @ApiParam(value = "呼叫原因描述") - private String acNameRdd; - - @Column(name = "AC_DESC") - @ApiParam(value = "呼叫具体原因") - private String acDesc; - - @Column(name = "EC_CODE") - @ApiParam(value = "事件原因代码") - private String ecCode; - - @Column(name = "EC_NAME_RDD") - @ApiParam(value = "事件原因描述") - private String ecNameRdd; - - @Column(name = "EC_DESC") - @ApiParam(value = "事件具体原因") - private String ecDesc; - - @Column(name = "EM_CODE") - @ApiParam(value = "事件方法代码") - private String emCode; - - @Column(name = "EM_NAME_RDD") - @ApiParam(value = "事件方法描述") - private String emNameRdd; - - @Column(name = "EM_DESC") - @ApiParam(value = "事件具体方法") - private String emDesc; - - @Column(name = "IS_HALT") - @ApiParam(value = "是否停机", example = "1") - private Integer isHalt; - - @Column(name = "HALT_CODE") - @ApiParam(value = "停机类型") - private String haltCode; - - @Column(name = "HALT_DESC") - @ApiParam(value = "停机具体原因") - private String haltDesc; - @Column(name = "SEND_FLAG") @ApiParam(value = "发送标志") private String sendFlag; - /** - * 处理类型：10=标准处理，20=自处理 - */ - @Column(name = "DISPOSAL_TYPE") - @ApiParam(value = "处理类型") - private String disposalType; - - @Column(name = "ALARM_DETAIL_CODE") - @ApiParam(value = "安灯子类型代码") - private String alarmDetailCode; - @Column(name = "EPM_CODE") @ApiParam(value = "事件现象代码") private String epmCode; @@ -321,6 +185,14 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value ="规格型号") private String scale; + @Transient + @ApiParam(value ="当前件数") + private Integer currentProdNum; + + @Transient + @ApiParam(value ="生产累计件数") + private Integer totalProdNum; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java index 739613c..31fda6a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java @@ -92,4 +92,12 @@ public class AndonQueueAttach extends BaseBean { @ApiParam(value ="规格型号") private String scale; + @Column(name="CURRENT_PROD_NUM") + @ApiParam(value ="当前件数") + private Integer currentProdNum; + + @Column(name="TOTAL_PROD_NUM") + @ApiParam(value ="生产累计件数") + private Integer totalProdNum; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index f46add5..833ebed 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -90,7 +90,7 @@ public class AndonHqlPack { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(andonBroadCast.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getWorkCenterCode(), "workCenterCode", packBean); - DdlPreparedPack.getStringEqualPack(andonBroadCast.getTargetIds(), "targetIds", packBean); + DdlPreparedPack.getStringLikerPack(andonBroadCast.getTargetIds(), "targetIds", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getGroupNo(), "groupNo", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getDeviceDec(), "deviceDec", packBean); DdlPreparedPack.getNumEqualPack(andonBroadCast.getIsValid(),"isValid",packBean); @@ -120,11 +120,7 @@ public class AndonHqlPack { public static DdlPackBean getAndonDisposalMaintenCfg(AndonDisposalMaintenCfg andonDisposalMaintenCfg) { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getOrganizeCode(), "organizeCode", packBean); - DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAlarmCode(), "alarmCode", packBean); - DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCellCode(), "workCellCode", packBean); - DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getEmCode(), "emCode", packBean); - DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAcCode(), "acCode", packBean); DdlPreparedPack.getNumEqualPack(andonDisposalMaintenCfg.getIsValid(),"isValid",packBean); return packBean; } @@ -138,7 +134,6 @@ public class AndonHqlPack { DdlPackBean packBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(andonQueueAttach.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(andonQueueAttach.getAndonOrderNo(), "andonOrderNo", packBean); - DdlPreparedPack.getStringEqualPack(andonQueueAttach.getPartNo(), "partNo", packBean); DdlPreparedPack.getNumEqualPack(andonQueueAttach.getIsValid(),"isValid",packBean); return packBean; } From dbc69e957a33bd97572ca3bf077f4c4ca30a3afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Mon, 21 Oct 2019 20:58:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1.=20=E4=BE=9B=E5=BA=94=E5=95=86=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=AE=9E=E4=BD=93=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 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java index 82a5a73..3d90a3d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java @@ -38,6 +38,9 @@ public class WmsVendorPart extends BaseBean { @ApiParam(value = "物料号") private String partNo; + @Column(name = "VENDOR_PART_NO") + @ApiParam(value = "供应商物料号") + private String vendorPartNo; @Transient @ApiParam("物料名称")