diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java index 0a90b00..a8731c8 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java @@ -159,13 +159,6 @@ public class Pager { } public int getEndRow() { - if(pageSize > 0){ - if(currentPage > 1){ - return currentPage * pageSize; - }else { - return pageSize; - } - } return endRow; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java index 91b8cd0..7488292 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiParam; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.Transient; import java.io.Serializable; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 8775387..9571391 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -1211,7 +1211,7 @@ public class AndonEnumUtil { QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"), PART("PART_ALARM", 110060104, "物料", "#24BDBA"), PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"), - CHECK("OTHER_ALARM", 110060108, "自处理", "#EAA510"), + CHECK("OTHER_ALARM", 110060108, "工装", "#EAA510"), FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F"); private String value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index dd4bd75..97c8733 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -918,4 +918,147 @@ public class BlockSoftSwitchEnumUtil { } + /** + * 脚本类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SCRIPT_TYPE { + MESSAGE_PROCESS(10, "报文处理","可用参数:transData,orginData"); + + private int value; + private String description; + private String scriptRule; + + private BS_SCRIPT_TYPE (int value, String description,String scriptRule) { + this.value = value; + this.description = description; + this.scriptRule = scriptRule; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + public String getScriptRule() { + return scriptRule; + } + + 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 BS_SCRIPT_TYPE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + + /** + * 脚本语言 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SCRIPT_LANGUAGE { +// SPEL(10, "Spring表达式语言(SpEL)"), + JAVASCRIPT(20, "JavaScript(JS)"); + + private int value; + private String description; + + private BS_SCRIPT_LANGUAGE (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 BS_SCRIPT_LANGUAGE valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + + /** + * 脚本执行方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BS_SCRIPT_EXECUTE_METHOD { + EXECUTE_SCRIPT(10, "执行脚本"), + EXECUTE_METHOD(20, "执行方法"), + EXECUTE_OBJECT_METHOD(30, "执行对象方法"); + + private int value; + private String description; + + private BS_SCRIPT_EXECUTE_METHOD (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 BS_SCRIPT_EXECUTE_METHOD valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + } + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 9162a1f..91912ab 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; +import java.sql.Timestamp; /** * @Description : @@ -1573,7 +1574,7 @@ public class CommonEnumUtil { BIG_DECIMAL(32, "BigDecimal", "大浮点型", "java.math.BigDecimal", BigDecimal.class, PROPERTY_CONTROL_TYPE.NUMBER, SQL_WHERE.EQUAL, "0.0"), BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class, PROPERTY_CONTROL_TYPE.RADIO, SQL_WHERE.EQUAL, null), BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class, PROPERTY_CONTROL_TYPE.TEXT, SQL_WHERE.EQUAL, null), - DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss"); + DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", Timestamp.class, PROPERTY_CONTROL_TYPE.DATE_TIME, SQL_WHERE.BETWEEN, null, "yyyy-MM-dd hh:mm:ss"); /** * 属性类型值 @@ -1911,6 +1912,19 @@ public class CommonEnumUtil { return null; } + public String getJDBCUrl(String database,String host,Integer port,String instanceName){ + if(this.getValue() == SOURCE_MARIA_DB.getValue()){ + return getJDBCUrlMySQL(database,host,port); + }else if(this.getValue() == SOURCE_ORACLE.getValue()){ + return getJDBCUrlOracle(database,host,port); + }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){ + return getJDBCUrlPostgreSQL(database,host,port); + }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){ + return getJDBCUrlSQLServer(database,host,port,instanceName); + } + return null; + } + public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ if(StringUtils.isNotBlank(databaseProductName)){ if(databaseProductName.indexOf(":mysql:") != -1){ @@ -1941,6 +1955,22 @@ public class CommonEnumUtil { private String getJDBCUrlSQLServer(String database,String host,Integer port){ return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true"; } + + private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){ + StringBuffer sb = new StringBuffer(); + sb.append("jdbc:sqlserver://").append(host); + // 实例 + if (StringUtils.isNotBlank(instanceName)) { + sb.append("\\").append(instanceName); + } + // 端口 + sb.append(":").append(port); + // 数据库 + sb.append(";database=").append(database); + // 自动重连 + sb.append(";autoReconnect=true"); + return sb.toString(); + } } /** 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 f4bba13..ba0b0c0 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 @@ -248,7 +248,8 @@ public class MesEnumUtil { PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"), CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"), OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"), - ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"); + ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序"), + NO_CHECK_SN(50, "NO_CHECK_SN", "不校验条码"); private int value; private String code; @@ -1966,7 +1967,8 @@ public class MesEnumUtil { SCATTER_PART_PROD_CFG(480, "scatterPartProdCfgExcelService", "散件零件生产配置"), MES_WORK_ORDER_PAINT_ZS(490, "planZSOrderExcelService", "生产工单-注塑"), MES_KP_DATA(500, "kpDataExcelService", "物料关键数据关系"), - BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"); + BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"), + BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入"); private int value; private String service; @@ -5165,7 +5167,8 @@ public class MesEnumUtil { BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"), BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"), BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"), - BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"); + BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"), + BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"); private String code; private String description; @@ -5563,14 +5566,15 @@ public class MesEnumUtil { /** - * 运算对象代码 + * 运算对象代码 Period capacity */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OPERATE_OBJECT_CODE { ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"), ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"), WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"), - EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)"); + EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)"), + PERIOD_CAPACITY("PERIOD_CAPACITY", "时段产能"); private String value; private String description; @@ -6786,4 +6790,144 @@ public class MesEnumUtil { return tmp; } } + + /** + * 工作中心 工位监控模式 10=工单作业，20=标准作业 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CENTER_MONITOR_TYPE { + + ORDER_WORK(10, "工单作业"), + STANDARD_WORK(20, "标准作业"); + + private int value; + private String description; + + WORK_CENTER_MONITOR_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 WORK_CELL_GRADE { + + COMMON(10, "普通工位"), + MONITOR(20, "监控工位"); + + private int value; + private String description; + + WORK_CELL_GRADE(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 SAMPLE_TYPE { + + NORMAL(10, "正常"), + FIRST_ARTICLE(20, "首件"), + MEDIUM_SIZED(30, "中件"), + LAST_PIECE(40, "末件"); + + private int value; + private String description; + + SAMPLE_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; + } + } } 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 38a7634..8040d62 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 @@ -13,6 +13,47 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * 注塑生产操作模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IPC_ACTION_TYPE { + HAND_WORK(10, "10", "手工录入模式"), + PLC_WORK(20, "20", "PLC监听模式"); + + private int value; + private String code; + private String description; + + IPC_ACTION_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** * 作业程序组件类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -2592,7 +2633,8 @@ public class MesPcnEnumUtil { FORM("form", "文本按钮"), SPEC_TEXT("spec_text", "工步弹框文本"), IMAGE_LIST("image_list", "图片列表"), - SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"); + SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"), + BACKGROUND_COLOR_TEXT("BACKGROUND_COLOR_TEXT", "背景色文字"); private String value; private String description; @@ -4023,7 +4065,8 @@ public class MesPcnEnumUtil { JUMP_PROCESS(10, "跳过工序"), JUMP_STEP(20, "跳过工步"), JUMP_STATE(30, "跳过状态点"), - ABNORMAL_DEDUCTION(40, "扣减异常"); + ABNORMAL_DEDUCTION(40, "扣减异常"), + REDO_STATION(50, "工位重做"); private int value; private String description; @@ -4564,4 +4607,43 @@ public class MesPcnEnumUtil { } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_PTL_IS_LIGHT { + + IS_PICK_LIGHT(10, "不需亮灯"); + + private int value; + private String description; + + MES_PTL_IS_LIGHT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PHOTO_EXTRACT_STATUS { + NEED_SYNC_DATA(10, "待同步数据"), + ALREADY_SYNC_DATA(20, "已同步数据"); + + private int value; + private String description; + + PHOTO_EXTRACT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + } + + } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 9c85618..1dda378 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -15,6 +15,37 @@ public class PtlPcnEnumUtil { * 状态机异常处理状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FINISH_PICK_SEND_FLAG { + SECTION(10, "10", "区段"), + AREA(10, "20", "区域"); + + private int value; + private String code; + private String description; + + FINISH_PICK_SEND_FLAG(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + /** + * 状态机异常处理状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS { TRUE(10, "已处理"), FALSE(20, "未处理"); 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 17ac869..e4c358a 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 @@ -300,6 +300,62 @@ public class WmsEnumUtil { } } + + /** + * 单据主表状态(ASN,PO,MOVE,QC,SO) + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PICKING_MASTER_ORDER_STATUS { + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "已生成"), + FAILED(30, "RECEIPT_FINISH", "生成失败"); + + private int value; + private String code; + private String description; + + PICKING_MASTER_ORDER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static 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; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } /** * 收货状态 */ @@ -8796,4 +8852,113 @@ public class WmsEnumUtil { return null; } } + + /** + * 循环规则 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CYCLE_RULE { + FIVE_SECONDs("0/5 * * * * ?", "FIVE_SECONDs", "五秒一次"), + TWENTY_SECONDS("0/20 * * * * ?", "TWENTY_SECONDS", "二十秒一次"), + EVERY_DAY("0 0 0 * * ?", "EVERY_DAY", "每天零点"), + EVERY_HOUR("0 0 * * * ?", "EVERY_HOUR", "每小时"); + + private String value; + private String code; + private String description; + + CYCLE_RULE(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + + /** + * BOM + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOM_PRODUCTING_LINE { + GJ(10, "PIPE", "管件"), + JF(20, "JF", "夹方"), + JH(30, "JH", "机焊"), + SH(40, "SH", "手焊"); + + private String code; + private String description; + int value; + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + BOM_PRODUCTING_LINE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + 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; + } + + public static BOM_PRODUCTING_LINE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java new file mode 100644 index 0000000..e26bbcd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPartPull.java @@ -0,0 +1,81 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/4/18 21:05 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_PART_PULL") +@Api("IF_物料拉动") +public class IfPartPull extends BaseBean implements Serializable { + + private static final long serialVersionUID = -2733956307324895596L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name = "PACKAGE_NO") + @ApiParam("包装编号") + private String packageNo; + + @Column(name = "PARENT_PART_NO") + @ApiParam("产品物料编码") + private String parentPartNo; + + @Column(name = "ITEM_PART_NO") + @ApiParam("子物料编码") + private String itemPartNo; + + @Column(name = "QTY") + @ApiParam("拉动数量") + private Double qty; + + @Column(name = "ORGANIZTION_CODE") + @ApiParam("工厂代码") + private String organizationCode; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus; + + @Column(name = "ERROR_MESSAGE") + @ApiParam("异常消息") + @Lob + private String errorMessage; + + @Column(name = "ACTION_CODE") + @ApiParam("动作代码") + private String actionCode; + + @Column(name = "IF_CODE") + @ApiParam("接口代码") + private String ifCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java new file mode 100644 index 0000000..7077a43 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardDisplay.java @@ -0,0 +1,48 @@ +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/8/1 5:55 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_BOARD_DISPLAY") +@Api("MES_看板跑马灯") +public class MesBoardDisplay extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1537754345697889680L; + + @Column(name = "BOARD_CODE") + @ApiParam("看板代码") + private String boardCode; + + @Column(name = "DISPLAY_CONTENT") + @ApiParam("显示内容") + private String displayContent; + + @Column(name = "IS_ROLL") + @ApiParam("是否滚动") + private Integer isRoll; + + @Column(name = "ROLL_SPEED") + @ApiParam("滚动速度") + private Integer rollSpeed; +} 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 842f52f..fec2dbd 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 @@ -56,6 +56,30 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable { @ApiParam("计划产量") private Integer planCapacity; + @Column(name = "MONTH_PLAN_CAPACITY") + @ApiParam("月计划产量") + private Integer monthPlanCapacity; + + @Column(name = "HOUR_CAPACITY") + @ApiParam("时段产能") + private Integer hourCapacity; + + @Column(name = "STOP_TIME") + @ApiParam("停机时间") + private Double stopTime; + + @Column(name = "ACTUAL_CAPACITY") + @ApiParam("今日产量") + private Integer actualCapacity; + + @Column(name = "PLAN_TAKT") + @ApiParam("计划节拍") + private Integer planTakt; + + @Column(name = "IS_MANUAL") + @ApiParam("是否手工展示") + private Integer isManual; + @Transient @ApiParam("班次名称") private String shiftName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index 700a5cb..dcf9033 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import java.io.Serializable; @@ -29,7 +30,9 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_BOM") +@Table(name = "MES_BOM", indexes = { + @Index(columnList = "PART_NO") +}) @Api("BOM清单") public class MesBom extends BaseBean implements Serializable { private static final long serialVersionUID = 6781011059554785782L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index 83396d1..92bcd86 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -39,14 +39,22 @@ public class MesCustomerPart extends BaseBean implements Serializable { private String partNo; @Column(name = "CUSTOMER_PART_NO") - @ApiParam("客户零件号") + @ApiParam("客户物料号") private String customerPartNo; @Column(name = "CUSTOMER_PART_NAME") - @ApiParam("客户零件描述") + @ApiParam("客户物料名称") private String customerPartName; + @Column(name = "CUSTOMER_PART_COLOR") + @ApiParam("客户物料颜色") + private String customerPartColor; + + @Column(name = "QTY") + @ApiParam("用量") + private Double qty; + @Column(name = "CUSTOMER_CFG_CODE") - @ApiParam("客戶配置代碼") + @ApiParam("客户配置代码") private String customerCfgCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index a4a2dca..c7cdeb4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -61,6 +61,10 @@ public class MesDefect extends BaseBean implements Serializable { private String defectLocation; @Transient + @ApiParam("颜色值") + private String colorValue; + + @Transient @ApiParam("缺陷类型子集") private List mesDefectList; public MesDefect() { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java new file mode 100644 index 0000000..ca6cde8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesHncAgvRunning.java @@ -0,0 +1,50 @@ +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; + +/** + * @author Wynne.Lu + * @date 2020/8/3 17:51 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_HNC_AGV_RUNNING") +@Api("延锋海纳川agv运行状态表") +public class MesHncAgvRunning extends BaseBean implements Serializable { + private static final long serialVersionUID = 4293079676019967513L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("产线") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + + @Column(name = "TIME_OUT") + @ApiParam("倒计时超时") + private Integer timeOut; + + @Column(name = "DELAY_HELP") + @ApiParam("延时帮助") + private Integer delayHelp; + + @Column(name = "EMERGENCY_STOP") + @ApiParam("紧急停止") + private Integer emergencyStop; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java index 34186bd..698ffde 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMouldPart.java @@ -38,4 +38,12 @@ public class MesMouldPart extends BaseBean implements Serializable { @Column(name = "MOULD_CODE") @ApiParam("模具代码") private String mouldCode; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty = 0d; + + @Column(name = "MOULD_TYPE") + @ApiParam("模具类型") + private String mouldType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index 0fedc5b..43454da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -108,6 +108,14 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("OEE") private Double oee; + @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,3)") + @ApiParam("OEE目标值") + private Double targetOee; + + @Column(name = "MIN_OEE", columnDefinition = "decimal(18,3)") + @ApiParam("OEE警戒值") + private Double minOee; + @Column(name = "BUSI_DATA") @ApiParam("自定义数据") private String busiData; 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 a46c53d..560dcd0 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 @@ -86,6 +86,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + @Column(name = "MEMO") @ApiParam("备注") private String memo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 817a07c..8d7c019 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -139,4 +139,8 @@ public class MesPart extends BaseBean implements Serializable { @Transient @ApiParam("分类名称") private String categoryName; + + @Transient + @ApiParam("拉动数量") + private Double pullQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 4e09969..d43d5af 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -10,10 +10,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; @@ -29,7 +26,10 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLC") +@Table(name = "MES_PLC", indexes = { + @Index(columnList = "PLC_CODE"), + @Index(columnList = "TAG_ADDRESS") +}) @Api("PLC配置表") public class MesPlc extends BaseBean implements Serializable { private static final long serialVersionUID = -7172265186837551268L; @@ -86,6 +86,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("PLC配置") private String plcCfg; + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + private String busiType; + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java index c4eae0c..e2e4915 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java @@ -47,4 +47,12 @@ public class MesProdWorkCenter extends BaseBean implements Serializable { @Column(name = "PART_SN") @ApiParam("料箱条码") private String partSn; + + @Column(name = "TARGET_PASS_RATE") + @ApiParam("目标合格率") + private Double targetPassRate; + + @Column(name = "PRIORITY_ORDER") + @ApiParam("优先级顺序") + private Integer priorityOder = 0; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java index 925d075..d2e184a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrder.java @@ -108,6 +108,10 @@ public class MesQcOrder extends BaseBean implements Serializable { @ApiParam("产线") private String workCenterCode; + @Column(name = "SAMPLE_TYPE") + @ApiParam("样本类型") + private Integer sampleType; + @ApiParam(value = "检测结果") @Transient private String reulstStatus; 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 47cd239..c0251f8 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 @@ -52,7 +52,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("排序号") - private String seq; + private Double seq; @Column(name = "STATUS") @ApiParam("状态") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java index 9f87ea7..3b1c38e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java @@ -45,4 +45,8 @@ public class MesTypeCfg extends BaseBean implements Serializable { @Column(name = "BUSINESS_TYPE_NAME") @ApiParam("业务类型名称") private String businessTypeName; + + @Column(name = "COLOR_VALUE") + @ApiParam("颜色值") + private String colorValue; } 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 f275899..d40bd16 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 @@ -66,6 +66,14 @@ public class MesWorkCell extends BaseBean implements Serializable { @ApiParam("工作单元端口") private String workCellPort; + @Column(name = "GRADE") + @ApiParam("工作等级") + private Integer grade; + + @Column(name = "TARGET_PASS_RATE") + @ApiParam("目标合格率") + private Double targetPassRate; + @Transient @ApiParam(value = "子集列表") private List childTreeList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java similarity index 85% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java index 025ae54..25ac166 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/template/MesWorkCellDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellDefect.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.mes.bean.template; +package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; @@ -47,6 +47,14 @@ public class MesWorkCellDefect extends BaseBean implements Serializable { @ApiParam("物料集") private String partAssemble; + @Column(name = "AREA_CODE") + @ApiParam("物料集") + private String areaCode; + + @Column(name = "DEFECT_TYPE") + @ApiParam("缺陷类型") + private String defectType; + @Transient @ApiParam("缺陷名称") private String defectCodeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index a80febf..fbc0606 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -71,6 +71,10 @@ public class MesWorkCenter extends BaseBean implements Serializable { @ApiParam("工位监控模式") private Integer monitorType; + @Column(name = "PLAN_TAKT") + @ApiParam("节拍") + private Integer planTakt; + @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 677525f..1e81a07 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 @@ -290,6 +290,14 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("客户集合") private List custList; + @Transient + @ApiParam("工位完成数量") + private Integer stationCompleteQty = 0; + + @Transient + @ApiParam("客户物料号") + private String customerPartNo; + 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/dbinterface/MesInterfaceEnumUtil.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java index 76123e8..b1355c7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/dbinterface/MesInterfaceEnumUtil.java @@ -9,7 +9,8 @@ public class MesInterfaceEnumUtil { SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), MES2WMS(30, "MES2WMS", "MES --> WMS"), - WMS2MES(40, "WMS2MES", "WMS --> MES"); + WMS2MES(40, "WMS2MES", "WMS --> MES"), + MES2SAP(50, "MES2SAP", "MES --> SAP"); private int value; private String name; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java index f1d76b0..c798811 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/engine/script/EngineScriptPersistence.java @@ -22,7 +22,7 @@ import javax.persistence.*; @DynamicUpdate @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@Table(name = "SCRIPT_PERSISTENCE", indexes = { +@Table(name = "MES_SCRIPT_PERSISTENCE", indexes = { @Index(columnList = "SCRIPT_NO"), @Index(columnList = "ORGANIZE_CODE") }) 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 80c332c..3ee75bc 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 @@ -22,7 +22,7 @@ import javax.persistence.*; @DynamicUpdate @NoArgsConstructor @EqualsAndHashCode(callSuper = true) -@Table(name = "SCRIPT_PERSISTENCE_HISTORY") +@Table(name = "MES_SCRIPT_PERSISTENCE_HISTORY") @Api("系统动态脚本") public class EngineScriptPersistenceHistory extends BaseBean { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java new file mode 100644 index 0000000..a0d3218 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java @@ -0,0 +1,106 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/28 2:37 下午 + * @Modify: + */ +@Data +public class BiModel { + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam(value = "物料号") + private String partNo; + + @ApiParam(value = "物料名称") + private String partName; + + @ApiParam(value = "计划数量") + private double planQty; + + @ApiParam(value = "合格数量") + private double passQty = 0; + + @ApiParam(value = "不良数量") + private double ngQty = 0; + + @ApiParam(value = "实际数量") + private double actualQty = 0; + + @ApiParam(value = "合格率") + private double passRate; + + @ApiParam(value = "不良率") + private double ngRate; + + @ApiParam(value = "警戒值") + private double sentinelValue; + + @ApiParam(value = "总数") + private double total; + + @ApiParam(value = "合格数") + private double qualifiedQty = 0; + + @ApiParam(value = "不合格数") + private double unQualifiedQty = 0; + + @ApiParam(value = "合格率") + private double qualifiedRate = 0; + + @ApiParam(value = "一次合格率") + private double onceQualifiedRate = 0; + + @ApiParam(value = "不合格率") + private double unQualifiedRate = 0; + + @ApiParam("目标合格率") + private double targetPassRate; + + @ApiParam("颜色标识") + private Integer colorFlag = 0; + + @ApiParam("首检") + private Integer firstCheck; + + @ApiParam("巡检") + private Integer onSiteCheck; + + @ApiParam("首件") + private Integer firstArticle; + + @ApiParam("中件") + private Integer mediumSized; + + @ApiParam("末件") + private Integer lastPiece; + + @ApiParam("末检") + private Integer endCheck;//首件、30中件、40末件 + + @ApiParam("x坐标内容") + private List xAxis; + + @ApiParam("一些携带值 eg:异常类型，异常次数") + private Map carryMap; + + @ApiParam("图表显示的数据") + private List series; + + @ApiParam("列名") + private Map colMap; +} 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 8076ead..72615c8 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 @@ -41,6 +41,28 @@ public class BoardModel { @ApiParam("当天停机时间(min)") private String theDayShutDownTime; + + @ApiParam("今日产量") + private Integer actualCapacity; + + @ApiParam("月计划产量") + private Integer monthPlanCapacity; + + @ApiParam("停机时间") + private double stopTime; + + @ApiParam("时段产能") + private Integer hourCapacity; + + @ApiParam("计划节拍") + private Integer planTakt = 0; + + @ApiParam("今日完成产量") + private Integer completeCapacity = 0; + + @ApiParam("时段产能") + private Integer periodCapacity = 0; + @ApiParam("看板时段计划产量") private List boardShiftSectionCapacityList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java index 3d121d7..843eb9c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewModel.java @@ -25,4 +25,16 @@ public class DataReviewModel { @ApiParam("对象代码") private String objectCode; + @ApiParam("是否合格标识") + private Integer reviewFlag; + + @ApiParam("是否合格") + private String reviewResult; + + @ApiParam("关键件颜色") + private String keyPartColor; + + @ApiParam("生产数据颜色") + private String prodDataColor; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java index 2b25ff8..d608e9c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java @@ -3,8 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Transient; - +import java.util.List; /** * @Description: * @Author: jokelin @@ -25,10 +24,15 @@ public class OperateObjectParamModel { @ApiParam("日期") private String oeeDate; + @ApiParam("开始日期") + private String startDatetime; + + @ApiParam("结束日期") + private String endDatetime; + @ApiParam("开始时段") private String startTime; - @Transient @ApiParam("结束时段") private String endTime; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java index 15c9efe..809a892 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java @@ -63,6 +63,12 @@ public class ProdPackModel implements Serializable { @ApiParam("是否封箱") public Integer isSealed; + @ApiParam("工作中心代码") + private String workCenterCode; + + @ApiParam("工作单元代码") + private String workCellCode; + public ProdPackModel() { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java index 81e32c2..d73253f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductInfoManageModel.java @@ -81,9 +81,15 @@ public class ProductInfoManageModel { @ApiParam("明细队列序列") private Double queDetailSeq; + @ApiParam("主队列编号") + private String orderNo; + @ApiParam("总队列类型") private List queueTypeList; + @ApiParam("总工单类型") + private List workTypeList; + public ProductInfoManageModel() { } @@ -94,4 +100,13 @@ public class ProductInfoManageModel { this.produceColor = produceColor; this.queDetailSeq = queDetailSeq; } + + public ProductInfoManageModel(String vinCode, String produceCategoryCode, String orderNo, Double queDetailSeq, Double queueSeq, String workType) { + this.vinCode = vinCode; + this.produceCategoryCode = produceCategoryCode; + this.orderNo = orderNo; + this.queDetailSeq = queDetailSeq; + this.queueSeq = queueSeq; + this.workType = workType; + } } 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 62c4058..e566905 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 @@ -180,6 +180,9 @@ public class StationRequestBean implements Serializable { @ApiParam("班次名称") private String shiftName; + @ApiParam("创建时间") + private String createDatetime; + @Override public String toString() { return "StationRequestBean{" + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java new file mode 100644 index 0000000..e29550d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueReviewModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class TorqueReviewModel { + + @ApiParam("工作单元代码") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("枪类型") + private String gunType; + + @ApiParam("检测结果") + private String checkResult; + + @ApiParam("显示颜色") + private String showColor; + +} 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 fb93d98..834aedf 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 @@ -62,4 +62,16 @@ public class ZzMesWorkOrderModel extends BaseBean { @AnnoOutputColumn(required = false) private Integer rows; + @ApiParam("模具类型") + @AnnoOutputColumn(required = false) + private String mouldType; + + @ApiParam("模具编号集合") + @AnnoOutputColumn(required = false) + private String mouldCodeList; + + @ApiParam("工作中心名称") + @AnnoOutputColumn(required = false) + private String workCenterName; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartPullRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartPullRepository.java new file mode 100644 index 0000000..ff20aaf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfPartPullRepository.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.IfPartPull; +import cn.estsh.i3plus.pojo.mes.bean.IfRawPartData; + +/** + * @Description : + * @Reference : + * @CreateDate : 2020-04-21 09:53 + * @Modify: + **/ +public interface IfPartPullRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardDisplayRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardDisplayRepository.java new file mode 100644 index 0000000..8f55d8c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardDisplayRepository.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.MesBoardDisplay; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/8/1 6:03 下午 + * @Modify: + */ +public interface MesBoardDisplayRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHncAgvRunningRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHncAgvRunningRepository.java new file mode 100644 index 0000000..f1d8b5a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesHncAgvRunningRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesHncAgvRunning; + +/** + * @author Wynne.Lu + * @date 2020/8/3 17:54 + * @desc + */ +public interface MesHncAgvRunningRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java index 43b09f2..6cf2246 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectRepository.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.template.MesWorkCellDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import org.springframework.stereotype.Repository; /** diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java index be056c0..ad54293 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellDefectsRepository.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.template.MesWorkCellDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import org.springframework.stereotype.Repository; /** * @Description: 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 cae893e..d0caed6 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 @@ -9,7 +9,7 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil; import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplate; import cn.estsh.i3plus.pojo.mes.bean.template.BasImportTemplateDetails; -import cn.estsh.i3plus.pojo.mes.bean.template.MesWorkCellDefect; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellDefect; import cn.estsh.i3plus.pojo.mes.dbinterface.MesInterfaceDataMapper; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; @@ -297,10 +297,10 @@ public class MesHqlPack { public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode); if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterCode())) { - DdlPreparedPack.getStringLikePack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean); } if (!StringUtils.isEmpty(mesWorkCenter.getWorkCenterName())) { - DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean); + DdlPreparedPack.getStringLikerPack(mesWorkCenter.getWorkCenterName(), "workCenterName", packBean); } if (!StringUtils.isEmpty(mesWorkCenter.getAreaCode())) { DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java index 02084bb..974c7e4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.mes; import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -141,8 +142,15 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("防错码") private String pokeYokeFix; + @ApiParam("防错码长度") + private String pokeYokeLength; + private Map psets = new LinkedHashMap<>(); + public TorqueCollectionModel(String vinCode) { + this.vinCode = vinCode; + } + /** * 大枪查询结果构造方法 * @@ -162,7 +170,7 @@ public class TorqueCollectionModel implements Serializable { public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq, Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount, - String pokeYokeFix) { + String pokeYokeFix, String pokeYokeLength) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -178,6 +186,7 @@ public class TorqueCollectionModel implements Serializable { this.isPf = isPf; this.qualifiedCount = qualifiedCount; this.pokeYokeFix = pokeYokeFix; + this.pokeYokeLength = pokeYokeLength; } /** @@ -202,7 +211,7 @@ public class TorqueCollectionModel implements Serializable { public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer pset1, Integer pset2, Integer pset3, Integer pset4, Integer pset5, Integer pset6, Integer pset7, Integer pset8, - Integer torqueNo, Integer sendSeq, Integer checkScanCount, String pokeYokeFix) { + Integer torqueNo, Integer sendSeq, Integer checkScanCount, String pokeYokeFix, String pokeYokeLength) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -221,6 +230,7 @@ public class TorqueCollectionModel implements Serializable { this.sendSeq = sendSeq; this.checkScanCount = checkScanCount; this.pokeYokeFix = pokeYokeFix; + this.pokeYokeLength = pokeYokeLength; assemblePsets(); } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index eac5415..4c82b54 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -105,6 +105,8 @@ public class SuitClientModel implements Serializable { @XStreamCDATA private Object suitResultMessage; + private boolean isNeedRetry = false; + public SuitClientModel() { } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java index c0bf451..1a9fb95 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java @@ -36,4 +36,6 @@ public abstract class BaseComponetsParam implements Serializable { @ApiParam(value = "工厂代码") public String organizeCode; + + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index f371330..9c33dde 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -52,4 +52,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable { @ApiParam(value = "新条码") public WmsStockSn NewWmsStockSn; + + @ApiParam(value = "拆分条码") + public Integer splitSn; } 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 33bed63..6ef6c90 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 @@ -119,6 +119,12 @@ public class WmsActionResponseBean implements Serializable { @ApiParam(value = "工厂代码") private String organizeCode; + @ApiParam(value = "提交模式") + private Integer commitMode; + + @ApiParam(value = "是否允许重置") + private Integer isResetAble; + public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java index 3eb65ad..a78f43f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsFieldInfoModel.java @@ -30,8 +30,7 @@ public class WmsFieldInfoModel implements Serializable { @ApiParam("处理类型") private int handleType; - public WmsFieldInfoModel (String baseRepository, int handleType, List wmsFieldInfoList) { - this.baseRepository = baseRepository; + public WmsFieldInfoModel ( int handleType, List wmsFieldInfoList) { this.wmsFieldInfoList = wmsFieldInfoList; this.handleType = handleType; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 225cfd7..e00e6e9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -345,8 +345,8 @@ public class CoreHqlPack { public static DdlPackBean packDdlSysRoleCheckOnly(SysRole role) { DdlPackBean result = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumNOEqualPack(role.getId(), "id", result); DdlPreparedPack.getStringEqualPack(role.getName(), "name", result); - DdlPreparedPack.getNumEqualPack(role.getId(), "id", result); return result; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java index 6733022..3c88059 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java @@ -86,6 +86,10 @@ public class PtlMainTask extends BaseBean implements Serializable { @ApiParam("区域代码") private String areaNo; + @Column(name = "SECTION_NO") + @ApiParam("区段代码") + private String sectionNo; + @Column(name = "TASK_TYPE") @ApiParam("任务类型") private String taskType; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsBusiScript.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsBusiScript.java new file mode 100644 index 0000000..3168c77 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsBusiScript.java @@ -0,0 +1,107 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.math.NumberUtils; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 业务脚本 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-07-28 14:35 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_BUSI_SCRIPT") +@ApiModel(value = "业务脚本", description = "业务脚本") +public class BsBusiScript extends BaseBean { + + private static final long serialVersionUID = 1419277265159912600L; + + @Column(name = "SCRIPT_NAME") + @ApiModelProperty(value = "脚本名称") + private String scriptName; + + @Column(name = "SCRIPT_CODE") + @ApiModelProperty(value = "脚本代码") + private String scriptCode; + + @Column(name = "SCRIPT_TYPE") + @ApiModelProperty(value = "脚本类型") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_TYPE.class) + private Integer scriptType; + + public String getScriptTypeTxt() { + return scriptType == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_TYPE.valueOfDescription(scriptType); + } + + @Column(name = "SCRIPT_LANGUAGE") + @ApiModelProperty(value = "脚本语言") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_LANGUAGE.class) + private Integer scriptLanguage; + + public String getScriptLanguageTxt() { + return scriptLanguage == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_LANGUAGE.valueOfDescription(scriptLanguage); + } + + @Column(name = "SCRIPT_EXECUTE_METHOD") + @ApiModelProperty(value = "脚本执行方式") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_SCRIPT_EXECUTE_METHOD.class) + private Integer scriptExecuteMethod; + + public String getScriptExecuteMethodTxt() { + return scriptExecuteMethod == null ? "无" : BlockSoftSwitchEnumUtil.BS_SCRIPT_EXECUTE_METHOD.valueOfDescription(scriptExecuteMethod); + } + + @Column(name = "SCRIPT_OBJ_NAME") + @ApiModelProperty(value = "脚本对象名称") + private String scriptObjName; + + @Column(name = "SCRIPT_METHOD_NAME") + @ApiModelProperty(value = "脚本方法名称") + private String scriptMethodName; + + @Column(name = "SCRIPT_CONTENT") + @ApiModelProperty(value = "脚本内容") + private String scriptContent; + + @Column(name = "SCRIPT_DESC") + @ApiModelProperty(value = "脚本描述") + private String scriptDesc; + + @Column(name = "REF_ID") + @ApiModelProperty(value = "关联id") + @JsonSerialize(using = ToStringSerializer.class) + private Long refId; + + @Column(name = "SCRIPT_VERSION") + @ApiModelProperty(value = "脚本版本") + private Integer scriptVersion; + + public int getScriptVersion(){ + return scriptVersion == null ? NumberUtils.INTEGER_ONE : scriptVersion; + } + + public BsBusiScript nextVersion() { + setScriptVersion(getScriptVersion() + 1); + return this; + } + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java index 2f04bc8..e3ddc94 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java @@ -52,6 +52,10 @@ public class BsDataSource extends BaseBean { @ApiParam(value = "数据源端口") private Integer dataSourcePort; + @Column(name = "DATA_SOURCE_INSTANCE_NAME") + @ApiParam(value = "数据源实例名称") + private String dataSourceInstanceName; + @Column(name = "DATA_SOURCE_USER") @ApiParam(value = "用户名") private String dataSourceUser; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java index 4f87d41..ed054c8 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsLongData.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,6 +36,7 @@ public class BsLongData extends BaseBean { private static final long serialVersionUID = -329128754646765129L; @Column(name = "REF_ID") @ApiParam(value = "关联id") + @JsonSerialize(using = ToStringSerializer.class) private Long refId; @Column(name = "REF_DATA_TYPE") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index a515e18..200ba31 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -40,6 +41,7 @@ public class BsSuitCase extends BaseBean { @Column(name = "CASE_TYPE_ID") @ApiParam(value = "套件类型id(枚举)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class) private Integer caseTypeId; public int getCaseTypeIdVal(){ @@ -76,6 +78,7 @@ public class BsSuitCase extends BaseBean { @Column(name = "SUIT_MODE_ID") @ApiParam(value = "适配模式(枚举,主动，被动)") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_MODE.class) private Integer suitModeId; @Column(name = "SUIT_ACTION_ID") @@ -230,6 +233,10 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "适配器状态") private Integer suitCaseStatus; + @Column(name = "BIND_BUSI_SCRIPT_CODE") + @ApiParam(value = "绑定业务脚本Code") + private String bindBusiScriptCode; + @Transient @ApiParam(value = "适配器套件明细") private Object bsSuitCaseDetail; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 957bd5e..d67c241 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -133,6 +133,10 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "处理时间") private String processTime; + @Column(name = "SCRIPT_RESULT") + @ApiParam(value = "脚本结果") + private String scriptResult; + @Transient @ApiParam(value = "适配记录参数") private List bsSuitRecordParamList; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java index 81ae451..6ba934f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.List; /** * @Description : 请求适配记录 @@ -46,10 +47,12 @@ public class BsSuitRequestRecord extends BaseBean { private Integer requestSource; // 移动至记录数据表 - @Lob @Column(name = "REQUEST_ORGIN_PARAM") @ApiParam(value = "请求原始参数") private String requestOrginParam; + @Transient + @ApiParam(value = "id-查询条件") + private List searchIdList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java new file mode 100644 index 0000000..99401ba --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsBusiScriptRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsBusiScript; + +/** + * @Description : 业务脚本 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-07-28 15:13 + * @Modify: + **/ +public interface BsBusiScriptRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 28aa126..cfa357f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -261,7 +261,7 @@ public class SoftSwitchHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); return ddlPackBean; } @@ -323,6 +323,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitRecord.getScriptResult(),"scriptResult",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); @@ -367,6 +368,7 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlBsSuitRequestRecord(BsSuitRequestRecord bsSuitRequestRecord){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsSuitRequestRecord); + DdlPreparedPack.getInPackList(bsSuitRequestRecord.getSearchIdList(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRequestRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitRequestRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); @@ -416,7 +418,16 @@ public class SoftSwitchHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsLongData); DdlPreparedPack.timeBuilder(bsLongData.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); DdlPreparedPack.getNumEqualPack(bsLongData.getRefDataType(),"refDataType",ddlPackBean); - DdlPreparedPack.getStringLikePack(bsLongData.getData(),"data",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsLongData.getData(),"data",ddlPackBean); + return ddlPackBean; + } + + public static DdlPackBean packHqlBsBusiScript(BsBusiScript bsBusiScript){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bsBusiScript); + DdlPreparedPack.getStringLikerPack(bsBusiScript.getScriptName(),"scriptName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsBusiScript.getScriptCode(),"scriptCode",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsBusiScript.getScriptType(),"scriptType",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsBusiScript.getRefId(),"refId",ddlPackBean); return ddlPackBean; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java index b816bfe..835facc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapDocFgSum.java @@ -114,6 +114,10 @@ public class SapDocFgSum extends BaseBean { @ApiParam(value = "备注") private String errorMsg; + @Transient + @ApiParam(value = "生产线") + private String lineNo; + @JsonSerialize(using = ToStringSerializer.class) @Transient public Long wdfdId; @@ -159,6 +163,32 @@ public class SapDocFgSum extends BaseBean { this.seqNo = seqNo; this.itemSeqNo = itemSeqNo; } + + public SapDocFgSum(Long wdfdId, Double qty, String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, + String itemPartNo, String itemPartName, String itemUnit, Double itemQty, String outAreaNo, String src, Integer isLock, + String effStartTime, String bomVersion, String fGOrderNo, String seqNo, String itemSeqNo, String lineNo) { + this.wdfdId = wdfdId; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.qty = qty; + this.unit = unit; + this.erpWorkCenter = erpWorkCenter; + this.inAreaNo = inAreaNo; + this.itemPartNo = itemPartNo; + this.itemPartName = itemPartName; + this.itemUnit = itemUnit; + this.outAreaNo = outAreaNo; + this.itemQty = itemQty; + this.src = src; + this.isLock = isLock; + this.effStartTime = effStartTime; + this.bomVersion = bomVersion; + this.fGOrderNo = fGOrderNo; + this.seqNo = seqNo; + this.itemSeqNo = itemSeqNo; + this.lineNo = lineNo; + } + public SapDocFgSum(Long wdfdId, Double qty,String partNo, String partNameRdd, String unit, String erpWorkCenter, String inAreaNo, String itemPartNo, String itemPartName, String itemUnit, Double itemQty,String outAreaNo, String src, Integer isLock, String effStartTime) { this.wdfdId = wdfdId; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionCallResult.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionCallResult.java new file mode 100644 index 0000000..aef56f0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionCallResult.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import lombok.Data; + +/** + * @Description : 调用流程处理组件时的返回对象 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-08-03 20:54 + * @Modify: + **/ +@Data +public class WmsActionCallResult { + private Object resultObj; + /** + * 执行耗时，单位 ms + */ + private Integer duration; + + public WmsActionCallResult(Object resultObj, Integer duration) { + this.resultObj = resultObj; + this.duration = duration; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index f42fc1e..889b2b3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -81,6 +81,12 @@ public class WmsActionGroup extends BaseBean { @AnnoOutputColumn private Integer isAutoCommit; + // 1=true, 2 = false + @Column(name = "IS_RESET_ABLE", columnDefinition = "int default 1", nullable = false) + @ApiParam(value = "是否允许重置") + @AnnoOutputColumn + private Integer isResetAble; + @Lob @Column(name = "POSITION", columnDefinition = "TEXT") @ApiParam(value = "GOJS位置") @@ -114,7 +120,11 @@ public class WmsActionGroup extends BaseBean { return this.autoInit == null ? 0 : this.autoInit.intValue(); } - public int geSubmitStepSeqVal() { + public int getSubmitStepSeqVal() { return this.submitStepSeq == null ? 0 : this.submitStepSeq.intValue(); } + + public int getIsResetAbleVal() { + return this.isResetAble == null ? 0 : this.isResetAble.intValue(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java index 4b8e558..ea59343 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java @@ -124,6 +124,10 @@ public class WmsActionLog extends BaseBean { @ApiParam(value = "结束组件编号", example = "0") public Long endAmId; + @Column(name = "DURATION") + @ApiParam(value = "执行耗时，单位：毫秒", example = "0") + public Integer duration = 0; + public Long getInitAmId() { if (initAmId != null) { return initAmId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java index b96ae52..1ca730c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.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.Lob; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description :作业记录参数表 @@ -33,14 +30,41 @@ import javax.persistence.Table; public class WmsActionLogData extends BaseBean { private static final long serialVersionUID = -8150713013135101134L; - @Column(name = "ALD_ID") - @ApiParam(value = "记录明细编号") + + @Column(name = "TASK_NO") + @ApiParam(value = "作业任务编号", example = "1") + @JsonSerialize(using = ToStringSerializer.class) + public String taskNo; + + @Column(name = "TRANS_TYPE_CODE") + @ApiParam(value = "交易类型编号") + public String transTypeCode; + + @Transient + @Column(name = "MOVE_NO") + @ApiParam(value = "移动单单号") + public String moveNo; + + @Column(name = "AG_ID") + @ApiParam(value = "作业流程编号", example = "1") @JsonSerialize(using = ToStringSerializer.class) - private Long aldId; + public Long agId; + + @Column(name = "AL_NAME_RDD") + @ApiParam(value = "流程名称") + public String agNameRdd; - @Column(name = "ALD_SEQ") - @ApiParam(value = "步骤序号") - private Integer aldSeq; + @Column(name = "ACTION_USER_NAME") + @ApiParam(value = "作业人员") + public String actionUserName; + + @Column(name = "FIX_NO") + @ApiParam(value = "设备编号") + public String fixNo; + + @Column(name = "AGD_SEQ") + @ApiParam(value = "作业步骤序号") + private Integer agdSeq; @Column(name = "CALL_CLASS") @ApiParam(value = "实现类") @@ -54,21 +78,17 @@ public class WmsActionLogData extends BaseBean { @ApiParam(value = "执行状态") private Integer executeStatus; - @Column(name = "START_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="开始执行时间",example = "2000-01-01 01:00:00") - private String startTime; - - @Column(name = "END_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00") - private String endTime; - + /** + * 保存调用组件时的 params + */ @Lob @Column(name = "IN_PARAMS", columnDefinition = "TEXT") @ApiParam(value = "输入参数") private String inParams; + /** + * 保存调用组件后的返回值 + */ @Lob @Column(name = "OUT_PARAMS", columnDefinition = "TEXT") @ApiParam(value = "输出参数") @@ -78,4 +98,8 @@ public class WmsActionLogData extends BaseBean { @Column(name = "ERROR_MSG", columnDefinition = "TEXT") @ApiParam(value = "异常信息") private String errorMsg; + + @Column(name = "DURATION") + @ApiParam(value = "执行耗时，单位：毫秒", example = "0") + public Integer duration = 0; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index facb1fc..a4d878e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -116,6 +116,11 @@ public class WmsActionLogDetails extends BaseBean { @Column(name="MOVE_NO") @ApiParam(value = "移动单单号") public String moveNo; + + @Column(name = "DURATION") + @ApiParam(value = "执行耗时，单位：毫秒", example = "0") + public Integer duration = 0; + public Long getAsId() { if (asId != null) { return asId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index f6e866e..67ddf69 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -80,7 +80,6 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("条码") public String sn; - /** * 质检状态:1=未质检,10=质检中,20=质检合格, * 30=质检不合格,40=已退货 @@ -117,6 +116,10 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam(value = "供应商编码") public String vendorNo; + @Column(name = "LOT_NO", nullable = false) + @ApiParam("收货批次") + public String lotNo = ""; + @Transient @ApiParam(value = "实盘数量", example = "1") @AnnoOutputColumn(hidden = true) @@ -225,4 +228,9 @@ public class WmsCSOrderDetails extends BaseBean { this.factQty=factQty; this.locateNo=locateNo; } + + public WmsCSOrderDetails(String partNo,String partNameRdd) { + this.partNo=partNo; + this.partNameRdd = partNameRdd; + } } 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 7bea734..3a6c6f6 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 @@ -6,6 +6,7 @@ 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; @@ -47,6 +48,10 @@ public class WmsCSRange extends BaseBean { @ApiParam("物料名称") public String partNameRdd; + @Column(name = "WH_NO") + @ApiParam("仓库代码") + public String whNo; + @Column(name = "ZONE_NO") @ApiParam("存储区编号") public String zoneNo; @@ -64,6 +69,15 @@ public class WmsCSRange extends BaseBean { @ApiParam("原单号") public String srcOrderNo; + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "库存数量", example = "0") + public Double qty; + + @Column(name = "LOT_NO", nullable = false) + @ApiParam("收货批次") + public String lotNo = ""; + @Transient @ApiParam("存储区编号组") @AnnoOutputColumn(hidden = true) 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 74c110f..85cb2b8 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 @@ -179,6 +179,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("目的库存地代码") public String destAreaNo; + + @Column(name = "DEST_XB_ZONE_NO") + @ApiParam("目的线边存储区代码") + public String destXBZoneNo; + @Column(name = "LOT_NO") @ApiParam("批次") public String lotNo; @@ -231,6 +236,7 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "父位置号") private String seqNo; + @Transient @ApiParam(value = "客户编号") private String custNo; @@ -385,7 +391,7 @@ public class WmsDocMovementDetails extends BaseBean { public String refSrc; @Transient - @ApiParam("工作中心代码") + @ApiParam("产线代码") private String workCenterCode; 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 f20b634..07812e0 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 @@ -46,7 +46,7 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "ORDER_NO") @ApiParam(value = "移库单单号") private String orderNo; - /** + /**e * 移动类型:IN=入库,OUT=出库,MOVE=移库 */ @Column(name = "MOVE_TYPE") @@ -231,6 +231,15 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "备注1") private String remake; + + /** + * 10=未生成，20=生成成功，30=生成失败 + */ + @Column(name = "PICKING_ORDER_STATUS", columnDefinition = "int default 10") + @ApiParam(value = "领料单生成状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + public Integer pickingOrderStatus; + @Column(name = "SECONDARY_REMAKE") @ApiParam(value = "备注2") private String secondaryRemake; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java index 32ce767..aa4f0e2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -72,4 +72,8 @@ public class WmsDocSoDetails extends BaseBean { @Transient @ApiParam(value = "客户编号") private String custCode; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户物料编码") + public String custPartNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java index 863ea9c..89fb7e6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java @@ -64,5 +64,9 @@ public class WmsDocSoMaster extends BaseBean { @ApiParam(value = "客户发往地名称") private String flagName; + @Column(name = "PLAN_DELIVERY_DATE") + @ApiParam(value = "交期") + private String planDeliveryDate; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java new file mode 100644 index 0000000..ba7a2b7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsEnum.java @@ -0,0 +1,58 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 数据字典-枚举 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-07-30 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_ENUM") +@Api("数据字典-枚举") +public class WmsEnum extends BaseBean { + private static final long serialVersionUID = -6422649826279645604L; + + @Column(name = "ENUM_TYPE") + @ApiParam(value = "枚举类型") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String enumType; + + @Column(name = "ENUM_TYPE_DESC") + @ApiParam(value = "枚举类型描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String enumTypeDesc; + + @Column(name = "ENUM_VALUE_SEQ") + @ApiParam(value = "枚举值序号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER) + private Integer enumValueSeq; + + @Column(name = "ENUM_VALUE") + @ApiParam(value = "枚举值") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String enumValue; + + @Column(name = "ENUM_VALUE_DESC") + @ApiParam(value = "枚举值描述") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String enumValueDesc; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 1bd27d4..aa46876 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -163,6 +163,10 @@ public class WmsMoveMaster extends BaseBean { private String snapshotTime; @Transient + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Transient private Integer isSnapshot; @Transient 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 902425b..c1b1a4d 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 @@ -179,6 +179,10 @@ public class WmsPOMaster extends BaseBean { @Column(name = "ERP_SRC_NO") private String erpSrcNo; + @Column(name = "DEPART_NAME") + @ApiParam(value = "部门名称", example = "1") + public Integer departName; + public WmsPOMaster() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java index 71b81f7..87c12d1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java @@ -33,9 +33,9 @@ public class WmsSapOrderLock extends BaseBean { @ApiParam("订单号") public String orderNo; - @Column(name = "BUSI_TYPE") + @Column(name = "ORDER_TYPE") @ApiParam("业务类型") - public String busiType; + public String orderType; @Column(name = "ITEM") @ApiParam("行号") @@ -49,4 +49,18 @@ public class WmsSapOrderLock extends BaseBean { @ApiParam("同步标识") public Integer isSync = 2; + @Column(name = "BUSI_TYPE_CODE") + @ApiParam(value = "类型编号") + private Integer busiTypeCode; + + @Column(name = "TRANS_TYPE_CODE") + @ApiParam(value = "交易类型代码") + private String transTypeCode; + + @Column(name = "ERP_ORDER_NO") + @ApiParam("源单号") + public String erpOrderNo; + + + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsDocMovementMasterDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsDocMovementMasterDto.java new file mode 100644 index 0000000..7416abb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsDocMovementMasterDto.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description :单据 + * @Reference : + * @Author :puxiao.liao + * @CreateDate : 2020-07-21 2:37 下午 + * @Modify: + **/ +@Data +@Api("单据") +public class WmsDocMovementMasterDto implements Serializable { + + private static final long serialVersionUID = -1388177116144308137L; + + @ApiParam("工厂编号") + private String organizeCode; + + @ApiParam("单据明细") + private List wmsDocMovementDetailsList; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsEnumRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsEnumRepository.java new file mode 100644 index 0000000..06e360b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsEnumRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsEnum; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsEnumRepository 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 cbddf7b..98a1d3f 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 @@ -2614,7 +2614,7 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsActionLogByActionLogData(WmsActionLogData actionLogData) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getNumEqualPack(actionLogData.getAldId(), "aldId", packBean); + //DdlPreparedPack.getNumEqualPack(actionLogData.getAldId(), "aldId", packBean); DdlPreparedPack.getStringEqualPack(actionLogData.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getNumEqualPack(actionLogData.getIsValid(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(actionLogData.getIsDeleted(), "isDeleted", packBean); @@ -2985,7 +2985,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result); - DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "dataSrc", result); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result); getStringBuilderPack(wmsFieldInfo, result); return result; }