diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..a933723 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -12,6 +12,7 @@ i3plus-pojo-base jar + 1.0-DEV-SNAPSHOT diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java index 2dc425c..83c5994 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseResultBean.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import io.swagger.annotations.ApiParam; -import lombok.Data; import java.util.List; import java.util.Map; @@ -124,6 +123,23 @@ public class BaseResultBean { return this; } + public static BaseResultBean success(String msg){ + BaseResultBean rs = new BaseResultBean(true); + rs.setMsg(msg); + return rs; + } + + public static BaseResultBean success(){ + BaseResultBean rs = new BaseResultBean(true); + return rs; + } + + public static BaseResultBean fail(String msg){ + BaseResultBean rs = new BaseResultBean(false,msg); + rs.setErrorMsg(msg); + return rs; + } + public static BaseResultBean buildBaseResultBean(boolean success, String msg){ BaseResultBean rs = new BaseResultBean(); rs.success = success; @@ -138,6 +154,33 @@ public class BaseResultBean { return rs; } + public BaseResultBean() { + } + + public BaseResultBean(boolean isSuccess) { + success = isSuccess; + if(success){ + //国际化 + code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); + }else{ + code = ResourceEnumUtil.MESSAGE.FAIL.getCode(); + } + } + + public BaseResultBean(boolean success, List resultList) { + this.success = success; + this.resultList = resultList; + } + + public BaseResultBean(boolean success, Obj resultObject) { + this.success = success; + if(resultObject instanceof String){ + this.msg = resultObject.toString(); + }else{ + this.resultObject = resultObject; + } + } + @Override public String toString() { return "BaseResultBean{" + 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 7973e88..7dfb083 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 @@ -847,7 +847,8 @@ public class CommonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CLOUD_APP_STATUS { UP(1,"UP" ,"在线"), - DOWN(2, "DOWN","断线"); + DOWN(2, "DOWN","断线"), + RESTRICTED(3,"RESTRICTED" ,"受限"); private int value; private String code; @@ -1961,4 +1962,172 @@ public class CommonEnumUtil { return tmp; } } + + /** + * actuator env + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTUATOR_ENV_PATH { + PID(1,"PID" ,"PID"), + JAVA_VERSION(2, "java.version","jdk版本"); + + private int value; + private String path; + private String description; + + private ACTUATOR_ENV_PATH(int value, String path, String description) { + this.value = value; + this.path = path; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getPath() { + return path; + } + + public String getDescription() { + return description; + } + + public static String valueOfPath(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].path; + } + } + return tmp; + } + + public static int pathOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].path.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String pathOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].path.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * actuator env + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTUATOR_METRICS_INFO { + UPTIME(1, "/process.uptime", "上线时间"), + PROCESS_CPU_USAGE(1, "/process.cpu.usage", "进程CPU使用率"), + CPU_COUNT(1, "/system.cpu.count", "CPU数量"), + SYSTEM_CPU_USAGE(1, "/system.cpu.usage", "系统CPU使用率"), + GC_PAUSE(1, "/jvm.gc.pause", "GC暂停"), + THREADS_LIVE(1, "/jvm.threads.live", "实时线程"), + THREADS_PEAK(1, "/jvm.threads.peak", "线程峰值"), + THREADS_DAEMON(1, "/jvm.threads.daemon", "守护线程"), + + MEMORY_HEAP_MAX(1, "/jvm.memory.max", "area:heap", "堆内存最大空间"), + MEMORY_HEAP_USE(1, "/jvm.memory.used", "area:heap", "堆内存使用量"), + MEMORY_HEAP_SIZE(1, "/jvm.memory.committed", "area:heap", "堆内存大小"), + + MEMORY_NON_HEAP_MAX(1, "/jvm.memory.max", "area:nonheap", "非堆内存最大空间"), + MEMORY_NON_HEAP_USE(1, "/jvm.memory.used", "area:nonheap", "非堆内存"), + MEMORY_NON_HEAP_METASPACE(1, "/jvm.memory.used", "area:nonheap,id:Metaspace", "非堆原空间"), + MEMORY_NON_HEAP_SIZE(1, "/jvm.memory.committed", "area:nonheap", "非堆大小"); + + private int value; + private String path; + private String tag; + private String description; + + private ACTUATOR_METRICS_INFO(int value, String path, String description) { + this.value = value; + this.path = path; + this.description = description; + } + + private ACTUATOR_METRICS_INFO(int value, String path, String tag, String description) { + this.value = value; + this.path = path; + this.tag = tag; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getPath() { + return path; + } + public String getTag() { + return tag; + } + + public String getDescription() { + return description; + } + + public static String valueOfPath(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].path; + } + } + return tmp; + } + + public static int pathOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].path.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String pathOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].path.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } 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 ffa26ae..f7e1f81 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 @@ -1804,8 +1804,7 @@ public class MesEnumUtil { MES_PROCESS(400, "工序信息"), MES_KPSN_RULE(410, "关键件条码校验规则"), MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列"), - MES_PART_BOM_IMPORT(430, "散件BOM导入"), - MES_PART_FORMULA_IMPORT(440, "产品配方导入"); + MES_PART_BOM_IMPORT(430, "散件BOM导入"); private int value; private String description; @@ -4891,4 +4890,74 @@ public class MesEnumUtil { } } + /** + * 作业校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CHECK_MODEL { + NO_CHECK(10, "不校验"), + CHECK(20, "校验设备就绪信号"); + + private int value; + private String description; + + CHECK_MODEL(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; + } + } + + /** + * PLC类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_TYPE { + STANDARD(10, "标准"), + EQU_OPERATION_SIGNLE(20, "设备作业信号"); + + private int value; + private String description; + + PLC_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; + } + } + } 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 178f794..23b4120 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 @@ -2460,6 +2460,7 @@ public class MesPcnEnumUtil { public enum STATION_BUSI_TYPE { MESSAGE("message", "返回信息"), STEP_LIST("stepList", "工步列表"), + STATE_LIST("stateList", "状态列表"), STEP_CONTENT("stepContent", "工步内容"), MODULE_CONTENT("moduleContent", "组件内容"), CUSTOM_COMPONENT("customComponent", "定制内容"), @@ -3495,4 +3496,37 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 组件状态类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATUS_TYPE { + START(10, "START", "开始状态"), + EXECUTING(20, "EXECUTING", "执行中状态"), + TERMINATE(30, "TERMINATE", "中断状态"), + FINISH(40, "FINISH", "完成状态"); + + private int value; + private String code; + private String description; + + STATUS_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; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 4bf2e60..2c5fcb1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -11,6 +11,98 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class PtlEnumUtil { /** + * 流程状态-触发类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRIGGER_TYPE { + INNER_TRIGGER(10, "内部触发"), + OUTER_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + TRIGGER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 触发事件 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUNT_STATUS_TRIGGER_EVENT { + SUCCESS("SUCCESS", "是"), + FAILURE("FAILURE", "否"); + + private String value; + private String description; + + ROUNT_STATUS_TRIGGER_EVENT(String value, String description) { + this.value = value; + this.description = description; + } + + public static ROUNT_STATUS_TRIGGER_EVENT getByValue(String value) { + for (ROUNT_STATUS_TRIGGER_EVENT triggerEvent : values()) { + if (triggerEvent.getValue().equals(value)) { + return triggerEvent; + } + } + return null; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 组件状态类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATUS_TYPE { + START(10, "START", "开始状态"), + EXECUTING(20, "EXECUTING", "执行中状态"), + TERMINATE(30, "TERMINATE", "中断状态"), + FINISH(40, "FINISH", "完成状态"); + + private int value; + private String code; + private String description; + + STATUS_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; + } + } + + /** * 作业流程类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -46,21 +138,30 @@ public class PtlEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ROUTE_EVENT { - TRIGGER(10, "trigger", "触发"), - ENTRY(20, "entry", "进入状态"), - EXIT(30, "exit", "离开状态"); + TRIGGER("10", "trigger", "触发"), + ENTRY("20", "entry", "进入状态"), + EXIT("30", "exit", "离开状态"); - private int value; + private String value; private String code; private String description; - ROUTE_EVENT(int value, String code, String description) { + ROUTE_EVENT(String value, String code, String description) { this.value = value; this.code = code; this.description = description; } - public int getValue() { + public static ROUTE_EVENT getByValue(String value) { + for (ROUTE_EVENT routeEvent : values()) { + if (routeEvent.getValue().equals(value)) { + return routeEvent; + } + } + return null; + } + + public String 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 cab76d0..43cd127 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 @@ -554,21 +554,21 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ROUTE_EVENT { - TRIGGER(10, "trigger", "触发"), - ENTRY(20, "entry", "进入状态"), - EXIT(30, "exit", "离开状态"); + TRIGGER("10", "trigger", "触发"), + ENTRY("20", "entry", "进入状态"), + EXIT("30", "exit", "离开状态"); - private int value; + private String value; private String code; private String description; - ROUTE_EVENT(int value, String code, String description) { + ROUTE_EVENT(String value, String code, String description) { this.value = value; this.code = code; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -933,8 +933,9 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STATUS_TYPE { START(10, "START", "开始状态"), - FINISH(20, "FINISH", "完成状态"), - TERMINATE(30, "TERMINATE", "中断状态"); + EXECUTING(20, "EXECUTING", "执行中状态"), + TERMINATE(30, "TERMINATE", "中断状态"), + FINISH(40, "FINISH", "完成状态"); private int value; private String code; 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 383366a..d12bf90 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 @@ -240,7 +240,7 @@ public class WmsEnumUtil { /** - * 单据主表状态(ASN,PO,MOVE,QC) + * 单据主表状态(ASN,PO,MOVE,QC,SO) */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MASTER_ORDER_STATUS { @@ -1283,8 +1283,8 @@ public class WmsEnumUtil { public enum CS_STRATEGY_TYPE { PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), - ZORE_STOCK(130, "零库存"); - + ZORE_STOCK(130, "零库存"), + MATERIAL_COVERAGE(140, "物料覆盖"); private int value; private String description; @@ -1328,7 +1328,8 @@ public class WmsEnumUtil { AJUST_INVENTORY(50, "库存调整盘点"), PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), - ZORE_STOCK(130, "零库存"); + ZORE_STOCK(130, "零库存"), + MATERIAL_COVERAGE(140, "物料覆盖"); private int value; private String description; @@ -5951,4 +5952,244 @@ public class WmsEnumUtil { return tmp; } } -} \ No newline at end of file + + /** + * 钢卷料类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_STEEL_TYPE { + NONE(10, "非钢卷料"), + NORMAL(20, "普通钢卷料"), + FINE(30, "精钢卷料"); + + private int value; + private String description; + + PART_STEEL_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PART_STEEL_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 供货类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_SUPPLY_TYPE { + JIT(10, "JIT"), + NOT_JIT(20, "非JIT"); + + private int value; + private String description; + + PART_SUPPLY_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PART_SUPPLY_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 收货方式 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_RECEIVING_METHOD { + STAND(10, "标准收货"), + PREPARE(20, "预收货"); + + private int value; + private String description; + + PART_RECEIVING_METHOD(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static PART_RECEIVING_METHOD codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 星期 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WEEK_TYPE { + MONDAY(10, "星期一"), + TUESDAY(20, "星期二"), + WEDNESDAY(30, "星期三"), + THURSDAY(40, "星期四"), + FRIDAY(50, "星期五"), + SATURDAY(60, "星期六"), + SUNDAY(70, "星期七"); + + private int value; + private String description; + + WEEK_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static WEEK_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 移库单移动类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SO_ORDER_TYPE { + SALES(10, "SALES", "销售"); + + private int value; + private String code; + private String description; + + SO_ORDER_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } +} diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java index 86a7c19..9656d18 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.form.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -38,10 +40,12 @@ public class BfElementGrid extends BaseBean { @Column(name = "IS_LINE_SHOW_NUMBER") @ApiParam(value = "显示行号") + @AnnoOutputColumn(refClass = BlockFormEnumUtil.TABLE_ROW_NUMBER.class) private Integer isLineShowNumber; @Column(name = "IS_LINE_MULTIPLE") @ApiParam(value = "是否单选") + @AnnoOutputColumn(refClass = BlockFormEnumUtil.TABLE_ROW_PICK.class) private Integer isLineMultiple; @Column(name = "IS_OBJECT_FIND") diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml new file mode 100644 index 0000000..375d0fd --- /dev/null +++ b/modules/i3plus-pojo-ics/pom.xml @@ -0,0 +1,22 @@ + + + + i3plus-pojo + i3plus.pojo + 1.0-DEV-SNAPSHOT + ../../pom.xml + + 4.0.0 + + i3plus-pojo-ics + + + + i3plus.pojo + i3plus-pojo-base + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java new file mode 100644 index 0000000..8921aea --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-10 16:56 + * @Modify: + **/ +@Data +public class IcsActuatorMetrics { + + private String name; + private List measurements; + private List availableTags; + + @Data + @NoArgsConstructor + public static class Measurements { + + private String statistic; + private Object value; + + } + + @Data + @NoArgsConstructor + public static class AvailableTags { + + private String tag; + private List values; + + } +} diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java new file mode 100644 index 0000000..d391222 --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java @@ -0,0 +1,72 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 应用信息 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-09 17:55 + * @Modify: + **/ +@Data +@ApiModel("应用信息") +public class IcsApplication { + + @ApiModelProperty("应用名称") + private String appName; + + @ApiModelProperty("实例数量") + private Integer totalInstanceNum; + + @ApiModelProperty("在线实例数量") + private Integer upInstanceNum; + + public int getUpInstanceNumVal() { + return upInstanceNum == null ? 0 : upInstanceNum.intValue(); + } + + + public void addUpInstanceNum() { + if (upInstanceNum == null) { + upInstanceNum = 0; + } + upInstanceNum++; + } + + @ApiModelProperty("下线实例数量") + private Integer downInstanceNum; + + public int getDownInstanceNumVal() { + return downInstanceNum == null ? 0 : downInstanceNum.intValue(); + } + + public void addDownInstanceNum() { + if (downInstanceNum == null) { + downInstanceNum = 0; + } + downInstanceNum++; + } + + @ApiModelProperty("应用状态") + private Integer appStatus; + + public String getAppStatusTxt(){ + return appStatus == null ?"无": CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(appStatus); + } + + @ApiModelProperty("状态时间戳") + private Long statusTimeStamp; + + @ApiModelProperty("状态时间") + private String statusTimeStampStr; + + @ApiModelProperty("实例集合") + private List icsInstanceList; + +} diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java new file mode 100644 index 0000000..086ce01 --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-09 18:02 + * @Modify: + **/ +@Data +@ApiModel("实例信息") +public class IcsInstance { + + @ApiModelProperty("实例id") + private String instanceId; + + @ApiModelProperty("实例状态url") + private String instanceStatusUrl; + + @ApiModelProperty("实例状态") + private Integer instanceStatus; + + @ApiModelProperty("状态时间戳") + private Long statusTimeStamp; + + @ApiModelProperty("状态时间") + private String statusTimeStampStr; + + public String getInstanceStatusTxt(){ + return instanceStatus == null ?"无": CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus); + } +} diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java new file mode 100644 index 0000000..b36168a --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : 实例明细 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-10 16:52 + * @Modify: + **/ +@Data +@ApiModel("实例明细") +public class IcsInstanceDetail { + + @ApiModelProperty("pid") + private String pid; + + @ApiModelProperty("正常运行时间") + private double uptime; + + @ApiModelProperty("正常运行时间") + private String uptimeStr; + + @ApiModelProperty("进程Cpu使用情况") + private double processCpuUsage; + + @ApiModelProperty("系统Cpu使用情况") + private double systemCpuUsage; + + @ApiModelProperty("CPU数量") + private int cpuNum; + + @ApiModelProperty("gc计数") + private int gcCount; + + @ApiModelProperty("gc总花费时间") + private double gcTotalTimeSpent; + + @ApiModelProperty("gc花费的最长时间") + private double gcMaxTimeSpent; + + @ApiModelProperty("监控网址") + private String monitorUrl; + + @ApiModelProperty("ApiUrl") + private String apiUrl; + + @ApiModelProperty("服务网址") + private String serviceUrl; + +} diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java new file mode 100644 index 0000000..63b0003 --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : 实例堆内存 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-10 16:57 + * @Modify: + **/ +@Data +@ApiModel("实例堆内存") +public class IcsInstanceMemoryHeap { + + @ApiModelProperty("堆使用的内存") + private double heapMemoryUsed; + + @ApiModelProperty("堆内存大小") + private double heapMemorySize; + + @ApiModelProperty("堆内存最大") + private double heapMemoryMax; + +} diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java new file mode 100644 index 0000000..15a655c --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description :实例堆非内存 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-10 16:57 + * @Modify: + **/ +@Data +@ApiModel("实例堆非内存") +public class IcsInstanceMemoryNonHeap { + + @ApiModelProperty("非堆内存元空间") + private double nonHeapMemoryMetaspace; + + @ApiModelProperty("非堆内存使用") + private double nonHeapMemoryUsed; + + @ApiModelProperty("非堆内存大小") + private double nonHeapMemorySize; + + @ApiModelProperty("非堆内存最大") + private double nonHeapMemoryMax; + +} diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java new file mode 100644 index 0000000..287aab5 --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : 实例线程信息 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-10 16:57 + * @Modify: + **/ +@Data +@ApiModel("实例线程信息") +public class IcsInstanceThread { + + @ApiModelProperty("实时线程") + private double threadLive; + + @ApiModelProperty("守护线程") + private double threadDaemon; + + @ApiModelProperty("线程峰值") + private double threadPeakLive; + +} diff --git a/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java new file mode 100644 index 0000000..ec4f028 --- /dev/null +++ b/modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.ics.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Description : 注册中心信息 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-09 10:12 + * @Modify: + **/ +@Data +@ApiModel("注册中心") +public class IcsRegist { + + @ApiModelProperty("环境") + private String environment; + + @ApiModelProperty("数据中心") + private String dataCenter; + + @ApiModelProperty("集群信息") + private List clusterInfo; + + @ApiModelProperty("是否低于续订阈值") + private Integer isBelowRenewThresold; + + @ApiModelProperty("启用自我保护模式") + private Integer selfPreservationModeEnabled; + + @ApiModelProperty("注册中心启动时长") + private String upDateTime; + + @ApiModelProperty("租约到期启用") + private Integer leaseExpirationEnabled; + + @ApiModelProperty("实例IP") + private String instanceIp; + + @ApiModelProperty("实例状态") + private String instanceStatus; + + @ApiModelProperty("cpu数量") + private Integer cpuNum; + + @ApiModelProperty("总可用内存") + private Integer totalAvailMemory; + + @ApiModelProperty("当前的内存使用情况") + private Integer currentMemoryUsage; + + @ApiModelProperty("应用数量") + private Integer appNum; + + @ApiModelProperty("实例数量") + private Integer instanceNum; + + @ApiModelProperty("下线实例数量") + private Integer downInstanceNum; + + @ApiModelProperty("应用集合") + private List icsApplicationList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 5d8e27c..040228e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -58,6 +58,26 @@ public class IfProductOffLine extends BaseBean implements Serializable { @ApiParam("特殊批次") private String fixLotNo; + @Column(name = "ITEM_PART_NO") + @ApiParam("原材料物料号") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("原材料物料名称") + private String itemPartName; + + @Column(name = "ITEM_QTY") + @ApiParam("原材料用量") + private String itemQty; + + @Column(name = "ITEM_UNIT") + @ApiParam("原材料单位") + private String itemUnit; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + @Column(name = "ACTION_USER") @ApiParam("操作人") private String actionUser; @@ -85,4 +105,20 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; + + @Column(name = "PRODUCE_CATEGORY_CODE") + @ApiParam("产品位置") + private String produceCategoryCode; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "JIT_LOT_NO") + @ApiParam("JIT队列批次") + private String jitLotNo; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java new file mode 100644 index 0000000..d631542 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultCause.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:56 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_FAULT_CAUSE") +@Api("MES_设备故障原因") +public class MesEquFaultCause extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1229825283741375978L; + @Column(name = "FC_CODE") + @ApiParam("故障原因代码") + private String fcCode; + + @Column(name = "FC_NAME") + @ApiParam("故障原因描述") + private String fcName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java new file mode 100644 index 0000000..2d65481 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultMethod.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:53 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_FAULT_METHOD") +@Api("MES_设备故障处理措施") +public class MesEquFaultMethod extends BaseBean implements Serializable { + + private static final long serialVersionUID = -1366849727309967125L; + @Column(name = "FM_CODE") + @ApiParam("故障方法代码") + private String fmCode; + + @Column(name = "FM_NAME") + @ApiParam("故障方法描述") + private String fmName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java new file mode 100644 index 0000000..44fcf64 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquFaultPhenomenon.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 11:42 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQU_FAULT_PHENOMENON") +@Api("MES_设备故障现象") +public class MesEquFaultPhenomenon extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4373435091738791300L; + @Column(name = "FP_CODE") + @ApiParam("故障现象代码") + private String fpCode; + + @Column(name = "FP_NAME") + @ApiParam("故障现象描述") + private String fpName; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index 15f8628..b33ac9b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -81,6 +81,10 @@ public class MesEquipment extends BaseBean implements Serializable { @ApiParam("连接类型") private Integer connectType; + @Column(name = "CHECK_MODEL") + @ApiParam("作业校验模式") + private Integer checkModel; + @Column(name = "MEMO") @ApiParam("备注") private String memo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java index 213bebc..a78fc9f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_CAUSE") -@Api("mes设备故障原因表") +@Api("mes故障原因表") public class MesFaultCause extends BaseBean implements Serializable { private static final long serialVersionUID = 1229825197241375978L; @@ -38,7 +38,8 @@ public class MesFaultCause extends BaseBean implements Serializable { @ApiParam("故障原因描述") private String fcName; - @Column(name = "PARENT_FC_CODE") - @ApiParam("父阶原因代码") - private String parentFcCode; + // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段 + @Column(name = "FC_TYPE") + @ApiParam("故障原因类型编码") + private String fcType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java index 7cdfd96..4a0e758 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_METHOD") -@Api("mes设备故障方法表") +@Api("MES_故障处理措施") public class MesFaultMethod extends BaseBean implements Serializable { private static final long serialVersionUID = -1366849757709967125L; @@ -38,7 +38,8 @@ public class MesFaultMethod extends BaseBean implements Serializable { @ApiParam("故障方法描述") private String fmName; - @Column(name = "PARENT_FM_CODE") - @ApiParam("父阶故障代码") - private String parentFmCode; + // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段 + @Column(name = "FM_TYPE") + @ApiParam("故障措施类型编码") + private String fmType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java index 9c36828..d66b12b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java @@ -26,7 +26,7 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_PHENOMENON") -@Api("mes设备故障现象表") +@Api("mes故障现象表") public class MesFaultPhenomenon extends BaseBean implements Serializable { private static final long serialVersionUID = 4373435095236791300L; @@ -38,15 +38,8 @@ public class MesFaultPhenomenon extends BaseBean implements Serializable { @ApiParam("故障现象描述") private String fpName; - @Column(name = "PARENT_FP_CODE") - @ApiParam("父阶现象代码") - private String parentFpCode; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam("设备代码") - private String equipmentCode; - + // 对应(类型信息MesTypeCfg）中的BUSINESS_TYPE_CODE字段 @Column(name = "FP_TYPE") - @ApiParam("故障现象类型") - private Integer fpType; + @ApiParam("故障现象类型编码") + private String fpType; } 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 dc419c2..4d2fc73 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 @@ -54,6 +54,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("通道") private String channel; + @Column(name = "DEVICE") + @ApiParam("终端") + private String device; + @Column(name = "TAG_NAME") @ApiParam("标签名称") private String tagName; @@ -70,14 +74,26 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("分组名称") private String groupName; - @Column(name = "DEVICE") - @ApiParam("驱动") - private String device; + @Column(name = "ANALYSIS_RULE") + @ApiParam("解析规则") + private String analysisRule; + + @Column(name = "IS_ANALYSIS") + @ApiParam("是否解析") + private String isAnalysis; + + @Column(name = "PLC_CFG") + @ApiParam("PLC配置") + private String plcCfg; @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode; + @Column(name = "WORK_CENTER_CODE") @ApiParam("生产线") private String workCenterCode; @@ -86,18 +102,6 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("工位") private String workCellCode; - @Column(name = "PLC_CFG") - @ApiParam("PLC的值的设定") - private String plcCfg; - - @Column(name = "ANALYSIS_RULE") - @ApiParam("解析规则") - private String analysisRule; - - @Column(name = "IS_ANALYSIS") - @ApiParam("是否解析") - private String isAnalysis; - @Column(name = "FEED_VALUE") @ApiParam("反馈值") private String feedValue; @@ -114,6 +118,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("空间索引") private Integer nameSpaceIndex = 2; + @Column(name = "PLC_TYPE") + @ApiParam("PLC类型") + private Integer plcType; + @Column(name = "USER_NAME") @ApiParam("用户名") private String userName; @@ -130,10 +138,6 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("OPC值") private List opcValue; - @Column(name = "TOOLING_CODE ") - @ApiParam("工装代码") - private String toolingCode; - @Transient @ApiParam("标签数据") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java index bc05708..661059a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -37,4 +38,16 @@ public class MesProcess extends BaseBean implements Serializable { @Column(name = "PROCESS_NAME") @ApiParam("工序名称") private String processName; + + @Transient + @ApiParam("生产线代码") + private String workCenterCode; + + @Transient + @ApiParam("工位代码") + private String workCellCode; + + @Transient + @ApiParam("流程代码") + private String routeCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index bea56af..a0a107d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -8,10 +8,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.*; import java.io.Serializable; /** @@ -47,4 +44,8 @@ public class MesRoute extends BaseBean implements Serializable { @Column(name = "ROUTE_TYPE") @ApiParam("流程类型 10-扫描类型 20-监控类型") private Integer routeType; + + @Transient + @ApiParam("生产线") + private String workCenterCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java index 7d83053..d8ecd5d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java @@ -54,6 +54,10 @@ public class MesWcCheck extends BaseBean implements Serializable { @ApiParam("检查标准") private String standard; + @Column(name = "IS_NECESSARY") + @ApiParam("是否必检") + private Integer isNecessary; + @Transient @ApiParam("检查类型名称") private String checkTypeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java index 534e549..36a9394 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java @@ -80,4 +80,8 @@ public class MesWcCheckRecord extends BaseBean implements Serializable { @ApiParam("总体结果") private Integer overAllResult; + @Column(name = "IS_NECESSARY") + @ApiParam("是否必检") + private Integer isNecessary; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java index 46dcdbd..93e598e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java @@ -52,4 +52,7 @@ public class ButtonComponentReqModel { @ApiParam("客户标识号") private String custFlagNo; + @ApiParam("用户信息") + private String userInfo; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java new file mode 100644 index 0000000..2e7cfef --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @author wangjie + * @date 2020/4/9 18:00 + * @desc + */ +@Data +public class BypassModel { + + @ApiParam("生产线") + private String workCenterCode; + + @ApiParam("工位") + private String workCellCode; + + @ApiParam("Bypass编码") + private String bypassCode; + + @ApiParam("检测项") + private String businessValue; + + @ApiParam("是否确认，1=已确认，2=未确认") + private String isVerify; + + @ApiParam("生产数据ID") + private Long productDataId; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java index bd38834..151b5ef 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.model; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; -//import com.sun.tools.javac.util.List; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ImportBomExcelDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ImportBomExcelDataModel.java index 089013a..38dc1b4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ImportBomExcelDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ImportBomExcelDataModel.java @@ -114,5 +114,5 @@ public class ImportBomExcelDataModel { private String keyPartType; @ApiParam("是否关键件") - private Integer isKeyPart; + private String isKeyPart; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java new file mode 100644 index 0000000..d7ca7a5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 生产工单导入 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-03-30 13:42 + * @Modify: + **/ +@Data +@Api(value="生产工单导入",description = "生产工单导入") +public class MesWorkOrderModel { + + @ApiParam("工单号") + @AnnoOutputColumn + private String orderNo; + + @ApiParam("物料号") + @AnnoOutputColumn + private String partNo; + + @ApiParam("客户产线代码") + @AnnoOutputColumn + private String custProdLineCode; + + @ApiParam("数量") + @AnnoOutputColumn + private Double qty; + + @ApiParam("开始时间") + @AnnoOutputColumn + private String startTime; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index a624677..8667491 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -79,6 +79,11 @@ public class QueueOrderModel implements Serializable { @ApiParam("产品类型名称") private String pptCode; + @ApiParam("JIT队列批次") + private String jitLotNo; + @ApiParam("vin") + private String vinCode; + public QueueOrderModel() { } @@ -234,4 +239,12 @@ public class QueueOrderModel implements Serializable { this.partNameRdd = partNameRdd; this.organizeCode = organizeCode; } + + public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode) { + this.id = id; + this.queueGroupNo = queueGroupNo; + this.jitLotNo = jitLotNo; + this.vinCode = vinCode; + this.organizeCode = organizeCode; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateModel.java new file mode 100644 index 0000000..41bf108 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +/** + * @author Wynne.Lu + * @date 2020/4/14 15:18 + * @desc + */ +@Data +@Deprecated +public class StateModel { + + private String stateCode; + + private String stateName; + + private String routeCode; + + private String smCode; +} 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 441da23..7bd7307 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 @@ -84,6 +84,9 @@ public class StationRequestBean implements Serializable { @ApiParam("业务类型") private String busiType; + @ApiParam("界面类型") + private String interfaceType; + @ApiParam("工位监听类型") private String monitorType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.java new file mode 100644 index 0000000..550230a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultCauseRepository.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.MesEquFaultCause; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:08 + * @Modify: + **/ +public interface MesEquFaultCauseRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.java new file mode 100644 index 0000000..9c61d73 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultMethodRepository.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.MesEquFaultMethod; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:07 + * @Modify: + **/ +public interface MesEquFaultMethodRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.java new file mode 100644 index 0000000..dd0473e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquFaultPhenomenonRepository.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.MesEquFaultPhenomenon; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\10\10 0010 13:05 + * @Modify: + **/ +public interface MesEquFaultPhenomenonRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 904ff2f..22d5081 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 @@ -1325,8 +1325,50 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) { DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmName(), "fmName", packBean); } - if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) { - DdlPreparedPack.getStringLikerPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean); + if (!StringUtils.isEmpty(mesFaultMethod.getFmType())) { + DdlPreparedPack.getStringLikerPack(mesFaultMethod.getFmType(), "fmType", packBean); + } + return packBean; + } + + /** + * MES 设备故障处理措施查询条件封装 + * + * @param mesEquFaultMethod + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquFaultMethod(MesEquFaultMethod mesEquFaultMethod, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultMethod, organizeCode); + if (!StringUtils.isEmpty(mesEquFaultMethod.getFmCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getFmCode(), "fmCode", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultMethod.getFmName())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getFmName(), "fmName", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultMethod.getEquipmentCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultMethod.getEquipmentCode(), "equipmentCode", packBean); + } + return packBean; + } + + /** + * MES 设备故障原因查询条件封装 + * + * @param mesEquFaultCause + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquFaultCause(MesEquFaultCause mesEquFaultCause, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultCause, organizeCode); + if (!StringUtils.isEmpty(mesEquFaultCause.getFcCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getFcCode(), "fcCode", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultCause.getFcName())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getFcName(), "fcName", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultCause.getEquipmentCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultCause.getEquipmentCode(), "equipmentCode", packBean); } return packBean; } @@ -1346,8 +1388,8 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultCause.getFcName())) { DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcName(), "fcName", packBean); } - if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) { - DdlPreparedPack.getStringLikerPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean); + if (!StringUtils.isEmpty(mesFaultCause.getFcType())) { + DdlPreparedPack.getStringLikerPack(mesFaultCause.getFcType(), "fcType", packBean); } return packBean; } @@ -1367,8 +1409,29 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) { DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpName(), "fpName", packBean); } - if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) { - DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean); + if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpType())) { + DdlPreparedPack.getStringLikerPack(mesFaultPhenomenon.getFpType(), "fpType", packBean); + } + return packBean; + } + + /** + * MES 设备故障现象查询条件封装 + * + * @param mesEquFaultPhenomenon + * @param organizeCode + * @return + */ + public static DdlPackBean getMesEquFaultPhenomenon(MesEquFaultPhenomenon mesEquFaultPhenomenon, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquFaultPhenomenon, organizeCode); + if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getFpCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getFpCode(), "fpCode", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getFpName())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getFpName(), "fpName", packBean); + } + if (!StringUtils.isEmpty(mesEquFaultPhenomenon.getEquipmentCode())) { + DdlPreparedPack.getStringLikerPack(mesEquFaultPhenomenon.getEquipmentCode(), "equipmentCode", packBean); } return packBean; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java new file mode 100644 index 0000000..65eebf5 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.model.form; + +import cn.estsh.i3plus.pojo.form.bean.BfButton; +import cn.estsh.i3plus.pojo.form.bean.BfElement; +import cn.estsh.i3plus.pojo.form.bean.BfRefButtonMethod; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 按钮操作数据模型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-04-13 19:45 + * @Modify: + **/ +@Data +@ApiModel("按钮操作数据模型") +public class BfButtonOperateDataModel { + + @ApiModelProperty("按钮id") + private Long buttonId; + + @ApiModelProperty("元素id") + private Long elementId; + + @ApiModelProperty("操作数据") + private List> operateData; + + @ApiModelProperty("按钮功能关系信息") + private BfRefButtonMethod bfRefButtonMethod; + + @ApiModelProperty("元素信息") + private BfElement bfElement; + + @ApiModelProperty("按钮信息") + private BfButton bfButton; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java index edd899b..0c80d9f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormOperateDataModel.java @@ -22,10 +22,10 @@ import java.util.Map; @NoArgsConstructor public class FormOperateDataModel { - @ApiModelProperty("元素代码") - private Long refId; + @ApiModelProperty("关联标识") + private String refId; - @ApiModelProperty("元素名称") + @ApiModelProperty("关联名称") private String refName; @ApiModelProperty("操作来源") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java index aa7c6a6..3d4c3fb 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/MissResourceModel.java @@ -31,6 +31,10 @@ public class MissResourceModel implements Serializable { @ApiParam(value = "资源类型", example = "1", access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE") private Integer resourceType; + public String getResourceTypeTxt(){ + return resourceType == null ?"无": CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.valueOf(resourceType); + } + @ApiParam(value = "语言编码", example = "浏览器语言编码") @AnnoOutputColumn private String languageCode; @@ -47,6 +51,10 @@ public class MissResourceModel implements Serializable { @AnnoOutputColumn(refClass = CommonEnumUtil.MiSS_RESOURCE_SOURCE.class) private Integer resourceSource; + public String getResourceSourceTxt(){ + return resourceSource == null ?"无": CommonEnumUtil.MiSS_RESOURCE_SOURCE.valueOfDescription(resourceSource); + } + @ApiParam(value = "数据来源") @AnnoOutputColumn(refClass = CommonEnumUtil.IS_VAILD.class) private Integer isValid; 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 dae7847..f371330 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.wms.bean.WmsPart; +import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -45,4 +46,10 @@ public class TransSnModle extends BaseComponetsParam implements Serializable { @ApiParam(value = "物料信息") public WmsPart wmsPart; + + @ApiParam(value = "条码") + public WmsStockSn wmsStockSn; + + @ApiParam(value = "新条码") + public WmsStockSn NewWmsStockSn; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java index b043598..9672b1d 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -41,4 +42,12 @@ public class PtlAreaRoute extends BaseBean implements Serializable { @Column(name = "ROUTE_TYPE") @ApiParam("流程类型") private Integer routeType; + + @Transient + @ApiParam("区域代码") + private String areaName; + + @Transient + @ApiParam("流程名称") + private String routeName; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java new file mode 100644 index 0000000..56fdace --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.ptl.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 wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ROUTE_MODULE_PARAM") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_流程组件调用参数") +public class PtlRouteModuleParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3036415977457877114L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java new file mode 100644 index 0000000..f08d7da --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaRouteModuleParam; +import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteModuleParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 流程明细Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("流程明细Model") +public class ActionModuleGroupModel implements Serializable { + + private static final long serialVersionUID = 3569055511035396175L; + + @ApiParam("组件代码") + private String amCode; + + @ApiParam("执行顺序") + private Integer seq; + + @ApiParam("流程组件参数集合") + private List routeModuleParamList; + + @ApiParam("区域流程组件参数集合") + private List areaRouteModuleParamList; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java new file mode 100644 index 0000000..e533406 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 作业流程Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("作业流程Model") +public class BussinessProcessModel implements Serializable { + + private static final long serialVersionUID = 148029163662900001L; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("GOJS位置") + private String position; + + @ApiParam("流程明细Model集合") + private List processDetailModelList; + + @ApiParam("区域代码") + private String areaNo; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java new file mode 100644 index 0000000..3f42664 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : 流程明细Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("流程明细Model") +public class ProcessDetailModel implements Serializable { + + private static final long serialVersionUID = 3569055511035396175L; + + @ApiParam("状态代码") + private String statusCode; + + @ApiParam("状态名称") + private String statusName; + + @ApiParam("触发类型") + private Integer triggerType; + + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @ApiParam("组件集MAP") + private Map> actionModuleGroupMap; + + @ApiParam("下个状态点MAP") + private Map nextStatusMap; + + @ApiParam("触发调用") + private Long actionAmgId; + + @ApiParam("进入状态调用") + private Long inAmgId; + + @ApiParam("离开状态调用") + private Long outAmgId; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleParamRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleParamRepository.java new file mode 100644 index 0000000..227c5ef --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleParamRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlActionModuleParam; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlActionModuleParamRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteModuleParamRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteModuleParamRepository.java new file mode 100644 index 0000000..81c64ba --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteModuleParamRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteModuleParam; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlRouteModuleParamRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java new file mode 100644 index 0000000..6475e26 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java @@ -0,0 +1,157 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * @Description : bom历史记录 + * @Reference : + * @Author : jason + * @CreateDate : 2020-04-14 + * @Modify: + **/ +@Data +@Entity +@Table(name = "WMS_BOM_HISTORY") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value = "bom历史记录", description = "bom历史记录") +public class WmsBomHistory extends BaseBean { + @Column(name = "PART_NO") + @ApiParam(value = "父物料号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "父物料描述") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String partName; + + @Column(name = "UNIT") + @ApiParam(value = "计量单位") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String unit; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ApiParam(value = "数量") + @ColumnDefault("0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double qty; + + @Column(name = "ITEM_PART_NO") + @ApiParam(value = "子物料号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String itemPartNo; + + @Column(name = "ITEM_PART_NAM") + @ApiParam(value = "子料物料描述") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String itemPartNam; + + @Column(name = "ITEM_UNIT") + @ApiParam(value = "子计量单位") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String itemUnit; + + @Column(name = "ITEM_QTY", columnDefinition = "decimal(18,8)", nullable = false) + @ApiParam(value = "子用量") + @ColumnDefault("0") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double itemQty; + + @Column(name = "BOM_NUM") + @ApiParam(value = "BOM编号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String bomNum; + + @Column(name = "BOM_VERSION") + @ApiParam(value = "BOM版本号") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String bomVersion; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "有效起始日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + @Column(name = "EFF_START_TIME") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + private String effStartTime; + + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "有效截止日期", example = "2018-12-31 23:59:59") + @AnnoOutputColumn(hidden = true) + @Column(name = "EFF_END_TIME") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) + private String effEndTime; + + @Column(name = "LOCATE_NO") + @ApiParam(value = "线边库位代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String locateNo; + + @Column(name = "TERMINAL_NO") + @ApiParam(value = "工位代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String terminalNo; + + @Column(name = "NEW_BOM_VERSION") + @ApiParam(value = "工位代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String newBomVersion; + + @ApiParam(value = "目标存储区") + @Transient + public String destZoneNo; + + @ApiParam(value = "交易类型") + @Transient + public String transTypeCode; + + @ApiParam(value = "线路代码") + @Transient + public String routingCode; + + public Double getQty() { + return this.qty == null ? 0 : this.qty.doubleValue(); + } + + public Double getItemQty() { + return this.itemQty == null ? 0 : this.itemQty.doubleValue(); + } + + public WmsBomHistory() { + } + + public WmsBomHistory(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty) { + this.itemPartNo = itemPartNo; + this.itemPartNam = itemPartNam; + this.itemUnit = itemUnit; + this.bomNum = bomNum; + this.itemQty = itemQty; + } + + public WmsBomHistory(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty,String effStartTime) { + this.itemPartNo = itemPartNo; + this.itemPartNam = itemPartNam; + this.itemUnit = itemUnit; + this.bomNum = bomNum; + this.itemQty = itemQty; + this.effStartTime = effStartTime; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java index 3561345..a6845a4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -100,4 +100,14 @@ public class WmsCsStrategy extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "备注") private String remake; + + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam(value = "已盘物料") + @Column(name="INVENTORY_MATERIAL") + private String inventoryMaterial; + + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam(value = "已盘库位") + @Column(name="INVENTORY_LOCATION") + private String inventoryLocation; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java new file mode 100644 index 0000000..65a6608 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustWindow.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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 + * @CreateDate : 2020-04-14 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_CUST_WINDOW") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="客户窗口时间",description = "客户窗口时间") +public class WmsCustWindow extends BaseBean { + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编码") + private String custNo; + + @Column(name = "CUST_WINDOW_TIME") + @ApiParam(value = "窗口时间") + private String custWindowTime; + + @Column(name = "WEEKS") + @ApiParam(value = "星期") + private String weeks; + + @Column(name = "DELAY_HOUR") + @ApiParam(value = "容差") + private Integer delayHour; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java new file mode 100644 index 0000000..711858f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCustomerPartShipping.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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-04-11 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_CUSTOMER_PART_SHIPPING") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="客户物料发往地",description = "客户物料发往地") +public class WmsCustomerPartShipping extends BaseBean { + + @Column(name = "CUSTOMER_CODE") + @ApiParam(value = "客户代码") + private String customerCode; + + @Column(name = "CUSTOMER_PART_NO") + @ApiParam(value = "客户零件号") + private String customerPartNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "SHIPPING_FLAG") + @ApiParam(value = "发往地") + private String shippingFlag; +} 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 88f3576..0b173cb 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 @@ -169,6 +169,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "指定生产日期") private String assignDateCode; + @Column(name = "SO_ORDER_NO") + @ApiParam(value = "销售单据号") + private String soOrderNo; + @Transient @ApiParam("实际批次") private String actualLot; 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 new file mode 100644 index 0000000..20e8f31 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 销售订单明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-13 13:30 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_DOC_SO_DETAILS") +@Api("销售订单明细表") +@ToString +public class WmsDocSoDetails extends BaseBean { + private static final long serialVersionUID = -8900949569711082994L; + + @Column(name = "ORDER_NO") + @ApiParam(value = "单据号") + private String orderNo; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "SNP_QTY") + @ApiParam(value = "标准包装", example = "1") + private Double snpQty; + + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "需求数量", example = "0") + public Double qty; +} 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 new file mode 100644 index 0000000..863ea9c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +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 : jimmy.zeng + * @CreateDate : 2020-04-13 13:19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_DOC_SO_MASTER") +@Api("销售订单主表") +@ToString +public class WmsDocSoMaster extends BaseBean { + + private static final long serialVersionUID = 8250843929041855006L; + + @Column(name = "ORDER_NO") + @ApiParam(value = "单据号") + private String orderNo; + + @Column(name = "ORDER_TYPE") + @ApiParam("订单类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.SO_ORDER_TYPE.class, refForeignKey = "value", value = "description") + public Integer orderType; + + @Column(name = "ORDER_STATUS") + @ApiParam(value = "订单状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + public Integer orderStatus; + + @Column(name = "CUST_CODE") + @ApiParam(value = "客户编号") + private String custCode; + + @Column(name = "CUST_DESC") + @ApiParam(value = "客户全称") + private String custDesc; + + @Column(name = "CUST_DELIVERY_CODE") + @ApiParam(value = "客户发往地代码") + private String custDeliveryCode; + + @Column(name = "FLAG_NAME") + @ApiParam(value = "客户发往地名称") + private String flagName; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java new file mode 100644 index 0000000..e01c45c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartExtend.java @@ -0,0 +1,159 @@ +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.WmsEnumUtil; +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.Index; +import javax.persistence.Table; + +/** + * @Description :物料扩展属性 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-07 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PART_EXTEND", indexes = { + @Index(columnList = "ORGANIZE_CODE") +}) +@Api("物料扩展属性表") +public class WmsPartExtend extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + private String partNo; + + @Column(name = "IS_SETTLE") + @ApiParam(value = "是否内部交易") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + private Integer isSettle; + + @Column(name = "SETTLE_FACTORY_CODE") + @ApiParam(value = "结算工厂") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String settleFactoryCode; + + @Column(name = "SETTLE_REC_ERP_WH") + @ApiParam(value = "结算物料收货库存") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String settleRecErpWh; + + @Column(name = "VALUATION_CLASS") + @ApiParam(value = "评估类") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String valuationClass; + + @Column(name = "VALUATION_CLASS_NAME") + @ApiParam(value = "评估类描述") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String valuationClassName; + + @Column(name = "MC_CODE") + @ApiParam(value = "MRP控制者") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String mcCode; + + @Column(name = "MC_NAME") + @ApiParam(value = "MRP控制者名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String mcName; + + @Column(name = "IS_STEEL") + @ApiParam(value = "是否为钢卷料") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_STEEL_TYPE") + private Integer isSteel; + + @Column(name = "IS_PACKAGE_MATERIAL") + @ApiParam(value = "是否为包材") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + private Integer isPackageMaterial; + + @Column(name = "RECEIVING_TYPE") + @ApiParam(value = "收货类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String receivingType; + + @Column(name = "LOT_CONTROL") + @ApiParam(value = "批次控制") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String lotControl; + + @Column(name = "RANGE_LOT") + @ApiParam(value = "批次容差") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + private Integer rangeLot; + + @Column(name = "QUALITY_RATE") + @ApiParam(value = "质检率") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + private Double qualityRate; + + @Column(name = "ROUTING") + @ApiParam(value = "工艺") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String routing; + + @Column(name = "PO_PART_MULTIPLE") + @ApiParam(value = "乘倍包装") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String poPartMultiple; + + @Column(name = "RANGE_QTY_RATE") + @ApiParam(value = "数量容差") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + private Integer rangeQtyRate; + + @Column(name = "RANGE_INVENTORY") + @ApiParam(value = "盘点容差") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + private Integer rangeInventory; + + @Column(name = "PROD_LINE") + @ApiParam(value = "产品类") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String prodLine; + + @Column(name = "SUPPLY_TYPE") + @ApiParam(value = "供货类型") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_SUPPLY_TYPE") + private Integer supplyType; + + @Column(name = "RECEIVING_MODE") + @ApiParam(value = "收货方式") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "PART_RECEIVING_METHOD") + private Integer receivingMethod; + + @Column(name = "PRE_RECEIVING_DAY") + @ApiParam(value = "预收货天数") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + private Integer preReceivingDay; + + @Column(name = "IS_WAY_CALCULATION") + @ApiParam(value = "是否计算在途库存") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + private Integer isWayCalculation; + + @Column(name = "IS_AUTO_PURCHASE") + @ApiParam(value = "是否自动采购") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + private Integer isAutoPurchase; + + @Column(name = "AUTO_PURCHASE_QTY") + @ApiParam(value = "自动采购数量") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER) + private Integer autoPurchaseQty; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index b8eff5a..63e1e37 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -70,6 +70,7 @@ public class WmsPoSn extends BaseBean { /** * 质量:10-合格 20-不合格 30-隔离 40-报废 */ + @Column(name="QC_STATUS") @ApiParam(value = "质量状态", example = "10") public Integer qcStatus; @@ -150,6 +151,11 @@ public class WmsPoSn extends BaseBean { @ApiParam("父层级packcode对应的可回用零件号") private String parentReturnPart; + @Transient + @ApiParam(value = "生产批次") + private String leftCode = ""; + + public WmsPoSn(){} public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java new file mode 100644 index 0000000..9120e8d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSubPart.java @@ -0,0 +1,55 @@ +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.WmsEnumUtil; +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.Index; +import javax.persistence.Table; + +/** + * @Description :替代料 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-07 16:06 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_SUB_PART", indexes = { + @Index(columnList = "ORGANIZE_CODE") +}) +@Api("替代料") +public class WmsSubPart extends BaseBean { + + @Column(name = "PART_NO") + @ApiParam(value = "物料编码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String partNo; + + @Column(name = "SUB_PART_NO") + @ApiParam(value = "替代物料编码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String subPartNo; + + @Column(name = "PART_NAME") + @ApiParam(value = "物料名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String partName; + + @Column(name = "SUB_PART_NAME") + @ApiParam(value = "替代物料名称") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + private String subPartName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java index c1013d5..bc5e86b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java @@ -301,4 +301,58 @@ public class WmsTmsShippingExtDetail extends BaseBean { return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue(); } + public WmsTmsShippingExtDetail(WmsDocMovementDetails docMovementDetails,String moveNo) { + this.moveNo = moveNo; + this.partNo = docMovementDetails.getPartNo(); + this.partNameRdd = docMovementDetails.getPartNameRdd(); + this.item = docMovementDetails.getItem(); + this.qty =docMovementDetails.getQty(); + this.unit = docMovementDetails.getUnit(); + this.orderNo = docMovementDetails.getOrderNo(); + this.srcWhNo = docMovementDetails.getSrcWhNo(); + this.srcZoneNo = docMovementDetails.getSrcZoneNo(); + this.srcLocateNo = docMovementDetails.getSrcLocateNo(); + this.destWhNo = docMovementDetails.getDestWhNo(); + this.destZoneNo = docMovementDetails.getDestZoneNo(); + this.destLocateNo = docMovementDetails.getDestLocateNo(); + this.printQty = docMovementDetails.getPrintQty(); + this.planDate = docMovementDetails.getPlanDate(); + this.planTime = docMovementDetails.getPlanTime(); + this.srcNo = docMovementDetails.getSrcNo(); + this.itemStatus = docMovementDetails.getItemStatus(); + this.isFree = docMovementDetails.getIsFree(); + this.remark = docMovementDetails.getRemark(); + this.pickQty = docMovementDetails.getPickQty(); + this.outQty = docMovementDetails.getOutQty(); + this.recQty = docMovementDetails.getRecQty(); + this.moveQty = docMovementDetails.getMoveQty(); + this.taskGenerateQty = docMovementDetails.getTaskGenerateQty(); + this.srcAreaNo = docMovementDetails.getSrcAreaNo(); + this.destAreaNo = docMovementDetails.getDestAreaNo(); + this.lotNo = docMovementDetails.getLotNo(); + this.srcItem = docMovementDetails.getSrcItem(); + this.custOrderNo = docMovementDetails.getCustOrderNo(); + this.assignDateCode = docMovementDetails.getAssignDateCode(); + this.actualLot = docMovementDetails.getActualLot(); + this.actualQty = docMovementDetails.getActualQty(); + this.recommondLot = docMovementDetails.getRecommondLot(); + this.recommondLocateNo = docMovementDetails.getRecommondLocateNo(); + this.isSet = docMovementDetails.getIsSet(); + this.dateCode = docMovementDetails.getDateCode(); + this.inputMoveQty = docMovementDetails.getInputMoveQty(); + this.snp = docMovementDetails.getSnp(); + this.detailsSnCount = docMovementDetails.getDetailsSnCount(); + this.restQty = docMovementDetails.getRestQty(); + this.isTask = docMovementDetails.getIsTask(); + this.orderMasterStatus = docMovementDetails.getOrderMasterStatus(); + this.printStatus = docMovementDetails.getPrintStatus(); + this.priority = docMovementDetails.getPriority(); + this.sumQty = docMovementDetails.getSumQty(); + this.sumPickQty = docMovementDetails.getSumPickQty(); + this.executeStatus = docMovementDetails.getExecuteStatus(); + this.lockVersion = docMovementDetails.getLockVersion(); + this.moveType = docMovementDetails.getMoveType(); + this.busiType = docMovementDetails.getBusiType(); + this.isSn = docMovementDetails.getIsSn(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java index 8c415bd..5c40810 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java @@ -145,4 +145,31 @@ public class WmsTmsShippingExtSn extends BaseBean { this.countBox = countBox; this.partNo = partNo; } + + public WmsTmsShippingExtSn(String moveNo,WmsDocMovementSn docMovementSn) { + this.moveNo = moveNo; + this.orderNo = docMovementSn.getOrderNo(); + this.item = docMovementSn.getItem(); + this.partNo = docMovementSn.getPartNo(); + this.partNameRdd = docMovementSn.getPartNameRdd(); + this.qty = docMovementSn.getQty(); + this.unit = docMovementSn.getUnit(); + this.snStatus = docMovementSn.getSnStatus(); + this.sn = docMovementSn.getSn(); + this.vendorNo = docMovementSn.getVendorNo(); + this.snType = docMovementSn.getSnType(); + this.isSet = docMovementSn.getIsSet(); + this.destLocateNo = docMovementSn.getDestLocateNo(); + this.srcLocateNo = docMovementSn.getSrcLocateNo(); + this.dateCode = docMovementSn.getDateCode(); + this.inputMoveQty = docMovementSn.getInputMoveQty(); + this.planDate = docMovementSn.getPlanDate(); + this.planTime = docMovementSn.getPlanTime(); + this.erpWhNo = docMovementSn.getErpWhNo(); + this.itemStatus = docMovementSn.getItemStatus(); + this.customerPartNo = docMovementSn.getCustomerPartNo(); + this.parentReturnPart = docMovementSn.getParentReturnPart(); + this.templateNo = docMovementSn.getTemplateNo(); + this.countBox = docMovementSn.getCountBox(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java new file mode 100644 index 0000000..7b1e347 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPlanner.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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-04-11 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_VENDOR_PLANNER") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="供应商计划员",description = "供应商计划员") +public class WmsVendorPlanner extends BaseBean { + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "供应商名称") + private String vendorName; + + @Column(name = "PLANNER_NAME") + @ApiParam(value = "计划员") + private String plannerName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java new file mode 100644 index 0000000..3b3bc84 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorRelation.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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-04-11 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_VENDOR_RELATION") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="供应商父子关系",description = "供应商父子关系") +public class WmsVendorRelation extends BaseBean { + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "供应商名称") + private String vendorName; + + @Column(name = "SUB_VENDOR_CODE") + @ApiParam(value = "子供应商编号") + private String subVendorNo; + + @Column(name = "SUB_VENDOR_NAME") + @ApiParam(value = "子供应商名称") + private String subVendorName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java new file mode 100644 index 0000000..bc65739 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorWindow.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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-04-11 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_VENDOR_WINDOW") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="供应商窗口时间",description = "供应商窗口时间") +public class WmsVendorWindow extends BaseBean { + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编号") + private String vendorNo; + + @Column(name = "VENDOR_NAME") + @ApiParam(value = "供应商名称") + private String vendorName; + + @Column(name = "WINDOW_TIME") + @ApiParam(value = "窗口时间") + private String windowTime; + + @Column(name = "DELAY_HOUR") + @ApiParam(value = "容差") + private Integer delayHour; + + @Column(name = "WEEK_DAY") + @ApiParam(value = "星期") + private String weekDay; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java new file mode 100644 index 0000000..48936bc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplate.java @@ -0,0 +1,79 @@ +package cn.estsh.i3plus.pojo.wms.bean.template; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; + +/** + * @Description : 导入模板信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-16 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_IMPORT_TEMPLATE") +@Api("导入模板信息") +public class BasImportTemplate extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592889L; + @Column(name="TEMPLATE_CODE") + @ApiParam("模板代码") + private String templateCode; + + @Column(name="TEMPLATE_NAME") + @ApiParam("模板名称") + private String templateName; + + @Column(name="TEMPLATE_DESC") + @ApiParam("模板描述") + private String templateDesc; + + @Column(name="GROUP_NAME") + @ApiParam("分组名称") + private String groupName; + + /** + * 10-单表，20-多表 + */ + @Column(name="IMPORT_TYPE") + @ApiParam(value = "导入类型", example = "0") + private Integer importType; + + /** + * 10-全覆盖，20-差异更新，30-重复不导入 + */ + @Column(name="UPDATE_TYPE") + @ApiParam(value = "更新类型", example = "0") + private Integer updateType; + + @Column(name="UNION_PK") + @ApiParam("联合主键") + private String unionPk; + + @Column(name="RELATION_FIELD") + @ApiParam("关联字段") + private String relationField; + + @Column(name="SCRIPT_NO") + @ApiParam("脚本编号") + private String scriptNo; + + @Transient + @ApiParam("模板明细列表") + private List templateDetailsList; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java new file mode 100644 index 0000000..aa6bba6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/template/BasImportTemplateDetails.java @@ -0,0 +1,98 @@ +package cn.estsh.i3plus.pojo.wms.bean.template; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 导入模板明细信息 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-16 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="BAS_IMPORT_TEMPLATE_DETAILS") +@Api("导入模板明细信息") +public class BasImportTemplateDetails extends BaseBean{ + + private static final long serialVersionUID = 9214639813072592999L; + @Column(name="TEMPLATE_CODE") + @ApiParam("模板代码") + private String templateCode; + + @Column(name="TABLE_NAME") + @ApiParam("表名称") + private String tableName; + + @Column(name="FIELD_CODE") + @ApiParam("字段英文名称") + private String fieldCode; + + @Column(name="FIELD_ALIAS") + @ApiParam("字段别名") + private String fieldAlias; + + @Column(name="LABEL_CODE") + @ApiParam("标签代码") + private String labelCode; + + @Column(name="LABEL_NAME") + @ApiParam("标签名称") + private String labelName; + + @Column(name="DEFAULT_VALUE") + @ApiParam("默认值") + private String defaultValue; + + /** + * 数据格式 文本、整数、小数、日期 + */ + @Column(name="DATA_FORAMT") + @ApiParam("数据格式") + private String dataFormat; + + /** + * 1-是，2-否 + */ + @Column(name="IS_REQUIRE") + @ApiParam(value = "是否必填", example = "0") + private Integer isRequire; + + @Column(name="DECIMAIL_SPLIT") + @ApiParam("十进制分隔符") + private String decimalSplit; + + @Column(name="THOUSANDS_SPLIT") + @ApiParam("千分位分隔符") + private String thousandsSplit; + + // YYYY-MM-DD/DD-MM-YY/YYYY-MM-DD HH:mm:ss + @Column(name="DATE_FORMAT") + @ApiParam("日期格式") + private String dateFormat; + + @Column(name="REMARK") + @ApiParam("备注") + private String remark; + + @Column(name="SEQ") + @ApiParam(value = "序号", example = "0") + private Integer seq; + + @Column(name="MAX_LENGTH") + @ApiParam(value = "最大长度", example = "0") + private Integer maxLength; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java new file mode 100644 index 0000000..ba1b3be --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasBeanFieldModel.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @description 数据库实例字段模型 + * @author siliter.yuan + * @date 2020/04/16 + */ +@Data +@Api("数据库实例字段模型") +public class BasBeanFieldModel { + + @ApiParam("表明") + private String tableName; + + @ApiParam("字段英文名称") + private String fieldEnName; + + @ApiParam("字段类型") + public String fieldType; + + @ApiParam("字段描述") + private String fieldDesc; + + @ApiParam("实例类名") + public String entityName; + + @ApiParam("实例字段名称") + public String propertyName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateDetailsRepository.java new file mode 100644 index 0000000..31250fa --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateDetailsRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplateDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description : 导入模板明细数据操作仓库 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-16 10:00 + * @Modify: + **/ +@Repository +public interface BasImportTemplateDetailsRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateRepository.java new file mode 100644 index 0000000..43201d5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasImportTemplateRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.template.BasImportTemplate; +import org.springframework.stereotype.Repository; + +/** + * @Description : 导入模板数据操作仓库 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-04-16 10:00 + * @Modify: + **/ +@Repository +public interface BasImportTemplateRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomHistoryRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomHistoryRepository.java new file mode 100644 index 0000000..48e9727 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomHistoryRepository.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.WmsBomHistory; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsBomHistoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustWindowRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustWindowRepository.java new file mode 100644 index 0000000..986645f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustWindowRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsCustWindow; +import org.springframework.stereotype.Repository; + +/** + * @Description : 客户窗口时间 + * @Reference : + * @Author : jason + * @CreateDate : 2020-04-14 + * @Modify: + **/ +@Repository +public interface WmsCustWindowRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartShippingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartShippingRepository.java new file mode 100644 index 0000000..c930217 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsCustomerPartShippingRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsCustomerPartShipping; +import org.springframework.stereotype.Repository; + +/** + * @Description : 客户物料发往地 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Repository +public interface WmsCustomerPartShippingRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoDetailsRepository.java new file mode 100644 index 0000000..6d47563 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoDetailsRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocSoDetails; + +/** + * @Description : 销售订单明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-13 14:53 + * @Modify: + **/ +public interface WmsDocSoDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoMasterRepository.java new file mode 100644 index 0000000..e09b4d7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoMasterRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocSoMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description : 销售订单主表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-13 14:52 + * @Modify: + **/ +@Repository +public interface WmsDocSoMasterRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartExtendRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartExtendRepository.java new file mode 100644 index 0000000..9a00bb0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartExtendRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartExtend; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-09 + * @Modify: + **/ +@Repository +public interface WmsPartExtendRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSubPartRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSubPartRepository.java new file mode 100644 index 0000000..73da0eb --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSubPartRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsSubPart; +import org.springframework.stereotype.Repository; + +/** + * @Description : 替代料 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-14 + * @Modify: + **/ +@Repository +public interface WmsSubPartRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPlannerRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPlannerRepository.java new file mode 100644 index 0000000..55676e3 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorPlannerRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsVendorPlanner; +import org.springframework.stereotype.Repository; + +/** + * @Description : 供应商计划员 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Repository +public interface WmsVendorPlannerRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorRelationRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorRelationRepository.java new file mode 100644 index 0000000..a0c3c6b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorRelationRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsVendorRelation; +import org.springframework.stereotype.Repository; + +/** + * @Description : 供应商父子关系 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Repository +public interface WmsVendorRelationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorWindowRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorWindowRepository.java new file mode 100644 index 0000000..1329841 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsVendorWindowRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsVendorWindow; +import org.springframework.stereotype.Repository; + +/** + * @Description : 供应商窗口时间 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-04-11 + * @Modify: + **/ +@Repository +public interface WmsVendorWindowRepository 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 d07d0b9..745b319 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 @@ -7,101 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.util.StringUtil; -import cn.estsh.i3plus.pojo.wms.bean.BasCustomer; -import cn.estsh.i3plus.pojo.wms.bean.BasVendor; -import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails; -import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster; -import cn.estsh.i3plus.pojo.wms.bean.SwebProcurementPlanOrder; -import cn.estsh.i3plus.pojo.wms.bean.WareHouse; -import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroup; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionGroupDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionLog; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionModule; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionModuleParam; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionStep; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCall; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepCallParam; -import cn.estsh.i3plus.pojo.wms.bean.WmsActionStepType; -import cn.estsh.i3plus.pojo.wms.bean.WmsAreaOwner; -import cn.estsh.i3plus.pojo.wms.bean.WmsBom; -import cn.estsh.i3plus.pojo.wms.bean.WmsBusiType; -import cn.estsh.i3plus.pojo.wms.bean.WmsCSFactTrans; -import cn.estsh.i3plus.pojo.wms.bean.WmsCSLocate; -import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsCSPart; -import cn.estsh.i3plus.pojo.wms.bean.WmsCSRange; -import cn.estsh.i3plus.pojo.wms.bean.WmsCSZone; -import cn.estsh.i3plus.pojo.wms.bean.WmsCheckFactRecord; -import cn.estsh.i3plus.pojo.wms.bean.WmsConfig; -import cn.estsh.i3plus.pojo.wms.bean.WmsDataAuth; -import cn.estsh.i3plus.pojo.wms.bean.WmsDataMigrationConfig; -import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementSn; -import cn.estsh.i3plus.pojo.wms.bean.WmsFGInStock; -import cn.estsh.i3plus.pojo.wms.bean.WmsFix; -import cn.estsh.i3plus.pojo.wms.bean.WmsIbCheckPlan; -import cn.estsh.i3plus.pojo.wms.bean.WmsLineLocatePart; -import cn.estsh.i3plus.pojo.wms.bean.WmsLocate; -import cn.estsh.i3plus.pojo.wms.bean.WmsLocatePart; -import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsMoveMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn; -import cn.estsh.i3plus.pojo.wms.bean.WmsOpType; -import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsPOMasterDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsPackage; -import cn.estsh.i3plus.pojo.wms.bean.WmsPart; -import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup; -import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroupDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroupRoute; -import cn.estsh.i3plus.pojo.wms.bean.WmsPartRelation; -import cn.estsh.i3plus.pojo.wms.bean.WmsPoSn; -import cn.estsh.i3plus.pojo.wms.bean.WmsPrinterConfigure; -import cn.estsh.i3plus.pojo.wms.bean.WmsPrintingQueue; -import cn.estsh.i3plus.pojo.wms.bean.WmsProdCfgType; -import cn.estsh.i3plus.pojo.wms.bean.WmsPullRule; -import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsPullTaskMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsQCDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsQCMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsQCTrans; -import cn.estsh.i3plus.pojo.wms.bean.WmsRouting; -import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingAssign; -import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingDetail; -import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingMaster; -import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingRule; -import cn.estsh.i3plus.pojo.wms.bean.WmsShift; -import cn.estsh.i3plus.pojo.wms.bean.WmsShiftRest; -import cn.estsh.i3plus.pojo.wms.bean.WmsShipping; -import cn.estsh.i3plus.pojo.wms.bean.WmsShippingFlag; -import cn.estsh.i3plus.pojo.wms.bean.WmsSnOperateRecord; -import cn.estsh.i3plus.pojo.wms.bean.WmsSnPrint; -import cn.estsh.i3plus.pojo.wms.bean.WmsSnPrintRcd; -import cn.estsh.i3plus.pojo.wms.bean.WmsStockInitialize; -import cn.estsh.i3plus.pojo.wms.bean.WmsStockQuan; -import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; -import cn.estsh.i3plus.pojo.wms.bean.WmsTaskCreateLog; -import cn.estsh.i3plus.pojo.wms.bean.WmsTaskDetails; -import cn.estsh.i3plus.pojo.wms.bean.WmsTaskInfo; -import cn.estsh.i3plus.pojo.wms.bean.WmsTaskSrc; -import cn.estsh.i3plus.pojo.wms.bean.WmsTempOrderLock; -import cn.estsh.i3plus.pojo.wms.bean.WmsTerminal; -import cn.estsh.i3plus.pojo.wms.bean.WmsTransModule; -import cn.estsh.i3plus.pojo.wms.bean.WmsTransQuan; -import cn.estsh.i3plus.pojo.wms.bean.WmsTransType; -import cn.estsh.i3plus.pojo.wms.bean.WmsTransportRule; -import cn.estsh.i3plus.pojo.wms.bean.WmsUnit; -import cn.estsh.i3plus.pojo.wms.bean.WmsUnitConvert; -import cn.estsh.i3plus.pojo.wms.bean.WmsVendorPart; -import cn.estsh.i3plus.pojo.wms.bean.WmsWaveRule; -import cn.estsh.i3plus.pojo.wms.bean.WmsZonePart; -import cn.estsh.i3plus.pojo.wms.bean.WmsZones; +import cn.estsh.i3plus.pojo.wms.bean.*; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsFieldInfo; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction; import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin; @@ -2341,6 +2247,111 @@ public class WmsHqlPack { } /** + * 物料扩展属性 + * + * @param partExtend + * @return + */ + public static DdlPackBean packHqlWmsPartExtendByPart(WmsPartExtend partExtend) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(partExtend.getPartNo(), "partNo", packBean); + getStringBuilderPack(partExtend, packBean); + + return packBean; + } + + /** + * 替代料 条件封装 + * + * @param subPart + * @return + */ + public static DdlPackBean packHqlWmsSubPartByPart(WmsSubPart subPart) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(subPart.getPartNo(), "partNo", packBean); + getStringBuilderPack(subPart, packBean); + + return packBean; + } + + /** + * 供应商窗口时间 条件封装 + * + * @param vendorWindow + * @return + */ + public static DdlPackBean packHqlWmsVendorWindow(WmsVendorWindow vendorWindow) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(vendorWindow.getVendorNo(), "vendorNo", packBean); + getStringBuilderPack(vendorWindow, packBean); + + return packBean; + } + + /** + * 供应商窗口时间 条件封装 + * + * @param custWindow + * @return + */ + public static DdlPackBean packHqlWmsCustWindow(WmsCustWindow custWindow) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(custWindow.getCustNo(), "custNo", packBean); + getStringBuilderPack(custWindow, packBean); + + return packBean; + } + + /** + * 客户物料发往地 条件封装 + * + * @param shipping + * @return + */ + public static DdlPackBean packHqlWmsCustomerPartShipping(WmsCustomerPartShipping shipping) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(shipping.getCustomerCode(), "customerCode", packBean); + getStringBuilderPack(shipping, packBean); + + return packBean; + } + + /** + * 供应商父子关系 条件封装 + * + * @param vendorPlanner + * @return + */ + public static DdlPackBean packHqlWmsVendorPlanner(WmsVendorPlanner vendorPlanner) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(vendorPlanner.getVendorNo(), "vendorNo", packBean); + getStringBuilderPack(vendorPlanner, packBean); + + return packBean; + } + + /** + * 供应商父子关系 条件封装 + * + * @param vendorRelation + * @return + */ + public static DdlPackBean packHqlWmsVendorRelation(WmsVendorRelation vendorRelation) { + + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(vendorRelation.getVendorNo(), "vendorNo", packBean); + getStringBuilderPack(vendorRelation, packBean); + + return packBean; + } + + /** * 单位定义 * * @param wmsUnit @@ -3033,4 +3044,42 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result; } + + /** + * SO订单主表信息 分页查询 + * + * @param wmsDocSoMaster + * @return + */ + public static DdlPackBean packHqlWmsDocSoMaster(WmsDocSoMaster wmsDocSoMaster) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringRightLikerPack(wmsDocSoMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoMaster.getCustCode(), "custCode", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoMaster.getCustDeliveryCode(), "custDeliveryCode", result); + DdlPreparedPack.getNumEqualPack(wmsDocSoMaster.getOrderStatus(), "orderStatus", result); + getStringBuilderPack(wmsDocSoMaster, result); + + return result; + } + + /** + * SO订单明细表 分页查询 + * + * @param wmsDocSoDetails + * @return + */ + public static DdlPackBean packHqlWmsDocSoDetails(WmsDocSoDetails wmsDocSoDetails) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsDocSoDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoDetails.getPartNameRdd(), "partNameRdd", result); + + getStringBuilderPack(wmsDocSoDetails, result); + + return result; + } } diff --git a/pom.xml b/pom.xml index ff1cd2d..1bef72c 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,7 @@ modules/i3plus-pojo-aps modules/i3plus-pojo-lac modules/i3plus-pojo-ptl + modules/i3plus-pojo-ics @@ -58,7 +59,20 @@ io.springfox springfox-swagger2 2.9.2 + + + io.swagger + swagger-models + + + + + io.swagger + swagger-models + 1.5.21 + + io.springfox springfox-swagger-ui diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..55e4e84 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-DEV-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./