diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java index c8767a5..9cb491b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmCause.java @@ -34,7 +34,7 @@ public class AndonAlarmCause extends BaseBean implements Serializable { private static final long serialVersionUID = 5837347497945981811L; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java index edaab1e..a6f9b22 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellAlarmCause.java @@ -42,13 +42,13 @@ public class AndonCellAlarmCause extends BaseBean implements Serializable { @ApiParam(value = "工位代码") private String workCellCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class, refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class, refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") + @ApiParam(value = "安灯类型代码") private String alarmCode; @Column(name = "AC_CODE") - @ApiParam(value = "事件描述") + @ApiParam(value = "事件描述代码") private String acCode; @AnnoOutputColumn(hidden = true) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java index abf5ff9..14e008f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventCause.java @@ -42,13 +42,13 @@ public class AndonCellEventCause extends BaseBean implements Serializable { @ApiParam(value = "工位代码") private String workCellCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") + @ApiParam(value = "安灯类型代码") private String alarmCode; @Column(name = "EC_CODE") - @ApiParam(value = "事件原因") + @ApiParam(value = "事件原因代码") private String ecCode; @Transient diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java index 23c8d1b..6fef604 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonCellEventMethod.java @@ -42,13 +42,13 @@ public class AndonCellEventMethod extends BaseBean implements Serializable { @ApiParam(value = "工位代码") private String workCellCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") + @ApiParam(value = "安灯类型代码") private String alarmCode; @Column(name = "EM_CODE") - @ApiParam(value = "处理方法") + @ApiParam(value = "处理方法代码") private String emCode; @Transient diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java index 91bb41b..e0c6640 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventCause.java @@ -47,7 +47,7 @@ public class AndonEventCause extends BaseBean implements Serializable { @AnnoOutputColumn(hidden = true) private String parentEcCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java index c5371c6..2b9dc86 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonEventMethod.java @@ -47,7 +47,7 @@ public class AndonEventMethod extends BaseBean implements Serializable { @ApiParam(value = "父阶方法代码") private String parentEmCode; - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") +// @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型") private String alarmCode; 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 21177f7..20826ec 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 @@ -413,8 +413,9 @@ public class AndonManageQueue extends BaseManageQueue implements Serializable { * @param workCenterNameRdd * @param andonCount */ - public AndonManageQueue(String organizeNameRdd, String workCenterNameRdd, Long andonCount) { + public AndonManageQueue(String organizeNameRdd, String workCenterCode, String workCenterNameRdd, Long andonCount) { this.organizeNameRdd = organizeNameRdd; + this.workCenterCode = workCenterCode; this.workCenterNameRdd = workCenterNameRdd; this.andonCount = andonCount; } 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 85a5f7f..ec7d0e5 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 @@ -1973,7 +1973,9 @@ public class MesEnumUtil { MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入"), MES_PART_STOCK_SCHEDULE(550, "partStockScheduleExcelService", "库存排程配置导入"), MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"), - MES_LOCATION(570, "locationExcelService", "库位信息导入"); + MES_LOCATION(570, "locationExcelService", "库位信息导入"), + MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"), + MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"); private int value; private String service; @@ -3321,8 +3323,9 @@ public class MesEnumUtil { EMERGENCY_ORDER(80, "紧急插单"), FICTIVE(90, "虚拟工单"), SPARE_PART_PRODUCTION(100, "备件生产"), - REPRODUCTION_RMS(110, "重新生产-报功"), - REPRODUCTION_NOT_RMS(120, "重新生产-不报功"); + REPRODUCTION_RMS(110, "重新生产-报工"), + REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), + REVERSE_SPRAY_ORDER(130, "反喷工单"); private int value; private String description; @@ -3716,11 +3719,11 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PRODUCE_SN_QC_STATUS { + PRE_CHECK(5, "待检测"), QUALIFIED(10, "合格"), DEFECTED(20, "不合格"), SCRAPED(30, "报废"), - DISMANTLED(40, "已拆解"), - PRE_CHECK(50, "待检测"); + DISMANTLED(40, "已拆解"); private int value; private String description; @@ -4044,7 +4047,8 @@ public class MesEnumUtil { PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), - PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""); + PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), + PCN_IMAGE_NGINX(220, "PCN_IMAGE_NGINX", "PCN_IMAGE_NGINX"); private int value; private String code; @@ -4483,7 +4487,9 @@ public class MesEnumUtil { public enum QUEUE_JIT_ACTUAL_STATUS { CREATE(10, "创建"), LANDED(20, "下达"), - CANCEL(30, "取消"); + CANCEL(30, "取消"), + OFFLINE(40, "下线"), + SHIPMENT(50, "发运"); private int value; private String description; @@ -7055,4 +7061,160 @@ public class MesEnumUtil { return tmp; } } + + /** + * 工单启动池状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_START_CACHE_STATUS { + + PENDING(10, "待处理"), + PROCESSED(20, "已处理"); + + private int value; + private String description; + + WORK_START_CACHE_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; + } + + } + + /** + * 涂装导入--反喷标识（Y-正常；F-反喷） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REVERSE_SPRAY_MARK { + REVERSE_SPRAY("F", "反喷"), + NORMAL("Y", "正常"); + + private String value; + private String description; + + REVERSE_SPRAY_MARK(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String 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 PACKAGE_TRANS_TYPE { + + OUTSTOCK(10, "出库"), + INSTOCK(20, "入库"), + GOBACK(30, "退回"); + + private int value; + private String description; + + PACKAGE_TRANS_TYPE(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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 通知标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum NOTICE_SIGN { + + PENDING(10, "待处理"), + PROCESSED(20, "已处理"); + + private int value; + private String description; + + NOTICE_SIGN(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; + } + + } } 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 19abb5b..9c495fe 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 @@ -58,19 +58,21 @@ public class MesPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_MODULE_TYPE { - MONITOR_MODULE(10, "监听组件"), - REVEAL_MODULE(20, "展示组件"), - BUTTON_MODULE(30, "按钮组件"), - TIMING_MODULE(40, "定时组件"), - PCS_BACK_MODULE(50, "工序后台组件"), - PLC_CALLBACK_MODULE(60, "PLC回调工位参数"), - ASSIST_MODULE(70, "辅助组件"); + MONITOR_MODULE(10, "MONITOR_MODULE", "监听组件"), + REVEAL_MODULE(20, "REVEAL_MODULE", "展示组件"), + BUTTON_MODULE(30, "BUTTON_MODULE", "按钮组件"), + TIMING_MODULE(40, "TIMING_MODULE", "定时组件"), + PCS_BACK_MODULE(50, "PCS_BACK_MODULE", "工序后台组件"), + PLC_CALLBACK_MODULE(60, "PLC_CALLBACK_MODULE", "PLC回调工位参数"), + ASSIST_MODULE(70, "ASSIST_MODULE", "辅助组件"); private int value; + private String data; private String description; - WORK_MODULE_TYPE(int value, String description) { + WORK_MODULE_TYPE(int value, String data, String description) { this.value = value; + this.data = data; this.description = description; } @@ -78,6 +80,8 @@ public class MesPcnEnumUtil { return value; } + public String getData() { return data; } + public String getDescription() { return description; } @@ -1878,8 +1882,9 @@ public class MesPcnEnumUtil { EMERGENCY_ORDER(80, "紧急插单"), FICTIVE(90, "虚拟工单"), SPARE_PART_PRODUCTION(100, "备件生产"), - REPRODUCTION_RMS(110, "重新生产-报功"), - REPRODUCTION_NOT_RMS(120, "重新生产-不报功"); + REPRODUCTION_RMS(110, "重新生产-报工"), + REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), + REVERSE_SPRAY_ORDER(130, "反喷工单"); private int value; private String description; @@ -2595,7 +2600,8 @@ public class MesPcnEnumUtil { TIME_MODULE_START("timeModuleStart", "定时组件开始"), ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"), ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"), - TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"); + TIME_MODULE_STOP("timeModuleStop", "定时组件暂停"), + MESSAGE_POOL("messagePool", "消息池"); private String value; private String description; @@ -4433,6 +4439,16 @@ public class MesPcnEnumUtil { public static String valueOfDescription(int val) { return valueOf(val); } + + public static String codeOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } } /** @@ -4888,4 +4904,311 @@ public class MesPcnEnumUtil { } } + /** + * 产品特性 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_TRAIT { + NORMAL(10, "正常件"), + FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"), + FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"), + FICTIVE(40, "虚拟件"); + + private int value; + private String description; + + PART_TRAIT(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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STEP_DISPLAY_CLASS { + WHITE(10, "white"), + LIGHT_BLUE(20, "lightBlue"); + + private Integer value; + private String description; + + STEP_DISPLAY_CLASS(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PROMPT_SOUND { + SUCCESS(10, "扫描成功"), + FAILURE(20, "扫描失败"); + + private Integer value; + private String description; + + PROMPT_SOUND(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 事务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_TRANS_TYPE { + + OUTSTOCK(10, "出库"), + INSTOCK(20, "入库"), + GOBACK(30, "退回"); + + private int value; + private String description; + + PACKAGE_TRANS_TYPE(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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_TRANS_STATUS { + + CREATE(10, "创建"), + PROCESSED(20, "已处理"); + + private int value; + private String description; + + PACKAGE_TRANS_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; + } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PACKAGE_SAMPLE_TYPE { + + NORMAL(10, "正常batch"), + FIRST(20, "首件"), + MIDDLE(30, "中件"), + LAST(40, "末件"); + + private int value; + private String description; + + PACKAGE_SAMPLE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + + } + + /** + * 客户JIT生产队列状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_ACTUAL_STATUS { + CREATE(10, "创建"), + LANDED(20, "下达"), + CANCEL(30, "取消"), + OFFLINE(40, "下线"), + SHIPMENT(50, "发运"); + + private int value; + private String description; + + QUEUE_JIT_ACTUAL_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; + } + } + + /** + * 涂装导入--反喷标识（Y-正常；F-反喷） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum REVERSE_SPRAY_MARK { + REVERSE_SPRAY("F", "反喷"), + NORMAL("Y", "正常"); + + private String value; + private String description; + + REVERSE_SPRAY_MARK(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String 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-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 c7e88b6..24d3342 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 @@ -724,6 +724,10 @@ public class WmsEnumUtil { } return tmp; } + + public static String valueOfDescription(int val) { + return valueOf(val); + } } /** @@ -1448,7 +1452,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CS_STRATEGY_TYPE { - PART_COVERAGE(110, "物料分类覆盖"), + MATERIAL_PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), ZORE_STOCK(130, "零库存"), MATERIAL_COVERAGE(140, "物料覆盖"); @@ -4283,7 +4287,8 @@ public class WmsEnumUtil { REPORT(10, "REPORT", "生产报工"), BOXING_ERROR_PROOFING(20, "BOXING_ERROR_PROOFING", "装箱防错"), REPORT_CANCEL(30, "REPORT_CANCEL", "报工撤销"), - PACKAGE(40, "BOXING_ERROR_PROOFING", "翻包"); + PACKAGE(40, "BOXING_ERROR_PROOFING", "翻包"), + SHIP_CHECK(50, "SHIP_CHECK", "发运校验"); private int value; private String code; @@ -4763,6 +4768,55 @@ public class WmsEnumUtil { } } + + /** + * 客户发运 发运数量控制逻辑 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOCK_FIFO_SN_TYPE { + SHIP_FLAG(10, "客户发运"), + OVER_SEND(20, "多发"), + CONSISTENT(30, "一致"), + NO_CONTROL(40, "不控制"), + OVER_ONE_BOX(50, "多一箱"); + + + private int value; + private String description; + + LOCK_FIFO_SN_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static LOCK_FIFO_SN_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + 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; + } + } + /** * 拉动方式维护 * 默认为 10 @@ -5009,6 +5063,58 @@ public class WmsEnumUtil { /** + * 生产计划主表计划状态 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_PLAN_STATUS { + CREATE(10, "CREATE", "创建"), + PLANNED(20, "PLANNED", "处理中"), + CLOSE(30, "CLOSE", "已关闭"); + + private int value; + private String code; + private String description; + + WORK_ORDER_PLAN_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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 int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + /** * 是否贵重物料 * 默认为2 */ @@ -5326,13 +5432,17 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PICKING_EXECUTE_STATUS { - IN_PROGRESS(1, "执行中"), EXPIRED(2, "已超期"), NORMAL(3, "正常"); + IN_PROGRESS(1,"IN_PROGRESS", "执行中"), + EXPIRED(2,"EXPIRED", "已超期"), + NORMAL(3,"NORMAL", "正常"); private int value; + private String code; private String description; - PICKING_EXECUTE_STATUS(int value, String description) { + PICKING_EXECUTE_STATUS(int value,String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -5340,6 +5450,10 @@ public class WmsEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index 4823179..416e42c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -243,6 +243,19 @@ public class HqlPack { } /** + * 输入日期大于所选字段 + * + * @param columnName 列名 + * @param result + */ + public static void getStringBiggerPack(Object data, String columnName, StringBuffer result) { + if (data != null && StringUtils.isNotBlank(String.valueOf(data))) { + data = getSafeParam(data); + result.append(" and model." + columnName + " < '" + data + "'"); + } + } + + /** * 封装String对象成equal语句 * @param columnName 列名 * @param result 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 39063b7..98d4fc0 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 @@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; import java.math.BigDecimal; @@ -94,7 +93,6 @@ public class IfDismantleRecord extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") - @Lob private String errorMessage; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 397a28c..d1dcee7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -10,7 +10,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -97,7 +96,6 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "ERROR_MESSAGE") @ApiParam("异常消息") - @Lob private String errorMessage; @Column(name = "ACTION_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java index fec2dbd..2df2ad6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardPlanCapacity.java @@ -86,5 +86,5 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable { @Transient @ApiParam("看板时段计划产量") - private List boardShiftSectionCapacities; + private List boardShiftSectionCapacities; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCap.java similarity index 91% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCap.java index 2b2e211..a07f070 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCapacity.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardShiftSectionCap.java @@ -25,9 +25,9 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_BOARD_SHIFT_SECTION_CAPACITY") +@Table(name = "MES_BOARD_SHIFT_SECTION_CAP") @Api("MES_看板时段计划产量") -public class MesBoardShiftSectionCapacity extends BaseBean implements Serializable { +public class MesBoardShiftSectionCap extends BaseBean implements Serializable { private static final long serialVersionUID = -1184108324734484237L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java new file mode 100644 index 0000000..3bef0b1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBypassMapping.java @@ -0,0 +1,44 @@ +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: jokelin + * @Date: 2020/9/6 1:25 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BYPASS_MAPPING") +@Api("MES_BYPASS项映射关系") +public class MesBypassMapping extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6362769913660089402L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "BYPASS_SEQ") + @ApiParam("BYPASS项序号") + private Integer bypassSeq; + + @Column(name = "CHECK_NAME") + @ApiParam("检测项描述") + private String checkName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java index f727900..35ec80a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataAuth.java @@ -11,10 +11,7 @@ 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 javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; import java.util.List; @@ -54,7 +51,8 @@ public class MesDataAuth extends BaseBean implements Serializable { @ApiParam("数据对象名称") private String dataObjectName; - @Column(name = "FILTER_RULE", columnDefinition = "TEXT") + @Lob + @Column(name = "FILTER_RULE") @ApiParam("过滤规则") private String filterRule; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index dce964b..a22dd03 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -148,6 +148,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("不良处理类型") private String defectActionType; + @Transient + @ApiParam("明细总数") + private Integer detailTotal = 0; + public MesPackage() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java new file mode 100644 index 0000000..230f503 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTrans.java @@ -0,0 +1,73 @@ +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 javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description :MES_出入库事务信息 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PACKAGE_TRANS") +@Api("MES_出入库事务") +public class MesPackageTrans extends BaseBean implements Serializable { + private static final long serialVersionUID = -89611828516676432L; + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty = 0d; + + @Column(name = "LOT_NO") + @ApiParam("批号") + private String lotNo; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("生产工单号") + private String workOrderNo; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "LOCATION_CODE") + @ApiParam("库位代码") + private String locationCode; + + @Column(name = "TRANS_TYPE") + @ApiParam("事务类型") + private Integer transType = 10; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status = 10; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java index 7ad424d..82bfdf1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java @@ -3,8 +3,10 @@ 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.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -24,6 +26,8 @@ import java.io.Serializable; @Entity @DynamicInsert @DynamicUpdate +@AllArgsConstructor +@NoArgsConstructor @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART_STOCK_SCHEDULE") @Api("MES_库存排程配置") @@ -71,6 +75,14 @@ public class MesPartStockSchedule extends BaseBean implements Serializable { @ApiParam("是否小尺寸物料") private Integer isSmallSize = 1; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "STOCK_QTY") + @ApiParam("排程实时库存") + private Integer stockQty; + @Transient @ApiParam("物料名称") private String partName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java new file mode 100644 index 0000000..a1f1796 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSystemCfg.java @@ -0,0 +1,57 @@ +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.*; +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PCN_SYSTEM_CFG") +@Api("MES_PCN_系统配置") +public class MesPcnSystemCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324811596L; + + @Column(name = "PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name = "SYS_NAME") + @ApiParam("系统名称") + private String sysName; + + @Column(name = "COMPANY") + @ApiParam("公司名称") + private String company; + + @Column(name = "SYS_LOG") + @ApiParam("系统LOG") + private String sysLog; + + @Column(name = "MAIN_LOG") + @ApiParam("主页LOG") + private String mainLog; + + @Column(name = "COPYRIGHT") + @ApiParam("版权信息") + private String copyright; + + @Transient + @ApiParam("LOG存放地址") + private String logUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 92c400f..772a97b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -27,7 +27,8 @@ import java.math.BigDecimal; @Table(name = "MES_PRODUCE_SN", indexes = { @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), - @Index(columnList = "PART_NO") + @Index(columnList = "PART_NO"), + @Index(columnList = "WORK_ORDER_NO") }, uniqueConstraints = { @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) }) 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 f439e4f..0f176b5 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 @@ -28,7 +28,10 @@ import java.io.Serializable; @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "PART_NO"), - @Index(columnList = "MODIFY_DATE_TIME") + @Index(columnList = "MODIFY_DATE_TIME"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CELL_CODE"), + @Index(columnList = "WORK_ORDER_NO") }) @Api("产品条码履历表") public class MesProduceSnTravel extends BaseBean implements Serializable { @@ -134,6 +137,10 @@ public class MesProduceSnTravel extends BaseBean implements Serializable { @ApiParam("操作类型") private Integer operateType; + @Column(name = "DEFECT_ACTION_TYPE") + @ApiParam("不良处理类型") + private String defectActionType; + @Transient @ApiParam("返回信息") private String resultMsg; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java index 1c1795f..cc47d6e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java @@ -51,4 +51,8 @@ public class MesQueueGroupCount extends BaseBean implements Serializable { @Column(name = "GROUP_SIDE") @ApiParam("料架摆放位置") private String groupSide; + + @Transient + @ApiParam("分组序号") + private String groupSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index 56e17ba..e438425 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -134,6 +134,14 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("工单类型") private Integer woType; + @Column(name = "OFFLINE_TIME") + @ApiParam("下线时间") + private String offlineTime; + + @Column(name = "NOTICE_SIGN") + @ApiParam("通知标识") + private Integer noticeSign = 10; + @Transient @ApiParam("客户需求开始时间") private String custPointStartDate; @@ -158,4 +166,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam(value = "下达按钮编号") public String buttonCode; + @Transient + @ApiParam(value = "零件号") + public String partNo; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 1d1c468..742a516 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -25,7 +25,6 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@NoArgsConstructor @AllArgsConstructor @Builder @Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL") @@ -100,4 +99,22 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @Transient @ApiParam("工单类型") private Integer woType; + + @Transient + @ApiParam("子物料名称") + private String itemPartNo; + + @Transient + @ApiParam("数量") + private long qty; + + public MesQueueJitActualDetail() { + + } + + public MesQueueJitActualDetail(String partNo, String itemPartNo, long qty) { + this.partNo = partNo; + this.itemPartNo = itemPartNo; + this.qty = qty; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java index d290454..b2631fb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.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; /** @@ -58,4 +59,26 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable { @Column(name = "FORMULA_CONTENT") @ApiParam("配方内容") private String formulaContent; + + @Transient + @ApiParam("工单类型") + private Integer woType; + + @Transient + @ApiParam("子物料名称") + private String itemPartNo; + + @Transient + @ApiParam("数量") + private long qty; + + public MesQueueJitPlanDetail() { + + } + + public MesQueueJitPlanDetail(String partNo, String itemPartNo, long qty) { + this.partNo = partNo; + this.itemPartNo = itemPartNo; + this.qty = qty; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java index d54028c..cdef2d5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java @@ -31,9 +31,9 @@ public class MesSnPhotoRelation extends BaseBean implements Serializable { private static final long serialVersionUID = -3062206473345277360L; @Column(name = "SERIAL_NUMBER") - @ApiParam("条码") - private String serialNumber; - + @ApiParam("过程条码") + private String serialNumber; + //TODO 北京麦格纳使用，如要变更此字段需要更改对应业务代码 @Column(name = "PHOTO_PATH") @ApiParam("照片路径") private String photoPath; @@ -42,4 +42,21 @@ public class MesSnPhotoRelation extends BaseBean implements Serializable { @ApiParam("照片名称") private String photoName; + @Column(name = "PHOTO_URL") + @ApiParam("照片访问地址") + private String photoUrl; + + @Column(name = "PHOTO_ORIGINAL_PATH") + @ApiParam("照片原始路径") + private String photoOriginalPath; + + @Column(name = "PHOTO_TRANSFER_PATH") + @ApiParam("照片转存路径") + private String photoTransferPath; + + @Column(name = "PHOTO_TARGET_PATH") + @ApiParam("照片目标路径") + private String photoTargetPath; + + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index 57d30f8..2fb1c74 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -74,7 +74,7 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("离开调用") private Long outAmgId; - @Column(name = "STATUS_TYPE", columnDefinition = "tinyint default 0") + @Column(name = "STATUS_TYPE") @ApiParam("状态类型 10=初始化状态") private Integer statusType; @@ -101,4 +101,8 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @Transient @ApiParam("状态执行情况") private StepResult stepResult; + + @Transient + @ApiParam("是否执行下个扫描信息") + private boolean execNextScan = false; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java index 05466cb..e5f1c82 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSubPart.java @@ -36,4 +36,7 @@ public class MesSubPart extends BaseBean implements Serializable { @ApiParam("替代料") private String subPartNo; + @Column(name = "SUB_FLAG") + @ApiParam("替代料标识") + private String subFlag; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 3f2bef5..571dd6c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -74,6 +74,10 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("目标合格率") private Double targetPassRate; + @Column(name = "STAND_TAKT") + @ApiParam("标准节拍") + private Integer standTakt; + @Transient @ApiParam(value = "子集列表") private List childTreeList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 255e7b6..4d0bcef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -346,6 +346,22 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam(value = "子零件总数", example = "0") private Double itemQtyCount = 0d; + @Transient + @ApiParam("是否虚拟件") + private Integer isFictive = 2; + + @Transient + @ApiParam("圈数") + private Integer rounds; + + @Transient + @ApiParam("小车号") + private String smallCarNo; + + @Transient + @ApiParam("行颜色") + private String rowColor; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java new file mode 100644 index 0000000..83c05f9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkStartCache.java @@ -0,0 +1,53 @@ +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description :MES_工单启动池 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-06-28 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_START_CACHE") +@Api("MES_工单启动池") +public class MesWorkStartCache extends BaseBean implements Serializable { + private static final long serialVersionUID = 4320604250440221045L; + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "ACTUAL_START_TIME") + @ApiParam("实际启动时间") + private String actualStartTime; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java index 3ee75bc..85ff399 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistenceHistory.java @@ -46,7 +46,7 @@ public class EngineScriptPersistenceHistory extends BaseBean { // 脚本的具体内容 @Lob - @Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT") + @Column(name = "SCRIPT_CONTENT") private String scriptContent; // 脚本的描述，包含脚本的用法，参数说明等 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java new file mode 100644 index 0000000..166c188 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/AssistModuleModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/9/2 5:00 下午 + * @Modify: + */ +@Data +public class AssistModuleModel { + + @ApiParam("标准节拍") + private Integer standTakt; + + @ApiParam("x坐标内容") + private List xAxis; + + @ApiParam("y坐标内容") + private List yAxis; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java index 72615c8..129386f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java @@ -64,7 +64,7 @@ public class BoardModel { private Integer periodCapacity = 0; @ApiParam("看板时段计划产量") - private List boardShiftSectionCapacityList; + private List boardShiftSectionCapacityList; @ApiParam("看板设备状态") private List boardEquStatusList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java index 2e7cfef..935cbde 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java @@ -21,7 +21,7 @@ public class BypassModel { private String bypassCode; @ApiParam("检测项") - private String businessValue; + private String checkName; @ApiParam("是否确认，1=已确认，2=未确认") private String isVerify; @@ -29,4 +29,10 @@ public class BypassModel { @ApiParam("生产数据ID") private Long productDataId; + @ApiParam("BYPASS项序号") + private Integer bypassSeq; + + @ApiParam("状态") + private String status; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java new file mode 100644 index 0000000..917b27c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/FutrueTaskModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: 条码解绑实体 + * @Reference: + * @Author: siliter.yuan + * @CreateDate: 2020-06-28-11:44 + * @Modify: + **/ +@Data +public class FutrueTaskModel { + + @ApiParam("实现类") + private Object futrueTaskService; + + @ApiParam("包装条码") + private StationRequestBean stationRequestBean; + + @ApiParam("过程条码") + private MesProduceSn produceSn; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index c130f5b..7cbd75b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -88,6 +88,9 @@ public class GenSerialNoModel { @ApiParam("零件号后4位") private String partNoAfterFour; + @ApiParam("客户工厂代码") + private String custProdLineCode; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java index 9ab41c8..4b7addd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java @@ -49,4 +49,7 @@ public class PaintOnLineModel { @ApiParam("过程条码") private String serialNumber; + + @ApiParam("是否虚拟件") + private Integer isFictive = 2; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java index 2265b41..60a89fe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java @@ -66,4 +66,8 @@ public class PaintWorkOrderSnModel extends BaseBean { private List prodPackageList; private String partNameRdd; + + @ApiParam("反喷标识--工单类型") + private String reverseSprayMark; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java index b668562..611b035 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdOrgModel.java @@ -20,9 +20,6 @@ import javax.persistence.Transient; * @Modify: **/ @Data -@Entity -@DynamicInsert -@DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("组织模型") public class ProdOrgModel extends BaseBean { @@ -70,4 +67,12 @@ public class ProdOrgModel extends BaseBean { @Transient @ApiParam("序号") private Integer seq; + + @Transient + @ApiParam("工位监控模式") + private Integer monitorType; + + @Transient + @ApiParam("条码生成模式") + private Integer generateType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index c16f45c..8dc57e7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -100,6 +100,12 @@ public class QueueOrderModel implements Serializable { @ApiParam("分组序号") private String groupSeq; + @ApiParam("客户产线代码") + private String custProdLineCode; + @ApiParam("JIT排序号") + private String jitSeq; + private Integer status; + public QueueOrderModel() { } @@ -185,7 +191,7 @@ public class QueueOrderModel implements Serializable { // getPrintSnQueueOrderModel public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode, Integer isGroupPrinted, String jitActualNo, - String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber) { + String prodCfgTypeCode, String produceCategoryCode, Double qty, String vinCode, Double queueSeq, String groupSeq, String serialNumber, String custProdLineCode) { this.id = id; this.queDetailSeq = queDetailSeq; this.pgCode = pgCode; @@ -201,6 +207,7 @@ public class QueueOrderModel implements Serializable { this.queueSeq = queueSeq; this.groupSeq = groupSeq; this.serialNumber = serialNumber; + this.custProdLineCode = custProdLineCode; } public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, @@ -268,7 +275,7 @@ public class QueueOrderModel implements Serializable { //getAlreadyQueueOrderModelNoSnMgn public QueueOrderModel(String serialNumber, String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, - String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo) { + String partNo, String partNameRdd, String workType, String prodCfgTypeCode, String vinCode, String formulaContent, String queueGroupNo, String produceCategoryCode) { this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; @@ -284,6 +291,7 @@ public class QueueOrderModel implements Serializable { this.vinCode = vinCode; this.formulaContent = formulaContent; this.queueGroupNo = queueGroupNo; + this.produceCategoryCode = produceCategoryCode; } //getAlreadyQueueOrderModelNoSn @@ -304,7 +312,8 @@ public class QueueOrderModel implements Serializable { //料架分组队列展示组件-getQueueOrderDetailListByQueueGroupNo public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, - Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode) { + Double queueSeq, Double queDetailSeq, String partNo, + String partNameRdd, String organizeCode, String vinCode, String produceCategoryCode, String serialNumber) { this.queueGroupNo = queueGroupNo; this.groupNo = groupNo; this.orderNo = orderNo; @@ -315,6 +324,7 @@ public class QueueOrderModel implements Serializable { this.organizeCode = organizeCode; this.vinCode = vinCode; this.produceCategoryCode = produceCategoryCode; + this.serialNumber = serialNumber; } // getQueueOrderBySerialNumber @@ -327,4 +337,17 @@ public class QueueOrderModel implements Serializable { this.produceCategoryCode = produceCategoryCode; this.workType = workType; } + + // getQueueJitActualJitSeq + public QueueOrderModel(Long id, Double queueSeq, String serialNumber, String orderNo, String prodCfgTypeCode, String vinCode, String queueGroupNo, String jitSeq, Integer status) { + this.id = id; + this.queueSeq = queueSeq; + this.serialNumber = serialNumber; + this.orderNo = orderNo; + this.prodCfgTypeCode = prodCfgTypeCode; + this.vinCode = vinCode; + this.queueGroupNo = queueGroupNo; + this.jitSeq = jitSeq; + this.status = status; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 29a1729..f759312 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -189,6 +189,9 @@ public class StationRequestBean implements Serializable { @ApiParam("创建时间") private String createDatetime; + @ApiParam("创建时间") + private String packageNo; + @Override public String toString() { return "StationRequestBean{" + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java index 4ce479b..5edd9e4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java @@ -65,4 +65,7 @@ public class StationResultBean implements Serializable { @ApiParam("定时秒数") private Integer timer; + + @ApiParam("提示音 1，2，3，4与前端约定") + private Integer promptSound; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java new file mode 100644 index 0000000..469a7e1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +@Data +public class TJMgnBoardModel extends BaseBean { + + @ApiParam("工单号") + private String workOrderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("颜色") + private String partColor; + + @ApiParam("生产数量") + private Double prodQty; + + @ApiParam("一次合格数量") + private Double firstQuQty; + + @ApiParam("抛光数量") + private Double polishQty; + + @ApiParam("不合格数量") + private Double noQuQty; + + @ApiParam("一次合格率") + private String firstPassRate; + + @ApiParam("最终合格率") + private String finalPassRate; + + @ApiParam("不良处理类型") + private String defectType; + + @ApiParam("列名") + private List> headModelList; + + @ApiParam("列值") + private List> headValueModelList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java index 05e431f..c27679b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueGatherModel.java @@ -27,4 +27,7 @@ public class TorqueGatherModel { @ApiParam("是否合格") private String isQualified; + + @ApiParam("颜色") + private String color; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java index 834aedf..ce900de 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ZzMesWorkOrderModel.java @@ -51,7 +51,7 @@ public class ZzMesWorkOrderModel extends BaseBean { private String snp; @ApiParam(value = "包装规格") - @AnnoOutputColumn + @AnnoOutputColumn(required = false) private String packageSpec; @ApiParam(value = "备注") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapRepository.java similarity index 58% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapRepository.java index 209e270..5c5c8ca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapacityRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardShiftSectionCapRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCapacity; +import cn.estsh.i3plus.pojo.mes.bean.MesBoardShiftSectionCap; import org.springframework.stereotype.Repository; /** @@ -11,5 +11,5 @@ import org.springframework.stereotype.Repository; * @Modify: */ @Repository -public interface MesBoardShiftSectionCapacityRepository extends BaseRepository { +public interface MesBoardShiftSectionCapRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java new file mode 100644 index 0000000..392ba42 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBypassMappingRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesBypassMapping; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/9/6 1:30 下午 + * @Modify: + */ +public interface MesBypassMappingRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTransRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTransRepository.java new file mode 100644 index 0000000..7dc91b4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPackageTransRepository.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.MesPackageTrans; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:33 + * @Modify: + **/ +public interface MesPackageTransRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSystemCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSystemCfgRepository.java new file mode 100644 index 0000000..bc0a358 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSystemCfgRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipment; +import cn.estsh.i3plus.pojo.mes.bean.MesPcnSystemCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPcnSystemCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineRepository.java new file mode 100644 index 0000000..2f3a3a1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStateMachineRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesStateMachine; + +/** + * @Description : + * @Author : simon.song + * @CreateDate : 2020-09-01 + **/ +public interface MesStateMachineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkStartCacheRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkStartCacheRepository.java new file mode 100644 index 0000000..ca5346f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkStartCacheRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkStartCache; +import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : + * @CreateDate : 2020-05-18 16:49 + * @Modify: + **/ +@Repository +public interface MesWorkStartCacheRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 4bc9fed..f310d79 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -161,6 +161,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); } + if (!StringUtils.isEmpty(mesWorkOrder.getPartNameRdd())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNameRdd(), "partNameRdd", packBean); + } if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); } @@ -2357,7 +2360,7 @@ public class MesHqlPack { * @param organizeCode * @return */ - public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual, String organizeCode) { + public static DdlPackBean getMesQueueJitActual(MesQueueJitActual queueJitActual,List orderList, String organizeCode) { DdlPackBean packBean = getAllBaseData(organizeCode); if (!StringUtils.isEmpty(queueJitActual.getJisActualNo())) { DdlPreparedPack.getStringLikerPack(queueJitActual.getJisActualNo(), "jisActualNo", packBean); @@ -2389,6 +2392,10 @@ public class MesHqlPack { queueJitActual.getCustPointEndDate(), "createDatetime", packBean, true); } + if(!CollectionUtils.isEmpty(orderList)){ + DdlPreparedPack.getInPackList(orderList, "jisActualNo", packBean); + } + DdlPreparedPack.getNumEqualPack(queueJitActual.getWoType(), "woType", packBean); return packBean; } @@ -3276,4 +3283,63 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesLocation.getIsValid(), "isValid", packBean); return packBean; } + + /** + * 条码照片关系 + * @param snPhotoRelation + * @param organizeCode + * @return + */ + public static DdlPackBean getMesSnPhotoRelation(MesSnPhotoRelation snPhotoRelation, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(snPhotoRelation, organizeCode); + if (!StringUtils.isEmpty(snPhotoRelation.getSerialNumber())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getSerialNumber(), "serialNumber", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoName())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoName(), "photoName", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoPath())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoPath(), "photoPath", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoUrl())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoUrl", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoOriginalPath())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoOriginalPath", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoTransferPath())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoTransferPath", packBean); + } + if (!StringUtils.isEmpty(snPhotoRelation.getPhotoTargetPath())) { + DdlPreparedPack.getStringLikerPack(snPhotoRelation.getPhotoUrl(), "photoTargetPath", packBean); + } + return packBean; + } + + /** + * MES_BYPASS项映射关系 + * + * @param bypassMapping + * @param organizeCode + * @return + */ + public static DdlPackBean getBypassMapping(MesBypassMapping bypassMapping, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(bypassMapping, organizeCode); + if (!StringUtils.isEmpty(bypassMapping.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(bypassMapping.getWorkCenterCode(), "workCenterCode", packBean); + } + if (!StringUtils.isEmpty(bypassMapping.getCheckName())) { + DdlPreparedPack.getStringLikerPack(bypassMapping.getCheckName(), "checkName", packBean); + } + return packBean; + } + + public static DdlPackBean getMesSubPart(MesSubPart mesSubPart) { + DdlPackBean packBean = getAllBaseData(mesSubPart.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesSubPart.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesSubPart.getSubPartNo(), "subPartNo", packBean); + DdlPreparedPack.getStringLikerPack(mesSubPart.getSubFlag(), "subFlag", packBean); + DdlPreparedPack.getNumEqualPack(mesSubPart.getIsValid(), "isValid", packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java new file mode 100644 index 0000000..87d933d --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/MesPPMasterModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.model.wms; + + +import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails; +import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 生产领料计划 + * @Reference : + * @Author : puxiao + * @CreateDate : 2020-09-10 19:50 + * @Modify: + **/ +@Data +public class MesPPMasterModel { + + @ApiParam("生产计划主数据") + private MesPpMaster mesPpMaster; + + @ApiParam("生产计划明细数据") + private MesPpDetails mesPpDetails; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index 6ef6c90..50cbbdf 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -48,7 +48,7 @@ public class WmsActionResponseBean implements Serializable { public String errorMsg; @ApiParam("提示信息") - public String message; + public String message = ""; @ApiParam("列表信息") public List informations; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java index 1c4fdfe..92d8bb8 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSapDbParamModel.java @@ -21,4 +21,7 @@ public class WmsSapDbParamModel implements Serializable { private String masterStatusName;//单据状态名 private String detailsTableName;//单据明细表名 private String snTableName;//单据条码表名 + private String checkDetailCondition;//可以取消单据明细条件 + private String checkSnCondition;//可以取消单据条码条件 + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index c7981a7..41955cb 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -78,12 +78,15 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "跳转后端请求") public String actionUrl; + @ApiParam(value = "作业人员") + public String userNo; + public WmsTaskInfoModel() { } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, String busiTypeCode, String zdate, String ztime, String custNo, String vendorNo, - String createDatetime, String srcZoneNo, String createUser, String organizeCode) { + String createDatetime, String srcZoneNo, String createUser, String organizeCode,String userNo) { this.orderNo = orderNo; this.taskStatus = taskStatus; this.opTypeName = opTypeName; @@ -98,6 +101,7 @@ public class WmsTaskInfoModel implements Serializable { this.srcZoneNo = srcZoneNo; this.createUser = createUser; this.organizeCode = organizeCode; + this.userNo = userNo; } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java index 0e69083..52fb00f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java @@ -81,6 +81,11 @@ public class MesPpMaster extends BaseBean{ @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String remark; + @Column(name = "WORK_ORDER_PLAN_STATUS", columnDefinition = "int default 10") + @ApiParam("工单计划状态:10-创建，20-处理中，30-已关闭") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS") + private Integer workOrderPlanStatus; + public Integer getOrderStatus() { return orderStatus == null ? 0 : this.orderStatus.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java index 9ba02c1..2ad5530 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSRange.java @@ -83,6 +83,11 @@ public class WmsCSRange extends BaseBean { @AnnoOutputColumn(hidden = true) public String[] zoneNos; + @Transient + @ApiParam("库存地代码") + @AnnoOutputColumn(hidden = true) + public String areaNo; + public WmsCSRange(){} public WmsCSRange(String zoneNo,String partNo,String partNameRdd){ @@ -91,4 +96,10 @@ public class WmsCSRange extends BaseBean { this.partNameRdd = partNameRdd; } + public WmsCSRange(String zoneNo, String areaNo, String partNo, String partNameRdd) { + this.zoneNo = zoneNo; + this.areaNo = areaNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java index fa3d7d1..ebdce7a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description : 车辆信息 @@ -84,4 +85,28 @@ public class WmsCar extends BaseBean { @ApiParam("经纬度") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String mapLocation; + + @Column(name = "VOLUME", columnDefinition = "decimal(18,8)") + @ApiParam(value = "容积", example = "1") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double volume; + + @Transient + @ApiParam(value = "需要(辆)") + private Integer carQty; + + @Transient + @ApiParam(value = "车辆序号") + private Integer seq; + + public WmsCar() { + } + + public WmsCar(WmsCar car, Integer seq, String carDesc) { + this.id = car.id; + this.organizeCode = car.organizeCode; + this.volume = car.volume; + this.carNo = seq.toString(); + this.carDesc = carDesc; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java index a941bf2..341533f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsConfig.java @@ -53,6 +53,9 @@ public class WmsConfig extends BaseBean { @ApiParam(value ="参数值类型") private String configValueType; + /** + * SQL Server 2005:请使用 varchar(max)、nvarchar(max) 和 varbinary(max) 数据类型，而不要使用 text、ntext 和 image 数据类型。 + */ @Lob @Column(name="CONFIG_VALUE", columnDefinition = "TEXT") @ApiParam(value ="参数值") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index b0dd8a0..556316e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -119,6 +119,10 @@ public class WmsDocMovementDetails extends BaseBean { private Integer itemStatus; + @Transient + @ApiParam(value = "完成状态") + public Integer orderStatus; + /** * 已创建，已收货，已发运，已拣货 */ @@ -400,7 +404,9 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("产线代码") private String workCenterCode; - + @Transient + @ApiParam("箱数") + private Double boxQty; public WmsDocMovementDetails () { @@ -420,8 +426,7 @@ public class WmsDocMovementDetails extends BaseBean { this.priority = priority; this.orderNo = orderNo; } - - public WmsDocMovementDetails (String partNo,String orderNo) { +public WmsDocMovementDetails (String partNo,String orderNo) { this.partNo = partNo; this.orderNo = orderNo; } @@ -504,4 +509,30 @@ public class WmsDocMovementDetails extends BaseBean { this.organizeCode = wmsDocMovementDetails.getOrganizeCode(); this.color = color; } + + public WmsDocMovementDetails(String orderNo, Double qty, Double pickQty, String modifyDateTime, String createDateTime, String planDate, String planTime, Integer orderStatus) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.modifyDatetime = modifyDateTime; + this.createDatetime = createDateTime; + this.planDate = planDate; + this.planTime = planTime; + this.orderStatus = orderStatus; + } + + public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, Double boxQty,String srcLocateNo) { + this.id = wmsDocMovementDetails.getId(); + this.orderNo = wmsDocMovementDetails.getOrderNo(); + this.partNo = wmsDocMovementDetails.getPartNo(); + this.partNameRdd = wmsDocMovementDetails.getPartNameRdd(); + this.qty = wmsDocMovementDetails.getQty(); + this.unit = wmsDocMovementDetails.getUnit(); + this.srcZoneNo = wmsDocMovementDetails.getSrcZoneNo(); + this.destLocateNo = wmsDocMovementDetails.getDestLocateNo(); + this.createDatetime = wmsDocMovementDetails.getCreateDatetime(); + this.organizeCode = wmsDocMovementDetails.getOrganizeCode(); + this.boxQty = boxQty; + this.srcLocateNo = srcLocateNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 9aaee96..d30ca85 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -225,6 +225,8 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "COST_CENTER") @ApiParam(value = "成本中心") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL, + isRequire = 2, dataSrc = "/wms/wms-enum/dictionary/code?code=DOC_COST_CENTER", listColumnName = "name", explicitColumnName = "dictionaryValue") private String costCenter; @Column(name = "REMAKE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 7d1d04e..b0ac2ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -182,7 +182,7 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam(value = "版本") - private String version; + private Integer version; public WmsDocMovementSn(){} @@ -217,7 +217,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd, - String whNo,String erpSrcNo,String version,Double sumQty) { + String whNo,String erpSrcNo,Integer version,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; this.lotNo = lotNo; @@ -242,7 +242,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, - String version,String whNo,String custNo, + Integer version,String whNo,String custNo, String erpSrcNo,String planDate,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; @@ -258,7 +258,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, - String version,String whNo,Integer snStatus,Double sumQty) { + Integer version,String whNo,Integer snStatus,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; this.lotNo = lotNo; @@ -271,7 +271,7 @@ public class WmsDocMovementSn extends BaseBean { } public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, - String version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) { + Integer version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) { this.orderNo = orderNo; this.partNo = partNo; this.lotNo = lotNo; @@ -283,4 +283,19 @@ public class WmsDocMovementSn extends BaseBean { this.snStatus = snStatus; this.sumQty = sumQty; } + + public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd, + String erpSrcNo,String vendorNo,String whNo,String assignSrcWhNo,String planDate,Double sumQty) { + this.orderNo = orderNo; + this.partNo = partNo; + this.lotNo = lotNo; + this.createDatetime = createDatetime; + this.partNameRdd = partNameRdd; + this.erpSrcNo = erpSrcNo; + this.vendorNo = vendorNo; + this.whNo = whNo; + this.srcWhNo = assignSrcWhNo; + this.planDate = planDate; + this.sumQty = sumQty; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 78806fe..1e55325 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -47,6 +49,7 @@ public class WmsMoveToERP extends BaseBean { * 状态:1=创建,10=待处理,20=已处理 */ @Column(name = "ORDER_STATUS") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") @ApiParam(value = "状态", example = "0") public Integer orderStatus; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index eb834de..ee49f3e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -173,6 +173,10 @@ public class WmsPOMaster extends BaseBean { private Integer boardStatus; @Transient + @ApiParam("物料编码") + private String partNo; + + @Transient private List orderNoList; @Column(name = "DOCK", columnDefinition = "varchar(50) default ''") @@ -195,6 +199,15 @@ public class WmsPOMaster extends BaseBean { @ApiParam(value = "部门名称", example = "1") public Integer departName; + @Transient + @ApiParam("周总数") + private Integer weekRcCount; + + @Transient + @ApiParam("容差") + private Integer delayHour; + + public WmsPOMaster() { } @@ -219,6 +232,18 @@ public class WmsPOMaster extends BaseBean { this.planTime = planTime; } + public WmsPOMaster(String orderNo, Integer poStatus, String vendorNo, String vendorName, + String dockCode, String planDate, String planTime, Integer delayHour) { + this.orderNo = orderNo; + this.poStatus = poStatus; + this.vendorNo = vendorNo; + this.vendorName = vendorName; + this.dock = dockCode; + this.planDate = planDate; + this.planTime = planTime; + this.delayHour = delayHour; + } + public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 9cc690d..d97792c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -11,7 +11,12 @@ import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; +import javax.persistence.Transient; +import javax.persistence.Version; /** * @Description : PO订单明细信息 @@ -128,6 +133,10 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam(value = "是否免费", example = "1") private Integer isFree; + @Column(name = "DELAY_HOUR", columnDefinition = "int default 0") + @ApiParam(value = "容差") + private Integer delayHour; + @Column(name = "REMARK") @ApiParam("备注") private String remark; @@ -190,6 +199,14 @@ public class WmsPOMasterDetails extends BaseBean { private String planEndDate; + /** + * 状态:1=新建,10=收货中,20=收货完成, + * 30=入库中,40=入库完成,90=已关闭,91=已取消 + */ + @Transient + @ApiParam(value = "状态", example = "1") + public Integer poStatus; + public Double getSnpVal() { return snp; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java index aa6cdcf..8bddf7e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -157,4 +157,23 @@ public class WmsPartExtend extends BaseBean { @ApiParam(value = "自动采购数量") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) private Integer autoPurchaseQty; + + @Column(name = "QC_SKIP_CYCLE") + @ApiParam(value = "质检跳批周期") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer qcSkipCycle; + + @Column(name = "QC_PASS_COUNT") + @ApiParam(value = "质检合格次数") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer qcPassCount; + + @Column(name = "LAST_QC_TIME") + @ApiParam(value = "首次质检时间合格") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String lastQcTime; + + public Integer getQcPassCount() { + return this.qcPassCount == null ? 0 :this.qcPassCount.intValue(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index f965f02..d3ba94f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -167,6 +167,10 @@ public class WmsPoSn extends BaseBean { @ApiParam("汇总数量") private Double sumQty; + @Transient + @ApiParam("物料库位") + private String partLocateNo; + public WmsPoSn(){} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index bfe28bc..e26eba3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -122,6 +122,10 @@ public class WmsQCMaster extends BaseBean { @ApiParam(value = "零件号") public String partNo; + @Transient + @ApiParam(value = "零件名称") + public String partNameRdd; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } @@ -137,4 +141,15 @@ public class WmsQCMaster extends BaseBean { this.refSrc = refSrc; this.partNo = partNo; } + + public WmsQCMaster(String orderNo, String vendorNo, String VendorDesc, String refType, String refSrc, String partNo, String partNameRdd, String createDatetime) { + this.orderNo = orderNo; + this.vendorNo = vendorNo; + this.VendorDesc = VendorDesc; + this.refType = refType; + this.refSrc = refSrc; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.createDatetime = createDatetime; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java new file mode 100644 index 0000000..f05689d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java @@ -0,0 +1,116 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +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.Column; +import javax.persistence.Entity; +import javax.persistence.Index; +import javax.persistence.Table; + +/** + * @Description : 质检单条码质检不良清单表 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-09-01 14:37 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_QC_SN_ERROR_LIST", + indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SN") +}) +@Api("质检单条码质检不良清单表") +public class WmsQCSNErrorList extends BaseBean { + private static final long serialVersionUID = 4905945381732744790L; + + @Column(name="ORDER_NO") + @ApiParam("单号") + private String orderNo; + + @Column(name="ITEM") + @ApiParam("行号") + private String item; + + /** + * 状态:10=创建,20=已处理 + */ + @Column(name="ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + private Integer itemStatus; + + @Column(name="REMARK") + @ApiParam("备注") + private String remark; + + @Column(name="SAMPLE_QTY", nullable = false) + @ApiParam("检验数量") + @ColumnDefault("0") + private double sampleQty; + + @Column(name="REJECT_QTY", nullable = false) + @ApiParam("不合格数量") + @ColumnDefault("0") + private double rejectQty; + + @Column(name="UNIT") + @ApiParam("单位") + private String unit; + + @Column(name="PART_NO") + @ApiParam("物料编码") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name="SN") + @ApiParam("条码") + private String sn; + + @Column(name = "QC_USER") + @ApiParam("检验员") + private String qcUser; + + @Column(name = "QC_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00") + private String qcTime; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + private String vendorNo; + + @Column(name = "ERROR_CODE") + @ApiParam("不良代码") + private String errorCode; + + @Column(name = "ERROR_DESC_RDD") + @ApiParam("不良描述") + private String errorDescRdd; + + @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ColumnDefault("0") + @ApiParam(value = "收货数量", example = "0") + public Double rcQty; + + @Column(name = "QC_SCALE", columnDefinition = "decimal(18,8)", nullable = false) + @ColumnDefault("0") + @ApiParam(value = "质检比例", example = "0") + public String qcScale; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCViewReport.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCViewReport.java new file mode 100644 index 0000000..fc9f032 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCViewReport.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : MGN质检报表(通过查询视图实现) + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-09-01 14:37 + * @Modify: + **/ +@Data +@Api("质检报表") +public class WmsQCViewReport extends BaseBean { + private static final long serialVersionUID = 4905945381732744790L; + + @ApiParam("单号") + private String orderNo; + + @ApiParam("检验数量") + private double sampleQty; + + @ApiParam("不合格数量") + private double rejectQty; + + @ApiParam("检验员") + private String qcUser; + + @ApiParam(value = "检验时间") + private String qcTime; + + @ApiParam(value = "收货数量") + public Double rcQty; + + @ApiParam(value = "质检比例") + public String qcScale; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index b2cd128..f9b3812 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -237,6 +237,10 @@ public class WmsStockSn extends BaseBean { @Transient public String zoneNameRdd; + @ApiParam(value = "时间") + @Transient + public String date; + @ApiParam(value = "库位名称") @Transient public String locateNameRdd; @@ -512,6 +516,10 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "单据") private String orderNo; + @Transient + @ApiParam("物料库位") + private String partLocateNo; + public WmsStockSn() { } @@ -541,6 +549,15 @@ public class WmsStockSn extends BaseBean { this.locateNo = locateNo; } + public WmsStockSn(String locateNo, String partNo, String partName, String zoneNo, String unit, String whNo) { + this.locateNo = locateNo; + this.partNo = partNo; + this.partNameRdd = partName; + this.zoneNo = zoneNo; + this.unit = unit; + this.whNo = whNo; + } + //locate_no,part_no,sn_status,qc_status,sum(qty),is_deleted,is_valid public WmsStockSn(String locateNo, String partNo, Integer snStatus, Integer qcStatus, Double qty, Integer isDeleted, Integer isValid) { @@ -819,5 +836,19 @@ public class WmsStockSn extends BaseBean { this.fixLotNo = fixLotNo; } + public WmsStockSn(String sn, Double qty, String unit, String partNo, String partNameRdd, String partTypeDesc, String lotNo, String leftCode, String fixLotNo, String vendorNo, String organizeCode) { + this.sn = sn; + this.qty = qty; + this.unit = unit; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.partTypeDesc = partTypeDesc; + this.lotNo = lotNo; + this.leftCode = leftCode; + this.fixLotNo = fixLotNo; + this.vendorNo = vendorNo; + this.organizeCode = organizeCode; + } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java index aeb6e6a..f8f6db9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTestResultDetails.java @@ -75,7 +75,7 @@ public class WmsTestResultDetails extends BaseBean { @ApiParam("检测值") public String checkValue; - @Column(name = "IS_SYNC", nullable = false) + @Column(name = "IS_SYNC") @ApiParam("是否同步") @AnnoOutputColumn(refClass = WmsEnumUtil.BH_SUMMARY_IS_SYNC.class, refForeignKey = "value", value = "description") public Integer isSync = WmsEnumUtil.BH_SUMMARY_IS_SYNC.INIT.getValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index 2c5f6e1..edcf03a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -96,4 +96,17 @@ public class WmsTransType extends BaseBean { public long getTmIdVal() { return this.tmId == null ? 0 : this.tmId; } + + public WmsTransType(String transTypeCode) { + this.transTypeCode = transTypeCode; + } + + public WmsTransType() { + + } + + public WmsTransType(String transTypeCode, String transTypeName) { + this.transTypeCode = transTypeCode; + this.transTypeName = transTypeName; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java index 241599c..bce6ced 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWorkCenter.java @@ -72,4 +72,13 @@ public class WmsWorkCenter extends BaseBean { searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String descLocationCode; + + /** + * 分钟 + **/ + @Column(name = "ADVANCE_PULL_TIMES", columnDefinition = "int default 0") + @ApiParam(value = "提前拉动时间") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer advancePullTimes; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java index a5a55d2..e651958 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java @@ -39,11 +39,18 @@ public class WmsAutoPurchasePartModel extends Pager { @ApiParam("供应商名称") private String vendorName; - public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse) { + @ApiParam("要货时间") + private String arriveTime; + + private Integer preReceivingDay; + + + public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse, Integer preReceivingDay) { this.partNo = partNo; this.partName = partName; this.qty = qty; this.erpWarehouse = warehouse; + this.preReceivingDay = preReceivingDay; } public WmsAutoPurchasePartModel() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index d5b5feb..387aba1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -1,11 +1,13 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import java.time.LocalTime; +import java.util.Map; /** * @Description : 供应商收货看板信息 @@ -48,6 +50,12 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable> gteCurrentDayResultMap; + + @ApiParam("小于今天的结果集") + private Map> ltCurrentDayResultMap; + public WmsPoAsnRecvModel(String orderNo, String partNo, String vendorName, String dock, String prodCfgTypeName, String planTime, Double transQty, Double resQty) { this.orderNo = orderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java new file mode 100644 index 0000000..432ab79 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoCountModel.java @@ -0,0 +1,67 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : PO明细回传汇总Model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-09-12 13:56 + * @Modify: + **/ +@Data +@Api("PO明细回传汇总Model") +public class WmsPoCountModel { + + @ApiParam(value = "po单号") + private String poOrderNo; + + @ApiParam(value = "收货日期") + private String rcDate; + + @ApiParam(value = "源单号") + private String srcOrderNo; + + @ApiParam(value = "源行号") + private Integer srcItem; + + @ApiParam(value = "收货批次") + private String lotNo; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "仓库") + private String whNo; + + @ApiParam(value = "汇总数量") + private Double sumQty; + + @ApiParam(value = "供应商批次") + private String venLotNo; + + @ApiParam(value = "操作人") + private String user; + + public WmsPoCountModel() { + } + + public WmsPoCountModel(String poOrderNo, String rcDate, String srcOrderNo, Integer srcItem, String lotNo, String partNo, String partName, String whNo, Double sumQty, String venLotNo, String user) { + this.poOrderNo = poOrderNo; + this.rcDate = rcDate; + this.srcOrderNo = srcOrderNo; + this.srcItem = srcItem; + this.lotNo = lotNo; + this.partNo = partNo; + this.partName = partName; + this.whNo = whNo; + this.sumQty = sumQty; + this.venLotNo = venLotNo; + this.user = user; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java new file mode 100644 index 0000000..ec0fc07 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : 推荐车辆信息model + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-09-02 11:17 + * @Modify: + **/ +@Data +@Api("推荐车辆信息model") +public class WmsRecommendCarModel extends BaseBean implements Serializable { + + @ApiParam(value = "计划日期") + String planTimeStart; + @ApiParam(value = "待发物料总数") + Double partNoSum; + @ApiParam(value = "标准包装") + Double snp; + @ApiParam(value = "单包装体积(m3)") + Double vol; + @ApiParam(value = "物料体积(m3)") + Double partTotalVol; + @ApiParam(value = "物料号") + String partNo; + + public WmsRecommendCarModel(String partNo, Double partNoSum, Double vol, Double snp,Double partTotalVol, + String organizeCode,Long id,String planTimeStart) { + this.partNo = partNo; + this.partNoSum = partNoSum; + this.vol = vol; + this.snp = snp; + this.partTotalVol = partTotalVol; + this.organizeCode = organizeCode; + this.id = id; + this.planTimeStart = planTimeStart; + } + + // @ApiParam(value = "车辆编号") +// String carNo; +// @ApiParam(value = "车辆名称") +// String carDesc; +// @ApiParam(value = "容积(m3)") +// Double volume; +// @ApiParam(value = "需要(辆)") +// Integer carQty; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCSNErrorListRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCSNErrorListRepository.java new file mode 100644 index 0000000..8fe97a0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCSNErrorListRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCSNErrorList; +import org.springframework.stereotype.Repository; + +/** + * @Description : 质检单条码不良操作类 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-09-02 21:06 + * @Modify: + **/ +@Repository +public interface WmsQCSNErrorListRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index fd95d7f..ef66f02 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -16,16 +16,14 @@ import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipDto; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; -import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; +import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; /** * @Description : 仓库管理对象封装 @@ -262,12 +260,12 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getErpSrcNo(), "erpSrcNo", result); DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getContainerNo(), "containerNo", result); if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) { ArrayList numList = new ArrayList<>(); @@ -279,10 +277,10 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result); } - - // 查询计划时间在指定范围的单号，查询这些单号的数据 - if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) { + if (!CollectionUtils.isEmpty(wmsPOMaster.getOrderNoList())) { DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result); + } else { + DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); } //按创建时间查询单据信息