From 1051b225750b454726576857c09d11b48ee17d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Fri, 10 Apr 2020 20:38:35 +0800 Subject: [PATCH 01/10] =?UTF-8?q?ICS=20=E6=B3=A8=E5=86=8C=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E7=9B=91=E6=8E=A7=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-base/pom.xml | 1 + .../i3plus/pojo/base/bean/BaseResultBean.java | 45 +++++- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 171 ++++++++++++++++++++- .../estsh/i3plus/pojo/form/bean/BfElementGrid.java | 4 + modules/i3plus-pojo-ics/pom.xml | 22 +++ .../i3plus/pojo/ics/bean/IcsActuatorMetrics.java | 39 +++++ .../estsh/i3plus/pojo/ics/bean/IcsApplication.java | 72 +++++++++ .../cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java | 37 +++++ .../i3plus/pojo/ics/bean/IcsInstanceDetail.java | 54 +++++++ .../pojo/ics/bean/IcsInstanceMemoryHeap.java | 27 ++++ .../pojo/ics/bean/IcsInstanceMemoryNonHeap.java | 30 ++++ .../i3plus/pojo/ics/bean/IcsInstanceThread.java | 27 ++++ .../cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java | 68 ++++++++ .../pojo/model/form/FormOperateDataModel.java | 6 +- .../pojo/model/platform/MissResourceModel.java | 8 + pom.xml | 14 ++ 16 files changed, 620 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-ics/pom.xml create mode 100644 modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsActuatorMetrics.java create mode 100644 modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsApplication.java create mode 100644 modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstance.java create mode 100644 modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceDetail.java create mode 100644 modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryHeap.java create mode 100644 modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceMemoryNonHeap.java create mode 100644 modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsInstanceThread.java create mode 100644 modules/i3plus-pojo-ics/src/main/java/cn/estsh/i3plus/pojo/ics/bean/IcsRegist.java 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 5dbc9ec..65df651 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-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-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/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 From 214fbb8da2acf336fb62adef0287b92874254355 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 14 Apr 2020 10:28:02 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E3=80=901613=20=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E=E4=B8=AD=E8=88=AA=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java | 10 + .../i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 24 ++ .../pojo/wms/bean/WmsTmsShippingExtDetail.java | 304 +++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java | 148 ++++++++++ .../i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java | 23 ++ .../modelbean/WmsTmsShippingExtDeatilModel.java | 41 +++ .../pojo/wms/modelbean/WmsTmsShippingExtModel.java | 133 +++++++++ .../IWmsTmsShippingExtDetailRepository.java | 17 ++ .../repository/IWmsTmsShippingExtSnRepository.java | 17 ++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 116 +++++++- 10 files changed, 831 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtDeatilModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java 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 7223d70..3561345 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 @@ -53,41 +53,51 @@ public class WmsCsStrategy extends BaseBean implements Serializable { @Column(name = "CYCLE_RULE") @ApiParam(value = "循环规则") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String cycleRule; @Column(name = "START_DATE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "开始日期", example = "0") private String startDate; @Column(name = "END_DATE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "结束日期", example = "0") private String endDate; @Column(name = "NUM_MAX") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "明细数量上限") private Integer numMax; @Column(name = "COVERAGE_RATE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "抽盘覆盖率") private Double coverageRate; @Column(name = "ZONE_NOS") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "存储区") private String zoneNos; @Column(name = "LOCATES") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "盘点库位") private String locates; @Column(name = "last_run_time") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "上次运行时间") private String lastRunTime; @Column(name = "next_run_time") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "下次运行时间") private String nextRunTime; @Column(name = "REMAKE") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "备注") private String remake; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index c0cbe93..bf0c626 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -116,4 +116,28 @@ public class WmsTmsShippingExt extends BaseBean { @Transient @ApiParam("打印模板列表") private List shipModels; + + //需求仓库-目的仓库 + @Column(name="DESC_WAREHOUSE") + @ApiParam("目的仓库") + private String descWarehouse; + + //承运商-物流供应商 + @Column(name="LOGISTICS_VENDOR_NO") + @ApiParam("物流供应商") + private String logisticsVendorNo; + + //运输方式-单据运输方式（维护内容） + @Column(name="DOCUMENT_TRANSPORT_METHOD") + @ApiParam("单据运输方式") + private Integer documentTransportMethod; + + //是否不良品调拨—调拨单录入字段 + @Column(name="DEFECTIVE_ALLOCATION") + @ApiParam("调拨单录入字段") + private String defectiveAllocation; + +// @Transient +// @ApiParam("打印模板列表") +// private String defectiveAllocation; } 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 new file mode 100644 index 0000000..c1013d5 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java @@ -0,0 +1,304 @@ +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 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; +import javax.persistence.Version; + +/** + * @Description : 车辆信息明细 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-12-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_TMS_SHIPPING_EXT_DETAIL") +@Api("装车单信息明细") +public class WmsTmsShippingExtDetail extends BaseBean { + private static final long serialVersionUID = -4800308354250386102L; + + @Column(name="MOVE_NO") + @ApiParam("装车单") + public String moveNo; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public String item; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name = "SRC_WH_NO") + @ApiParam("源仓库代码") + public String srcWhNo; + + @Column(name = "SRC_ZONE_NO") + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Column(name = "SRC_LOCATE_NO") + @ApiParam("源库位代码") + public String srcLocateNo; + + @Column(name = "DEST_WH_NO") + @ApiParam("目标仓库代码") + public String destWhNo; + + @Column(name = "DEST_ZONE_NO") + @ApiParam("目标存储区代码") + public String destZoneNo; + + @Column(name = "DEST_LOCATE_NO") + @ApiParam("目标库位代码") + public String destLocateNo; + + @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "条码打印数量", example = "1") + private Double printQty; + + @Column(name = "PLAN_DATE") + @ApiParam(value = "计划日期") + private String planDate; + + @Column(name = "PLAN_TIME") + @ApiParam(value = "计划时间") + private String planTime; + + @Column(name = "SRC_NO") + @ApiParam(value = "源单号") + private String srcNo; + /** + * 状态:N=正常,C=行取消 + */ + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + + /** + * 是否免费:0=计费,1=免费 + */ + @Column(name = "IS_FREE") + @ApiParam(value = "是否免费", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + public Integer isFree; + + @Column(name = "REMARK") + @ApiParam(value = "操作原因") + private String remark; + + @Column(name = "PICK_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "已拣货数量", example = "1") + private Double pickQty; + + @Column(name = "OUT_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "已出库数量", example = "1") + private Double outQty; + + @Column(name = "REC_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "已收货数量", example = "1") + private Double recQty; + + @Column(name = "MOVE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "已移库数量", example = "1") + private Double moveQty; + + @Column(name = "TASK_GENERATE_QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "任务生成数量", example = "1") + private Double taskGenerateQty; + + @Column(name = "SRC_AREA_NO") + @ApiParam("源库存地代码") + public String srcAreaNo; + + @Column(name = "DEST_AREA_NO") + @ApiParam("目的库存地代码") + public String destAreaNo; + + @Column(name = "LOT_NO") + @ApiParam("批次") + public String lotNo; + + @Column(name="SRC_ITEM", columnDefinition="varchar(50) default ''",nullable=false) + @ApiParam("源单行号") + public String srcItem; + + @Column(name = "CUST_ORDER_NO") + @ApiParam("客户订单号") + public String custOrderNo; + + @Column(name = "ASSIGN_DATE_CODE") + @ApiParam(value = "指定生产日期") + private String assignDateCode; + + @Transient + @ApiParam("实际批次") + private String actualLot; + + @Transient + @ApiParam("实际数量") + private Double actualQty; + + @Transient + @ApiParam("推荐批次") + private String recommondLot; + + @Transient + @ApiParam("推荐库位") + private String recommondLocateNo; + + @Transient + @ApiParam("前端表格编辑使用") + private Boolean isSet = false; + + @Transient + @ApiParam("生产日期") + public String dateCode; + + @ApiParam(value = "散件移库输入移库数量") + @Transient + public Double inputMoveQty; + + @Transient + @ApiParam(value = "标准包装", example = "1") + private Double snp; + + @Transient + @ApiParam(value = "条码总数量", example = "1") + private Double detailsSnCount; + + @Transient + @ApiParam(value = "余数", example = "1") + private Double restQty; + + @Transient + @ApiParam("任务状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") + private Integer isTask; + + @Transient + @ApiParam("主表单据状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + private Integer orderMasterStatus; + + @Transient + @ApiParam("打印状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") + private Integer printStatus; + + @Transient + @ApiParam("优先级") + private Integer priority; + + @Transient + @ApiParam(value = "汇总需求数量", example = "0") + public Double sumQty; + + @Transient + @ApiParam(value = "汇总拣货数量", example = "0") + public Double sumPickQty; + + @Transient + @ApiParam("执行状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description") + private Integer executeStatus; + + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; + + @Transient + @ApiParam("移动类型") + public Integer moveType; + + @Transient + @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + public Integer busiType; + + @Column(name = "IS_SN") + @ApiParam(value = "条码生成状态", example = "20") + public Integer isSn; + + + public WmsTmsShippingExtDetail () { + + } + + + public String getRecommondLot() { + return recommondLot == null ? "无" : this.recommondLot; + } + + public Double getQty() { + return qty == null ? 0D : this.qty.doubleValue(); + } + + public Double getOutQty() { + return outQty == null ? 0D : this.outQty.doubleValue(); + } + + public Double getPickQty() { + return pickQty == null ? 0D : this.pickQty.doubleValue(); + } + + public Double getActualQty() { + return actualQty == null ? 0D : this.actualQty.doubleValue(); + } + + public Double getRecQty() { + return recQty == null ? 0D : this.recQty.doubleValue(); + } + + public Integer getIsTaskVal() { + return isTask == null ? 0 : this.isTask.intValue(); + } + + public Integer getOrderMasterStatus() { + return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue(); + } + +} 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 new file mode 100644 index 0000000..8c415bd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java @@ -0,0 +1,148 @@ +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 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 : 车辆信息明细 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2019-12-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_TMS_SHIPPING_EXT_SN") +@Api("装车单条码明细") +public class WmsTmsShippingExtSn extends BaseBean { + + private static final long serialVersionUID = 5704546384179442907L; + + @Column(name="MOVE_NO") + @ApiParam("装车单") + public String moveNo; + + @Column(name="ORDER_NO") + @ApiParam("订单号") + public String orderNo; + + @Column(name="ITEM") + @ApiParam("行号") + public String item; + + @Column(name="PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name="QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "数量", example = "0") + public Double qty; + + + @Column(name="UNIT") + @ApiParam("单位") + public String unit; + + /** + * 状态：操作状态 itemStatus + */ + @Column(name="SN_STATUS") + @ApiParam(value = "操作状态", example = "10") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_SN_STATUS.class,refForeignKey = "value",value = "description") + public Integer snStatus; + + @Column(name="SN") + @ApiParam("条码") + public String sn; + + @Column(name = "VENDOR_NO") + @ApiParam(value = "供应商编码") + public String vendorNo; + + @Column(name = "SN_TYPE") + @ApiParam(value = "条码类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") + private Integer snType; + + @Transient + @ApiParam("前端表格编辑使用") + private Boolean isSet = false; + + @Transient + @ApiParam("目标库位代码") + public String destLocateNo; + + @Transient + @ApiParam("源库位代码") + public String srcLocateNo; + + @Transient + @ApiParam("生产日期") + public String dateCode; + + @ApiParam(value = "散件移库输入移库数量") + @Transient + public Double inputMoveQty; + + @Transient + @ApiParam("计划交货日期") + private String planDate; + + @Transient + @ApiParam("计划交货时间") + private String planTime; + + @Transient + @ApiParam("ERP库存地") + private String erpWhNo; + + @Transient + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + public Integer itemStatus; + + @Transient + @ApiParam("客户零件号") + private String customerPartNo; + + @Transient + @ApiParam("父层级packcode对应的可回用零件号") + private String parentReturnPart; + + + @Transient + @ApiParam("打印模板") + private String templateNo; + + @Transient + @ApiParam("剩余箱数量") + private Long countBox; + + public WmsTmsShippingExtSn(){} + + public WmsTmsShippingExtSn(Long countBox,String partNo) { + this.countBox = countBox; + this.partNo = partNo; + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java new file mode 100644 index 0000000..04c9772 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipBacthDto.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.wms.dto; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * @Description :装车单入参 + * @Reference : + * @Author : gcj + * @CreateDate : 2019-12-07 16:06 + * @Modify: + **/ +@Api("装车单批量入参") +@Data +public class WmsTmsShipBacthDto extends BaseDto implements Serializable { + @ApiParam("装车单集合") + private List wmsTmsShipDtoList=new ArrayList<>(); +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtDeatilModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtDeatilModel.java new file mode 100644 index 0000000..0aef73a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtDeatilModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; + +/** + * @Description :装车单打印输出model + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("静态盘点查询输出model") +public class WmsTmsShippingExtDeatilModel { + + @ApiParam(value ="零件号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam(value ="零件名称") + private String partNameRdd; + + @ApiParam("需求数量") + private Double qty; + + @ApiParam("发运数量") + private Double shippQty; + + @ApiParam("箱数") + private Integer boxQty; + + @ApiParam("标准包装") + private Double snp; + + @ApiParam("收货数量") + private String receivedQuantity=""; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java new file mode 100644 index 0000000..7ab26ec --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsTmsShippingExtModel.java @@ -0,0 +1,133 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import cn.estsh.i3plus.pojo.wms.bean.WmsTmsShippingExt; +import cn.estsh.i3plus.pojo.wms.dto.WmsTmsShipModel; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description :装车单打印输出model + * @Reference : + * @Author :QianHuaSheng + * @CreateDate : 2020-04-10 3:21 下午 + * @Modify: + **/ +@Data +@Api("静态盘点查询输出model") +public class WmsTmsShippingExtModel { + + @ApiParam(value = "移库单号") + private String moveNo=""; + + @ApiParam(value = "到货地点") + private String destination=""; + + @ApiParam(value = "接收人") + private String recUser=""; + + @ApiParam(value = "接收人电话") + private String recPhone=""; + + @ApiParam(value = "道口") + private String dockNo=""; + + @ApiParam(value = "承运商编号") + private String vendorNo=""; + + @ApiParam(value = "承运商名称RDD") + private String vendorName=""; + + @ApiParam(value = "驾驶员编号") + private String driverNo=""; + + @ApiParam(value = "驾驶员名称RDD") + private String driverName=""; + + @ApiParam(value = "驾驶员联系方式RDD") + private String phone=""; + + @ApiParam(value = "单据状态") + private Integer orderStatus=0; + + @ApiParam(value = "客户名称RDD") + private String custName=""; + + @ApiParam(value = "客户编号RDD") + private String custNo=""; + + @ApiParam(value = "车牌号RDD") + private String carNo=""; + + @ApiParam(value = "计划发车时间") + private String deliveryTime=""; + + @ApiParam(value = "要求到货时间") + private String arrivelTime=""; + + @ApiParam(value = " 申请部门") + private String depart=""; + + @ApiParam("物料编码") + private String partNo=""; + + @ApiParam("关联单号") + private String refOrderNo=""; + + @ApiParam("回执单地址") + private String pathUrl=""; + + @ApiParam("打印模板列表") + private List shipModels=new ArrayList<>(); + + //需求仓库-目的仓库 + @ApiParam("目的仓库") + private String descWarehouse=""; + + //承运商-物流供应商 + @ApiParam("物流供应商") + private String logisticsVendorNo=""; + + //运输方式-单据运输方式（维护内容） + @ApiParam("单据运输方式") + private Integer documentTransportMethod=0; + + //是否不良品调拨—调拨单录入字段 + @ApiParam("调拨单录入字段") + private String defectiveAllocation=""; + + @ApiParam("发运时间") + private String shippingTime=""; + + @ApiParam("发运人") + private String shippingUser=""; + + @ApiParam("下单日期") + private String orderDate=""; + + @ApiParam("模板编号") + private String templateNo=""; + + //装车单明细已物料区分 + @ApiParam("各个物料详情") + private List tmsShippingExtDeatilModels = new ArrayList<>(); + + public WmsTmsShippingExtModel() { + + } + + public WmsTmsShippingExtModel(WmsTmsShippingExt wmsTmsShippingExt) { + this.moveNo = wmsTmsShippingExt.getMoveNo(); + this.descWarehouse=wmsTmsShippingExt.getDescWarehouse(); + this.vendorName=wmsTmsShippingExt.getVendorName(); + this.documentTransportMethod=wmsTmsShippingExt.getDocumentTransportMethod(); + this.shippingTime=wmsTmsShippingExt.getCreateDatetime(); + this.shippingUser=wmsTmsShippingExt.getCreateUser(); + this.defectiveAllocation=wmsTmsShippingExt.getDefectiveAllocation(); + this.refOrderNo=wmsTmsShippingExt.getRefOrderNo(); + this.orderDate=wmsTmsShippingExt.getCreateDatetime(); + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.java new file mode 100644 index 0000000..4e8030b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtDetailRepository.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.WmsTmsShippingExtDetail; +import org.springframework.stereotype.Repository; + +/** +* @Description : 装车单明细 +* @Reference : +* @author: qianhuasheng +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsTmsShippingExtDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.java new file mode 100644 index 0000000..0a0065b --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/IWmsTmsShippingExtSnRepository.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.WmsTmsShippingExtSn; +import org.springframework.stereotype.Repository; + +/** +* @Description : 装车单条码明细 +* @Reference : +* @author: qianhuasheng +* @date: 2019/9/19 14:22 +* @Modify: +*/ + +@Repository +public interface IWmsTmsShippingExtSnRepository 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 17793d9..d07d0b9 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,7 +7,101 @@ 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.*; +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.dynamictable.WmsFieldInfo; import cn.estsh.i3plus.pojo.wms.bean.dynamictable.WmsSearchElementFunction; import cn.estsh.i3plus.pojo.wms.bean.plugin.BasPlugin; @@ -18,7 +112,11 @@ import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; /** @@ -2921,4 +3019,18 @@ public class WmsHqlPack { getStringBuilderPack(wmsTransportRule, result); return result; } + + /** + * 获取 DdlPackBean(三个基础) + * + * @param organizeCode + * @return + */ + public static DdlPackBean packHqlWms(String organizeCode) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + return result; + } } From 1caea6bf365229040ee1f3054d3ba8ba0d1ba9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Tue, 14 Apr 2020 10:34:14 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index 1cb16f8..2e166b2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -43,7 +43,6 @@ public class AmpJisRec extends BaseBean { public String partNameRdd; @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) - @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; From 99e055da3ce1e08fa62bb4beebe7395ba09a168e Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 14 Apr 2020 10:46:02 +0800 Subject: [PATCH 04/10] =?UTF-8?q?[=E7=8E=B0=E5=9C=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=9A111=20=E6=A3=80=E6=B5=8B=E9=A1=B9=E6=8A=A5=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java index e568519..b4f282e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QcCheckDataModel.java @@ -132,7 +132,7 @@ public class QcCheckDataModel { } public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, String partNo, String workCenterCode - , String workCellCode, String partName, String modifyUser, String modifyDatetime, String startTime, String endTime) { + , String workCellCode, String partName, String modifyUser, String modifyDatetime, String startTime, String endTime, String orderNo) { this.id = id; this.organizeCode = organizeCode; this.createUser = createUser; @@ -145,6 +145,7 @@ public class QcCheckDataModel { this.modifyDatetime = modifyDatetime; this.startTime = startTime; this.endTime = endTime; + this.orderNo = orderNo; } public QcCheckDataModel(Long id, String organizeCode, String createUser, String createDatetime, Integer checkType) { From cc739eac249dc738b6a22178bbc5a36615be643c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 14 Apr 2020 11:30:52 +0800 Subject: [PATCH 05/10] =?UTF-8?q?task=20`1565`=20=E5=8F=91=E8=BF=90pojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 48 ++++++++++++++++++++-- .../pojo/mes/bean/MesStateMachineStatus.java | 4 ++ .../i3plus/pojo/mes/model/StationRequestBean.java | 6 +-- 3 files changed, 52 insertions(+), 6 deletions(-) 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 4140949..178f794 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 @@ -3351,20 +3351,26 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STATION_REQUEST_BEAN_CMD { - JUMP_STATUS(10, "跳过状态点"), - FORCE_DO_SPEC_STATUS(20, "强制执行制定的状态点"); + JUMP_STATE(10, "JUMP_STATE", "跳过状态点"), + FORCE_STATE(20, "FORCE_STATE", "强制执行制定的状态点"); private int value; + private String code; private String description; - STATION_REQUEST_BEAN_CMD(int value, String description) { + STATION_REQUEST_BEAN_CMD(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; @@ -3453,4 +3459,40 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 状态机流程加载类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOAD_FSM_ROUTE_TYPE { + + BY_PART("0", "通过物料号加载"), + BY_AUTO("1", "自动加载"); + + private String value; + private String description; + + LOAD_FSM_ROUTE_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String 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.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index 421dbcb..f7999d6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -33,6 +33,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable { @ApiParam("状态机代码") private String smCode; + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + @Column(name = "STATUS_CODE") @ApiParam("状态代码") private String statusCode; 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 6d7321b..441da23 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 @@ -1,10 +1,7 @@ package cn.estsh.i3plus.pojo.mes.model; -import cn.estsh.i3plus.pojo.mes.bean.MesRouteStatus; import cn.estsh.i3plus.pojo.mes.bean.MesStateMachineStatus; -import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -34,6 +31,9 @@ public class StationRequestBean implements Serializable { @ApiParam("物料号") private String partNo; + @ApiParam("生产类型") + private String pptCode; + @ApiParam("组织代码") private String organizeCode; From 9e0fbef169bdfb32e289b98f6df2a8f0d6ba8cf2 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 14 Apr 2020 15:48:22 +0800 Subject: [PATCH 06/10] =?UTF-8?q?[=E6=8C=89=E9=92=AE=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java | 3 +++ 1 file changed, 3 insertions(+) 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; + } From b02d7372f6192add0e8d4ab8f6ca63257e4d4f36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Tue, 14 Apr 2020 19:38:58 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=A3=E4=BB=B6bom?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/ImportBomExcelDataModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } From 34c77d6944455e243fa71fb3b12ec092f0e7b4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 15 Apr 2020 14:52:36 +0800 Subject: [PATCH 08/10] =?UTF-8?q?ICS=20=E6=B3=A8=E5=86=8C=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E7=9B=91=E6=8E=A7=E6=8E=A5=E5=8F=A3=EF=BC=8CActuator?= =?UTF-8?q?=E5=AF=B9=E5=A4=96=E7=AB=AF=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/form/BfButtonOperateDataModel.java | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/BfButtonOperateDataModel.java 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; +} From 93622f5dc78e5df1e48def54621c3bc2efaeff12 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 15 Apr 2020 15:31:10 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=B8=AD=E8=88=AA=20=E5=BC=80=E7=BA=BF?= =?UTF-8?q?=E7=AE=A1=E6=8E=A7=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java | 4 ++++ .../i3plus/pojo/mes/bean/MesWcCheckRecord.java | 4 ++++ .../cn/estsh/i3plus/pojo/mes/model/StateModel.java | 21 +++++++++++++++++++++ .../i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ 4 files changed, 32 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StateModel.java 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/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; From 0e934f9af6531b5db21d0459eafde480dd124141 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Wed, 15 Apr 2020 15:47:55 +0800 Subject: [PATCH 10/10] =?UTF-8?q?task=20`1565`=20=E5=8F=91=E8=BF=90enum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) 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; + } + } }