From 3069c5bf1818c9909271520bf0379d94c2fc00bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 31 Mar 2020 19:36:49 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/form/sqlpack/FormHqlPack.java | 33 ++++++++ .../estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 15 ++++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 94 +++++++++++++--------- .../pojo/softswitch/bean/BsSuitDataDetail.java | 2 + .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 2 + .../pojo/softswitch/bean/BsSuitRequestRecord.java | 1 + .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 3 + 7 files changed, 111 insertions(+), 39 deletions(-) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 0d1249d..2ec710e 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -179,6 +179,7 @@ public final class FormHqlPack { DdlPreparedPack.getStringLikerPack(bfIntercept.getInterceptName(), "interceptName", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getExecuteMode(), "executeMode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfIntercept.getExecuteContent(),"executeContent",ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getInterceptStatus(), "interceptStatus", ddlPackBean); DdlPreparedPack.getNumEqualPack(bfIntercept.getIsDeleted(), "isDeleted", ddlPackBean); ddlPackBean.setOrderByStr(bfIntercept.orderBy()); @@ -324,6 +325,9 @@ public final class FormHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(source.getSourceHost(), "sourceHost", ddlPackBean); + DdlPreparedPack.getStringLikerPack(source.getSourceName(), "sourceName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(source.getSourceCode(), "sourceCode", ddlPackBean); + DdlPreparedPack.getStringLikerPack(source.getSourceDataBaseName(), "sourceDataBaseName", ddlPackBean); DdlPreparedPack.getNumEqualPack(source.getSourceType(), "sourceType", ddlPackBean); DdlPreparedPack.getNumEqualPack(source.getSourceStatus(), "sourceStatus", ddlPackBean); @@ -383,4 +387,33 @@ public final class FormHqlPack { return ddlPackBean; } + /** + * 数据对象查询条件拼接 + * @param bfDataObject + * @return + */ + public static DdlPackBean packHqlBfDataObject(BfDataObject bfDataObject){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectName(), "objectName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfDataObject.getObjectClassName(), "objectClassName", ddlPackBean); + + return ddlPackBean; + } + + + /** + * 数据对象查询条件拼接 + * @param bfCascade + * @return + */ + public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean); + + return ddlPackBean; + } + } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index 1a691aa..a315c8c 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -73,6 +73,7 @@ public class LacHqlPack { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(bean.getTemplateCode(), "templateCode", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bean.getTemplateName(), "templateName", ddlPackBean); return ddlPackBean; } @@ -163,6 +164,10 @@ public class LacHqlPack { public static DdlPackBean packHqlLacCommandStackRecord(LacCommandStackRecord bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(bean.getStackStatus(), "stackStatus", ddlPackBean); + DdlPreparedPack.timeBuilder(bean.getStackStartTime(), "stackStartTime", ddlPackBean,false, true); + + return ddlPackBean; } @@ -190,4 +195,14 @@ public class LacHqlPack { DdlPreparedPack.getNumNOEqualPack(lacTaskCheck.getId(),"id",ddlPackBean); return ddlPackBean; } + + public static DdlPackBean packHqlLacSuitCase(LacSuitCase bean) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean); + + DdlPreparedPack.getStringLikerPack(bean.getSutiCaseNameRdd(),"sutiCaseNameRdd",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bean.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getSutiType(),"id",ddlPackBean); + + return ddlPackBean; + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 51429a6..7891cdb 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -306,18 +306,19 @@ public class CoreHqlPack { * @param config * @return */ - public static String packHqlSysConfig(SysConfig config) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysConfig(SysConfig config) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - HqlPack.getStringLikerPack(config.getName(),"name",result); - HqlPack.getStringLikerPack(config.getConfigCode(),"configCode",result); - HqlPack.getNumEqualPack(config.getConfigType(),"configType",result); + DdlPreparedPack.getStringLikerPack(config.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(config.getConfigCode(),"configCode",result); + DdlPreparedPack.getNumEqualPack(config.getConfigType(),"configType",result); + DdlPreparedPack.getNumEqualPack(config.getConfigGroup(), "configGroup", result); // 添加默认排序 - HqlPack.getOrderDefault(config); + DdlPreparedPack.getOrderDefault(config); - return result.toString(); + return result; } /** @@ -337,7 +338,8 @@ public class CoreHqlPack { DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); } DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); - DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result); + DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(), "parentCodeRdd", result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // 添加默认排序 DdlPreparedPack.getOrderDefault(dictionary); @@ -407,7 +409,7 @@ public class CoreHqlPack { DdlPreparedPack.getNumEqualPack(message.getIsUrgent(), "isUrgent", ddlPackBean); DdlPreparedPack.getNumEqualPack(message.getMessageSoftType(), "messageSoftType", ddlPackBean); - ddlPackBean.setOrderByStr(message.orderBy()); + DdlPreparedPack.getOrderDefault(message); return ddlPackBean; } @@ -417,19 +419,21 @@ public class CoreHqlPack { * @param file * @return */ - public static String packHqlSysFile(SysFile file) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysFile(SysFile file) { + DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - HqlPack.getStringLikerPack(file.getFileOriginalName(),"fileOriginalName",result); - HqlPack.getNumEqualPack(file.getFileTypeId(),"fileTypeId",result); - HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result); - HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false); + DdlPreparedPack.getStringLikerPack(file.getFileOriginalName(), "fileOriginalName", result); + DdlPreparedPack.getNumEqualPack(file.getFileTypeId(), "fileTypeId", result); + DdlPreparedPack.getStringLikerPack(file.getCreateUser(), "createUser", result); + DdlPreparedPack.getNumEqualPack(file.getFileSoftType(), "fileSoftType", result); + DdlPreparedPack.getStringLikerPack(file.getFileCode(), "fileCode", result); + DdlPreparedPack.timeBuilder(file.getCreateDatetime(), "createDatetime", result, false, false); // 添加默认排序 - HqlPack.getOrderDefault(file); + DdlPreparedPack.getOrderDefault(file); - return result.toString(); + return result; } /** @@ -455,20 +459,22 @@ public class CoreHqlPack { * @param sysTaskPlan * @return */ - public static String packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysTaskPlan(SysTaskPlan sysTaskPlan){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); // hql拼接 - HqlPack.getStringLikerPack(sysTaskPlan.getName(),"name",result); - HqlPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result); - HqlPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result); - HqlPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result); - HqlPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getStringLikerPack(sysTaskPlan.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(sysTaskPlan.getGroupName(),"groupName",result); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskPlanStatus(),"taskPlanStatus",result); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskCycleId(),"taskCycleId",result); + DdlPreparedPack.getStringEqualPack(sysTaskPlan.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getNumEqualPack(sysTaskPlan.getTaskSoftTypeRdd(), "taskSoftTypeRdd", result); + DdlPreparedPack.timeBuilder(sysTaskPlan.getLastRunDateTime(), "lastRunDateTime", result, false, true); // 添加默认排序 - HqlPack.getOrderDefault(sysTaskPlan); + DdlPreparedPack.getOrderDefault(sysTaskPlan); - return result.toString(); + return result; } /** @@ -738,18 +744,23 @@ public class CoreHqlPack { * @param orderNoRule * @return */ - public static String packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysOrderNoRule(SysOrderNoRule orderNoRule){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); - HqlPack.getStringLikerPack(orderNoRule.getName(),"name",result); - HqlPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); - HqlPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result); - HqlPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getName(),"name",result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); + DdlPreparedPack.getNumEqualPack(orderNoRule.getOrderNoRuleStatus(),"orderNoRuleStatus",result); + DdlPreparedPack.getNumEqualPack(orderNoRule.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); + DdlPreparedPack.getStringLikerPack(orderNoRule.getOrderNo(),"orderNo",result); + if (orderNoRule.getSerialNo() != null) { + DdlPreparedPack.getStringLikerPack(String.valueOf(orderNoRule.getSerialNo()), "orderNoRuleCode", result); + } // 添加默认排序 - HqlPack.getOrderDefault(orderNoRule); + DdlPreparedPack.getOrderDefault(orderNoRule); - return result.toString(); + return result; } /** @@ -779,13 +790,18 @@ public class CoreHqlPack { * @param sysTask * @return */ - public static String packHqlSysTask(SysTask sysTask){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysTask(SysTask sysTask){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); - HqlPack.getStringLikerPack(sysTask.getName(),"name",result); - HqlPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getStringLikerPack(sysTask.getName(),"name",result); + DdlPreparedPack.getStringEqualPack(sysTask.getOrganizeCode(),"organizeCode",result); + DdlPreparedPack.getNumEqualPack(sysTask.getTaskSoftType(),"taskSoftType",result); + DdlPreparedPack.getStringLikerPack(sysTask.getTaskPackage(),"taskPackage",result); + DdlPreparedPack.getStringLikerPack(sysTask.getTaskClass(),"taskClass",result); - return result.toString(); + DdlPreparedPack.getOrderDefault(sysTask); + + return result; } public static String packHqlSysLocaleLanguageExistDefaultByIds(Long[] ids){ diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java index 23db18b..8dcb4f6 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -68,11 +68,13 @@ public class BsSuitDataDetail extends BaseBean { @ApiParam(value = "获取报文时间") private String getDateTime; + // 移动至记录数据表 @Lob @Column(name = "ORGIN_DATA") @ApiParam(value = "原始报文数据") private String orginData; + // 移动至记录数据表 @Lob @Column(name = "TRANS_DATA") @ApiParam(value = "转换后的报文数据") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 7757888..66d428a 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -90,6 +90,7 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "认证结果") private Integer suitSslKeyResult; + // 移动至记录数据表 @Column(name = "SUIT_SSL_KEY_RESULT_MESSAGE") @ApiParam(value = "认证信息") private String suitSslKeyResultMessage; @@ -111,6 +112,7 @@ public class BsSuitRecord extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long executeTime; + // 移动至记录数据表 @Lob @Column(name = "SUIT_MESSAGE") @ApiParam(value = "适配信息") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java index b699e9b..e89b27e 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java @@ -44,6 +44,7 @@ public class BsSuitRequestRecord extends BaseBean { @ApiParam(value = "请求来源(枚举)") private Integer requestSource; + // 移动至记录数据表 @Lob @Column(name = "REQUEST_ORGIN_PARAM") @ApiParam(value = "请求原始参数") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 6bf3024..a4d0bb7 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -325,6 +325,8 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(),"processState",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitResult(),"suitResult",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitRecord.getProcessState(), "processState", ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true); @@ -343,6 +345,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getCaseTypeId(), "caseTypeId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getProcessState(),"processState",ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitDataDetail.getGetDateTime(), "getDateTime", ddlPackBean, false, true); DdlPreparedPack.timeBuilder(bsSuitDataDetail.getProcessTime(), "processTime", ddlPackBean, false, true); From f8405b87d9c3c32ac54013ee5f40e4938bd8f2eb Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 1 Apr 2020 09:29:31 +0800 Subject: [PATCH 02/22] =?UTF-8?q?bug7940=E3=80=907940=20=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=85=A5=E5=BA=93-=E6=9C=AA=E6=8C=89=E6=9C=80=E8=BF=91?= =?UTF-8?q?=E8=B7=9D=E7=A6=BB=E6=8E=A8=E8=8D=90=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) 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 4fd1ad6..9eab3f2 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 @@ -5301,4 +5301,44 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 推送类型单位 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QAD_DOC_TYPE { + TYPE_S(10, "s","s"), TYPE_D(20, "d","d"); + + private int value; + private String code; + private String description; + + public String getCode() { + return code; + } + + QAD_DOC_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 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; + } + } } \ No newline at end of file From 078e1a77a4732fa86e27d736bdc091f25d1ccf1f Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 1 Apr 2020 13:18:19 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E3=80=90bug=207895=20PLC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF-=E9=A1=B5=E9=9D=A2=E9=9C=80=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java | 7 ++++++- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java index 1ad0189..9ea903c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import java.io.Serializable; /** @@ -92,6 +93,9 @@ public class MesPlcModel implements Serializable { @ApiParam("对象代码") private String objectCode; + @ApiParam("OPCUA路径") + private String opcUrl; + public MesPlcModel() { } @@ -99,7 +103,7 @@ public class MesPlcModel implements Serializable { public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel, String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName, - String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode) { + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode, String opcUrl) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -126,5 +130,6 @@ public class MesPlcModel implements Serializable { this.isAnalysis = isAnalysis; this.device = device; this.objectCode = objectCode; + this.opcUrl = opcUrl; } } 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 15b53e4..d217cfb 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 @@ -1079,6 +1079,9 @@ public class MesHqlPack { */ public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) { DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode); + if (!StringUtils.isEmpty(workCellParamCfg.getWorkCenterCode())) { + DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCenterCode(), "workCenterCode", packBean); + } if (!StringUtils.isEmpty(workCellParamCfg.getWorkCellCode())) { DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean); } From 73f647e3b4300471d23bd047895eb687c0cba83a Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 1 Apr 2020 14:06:50 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 c594693..2b86276 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 @@ -3052,7 +3052,8 @@ public class MesEnumUtil { ATTEMPT_ORDER(30, "试制工单"), BH_ORDER(40, "B&H工单"), JIT_ORDER(50, "JIT工单"), - STOCK_ORDER(60, "库存工单"); + STOCK_ORDER(60, "库存工单"), + REPAIR(70,"返修插单"); private int value; private String description; From aeda8d8287c333704e82318b23973cecbd9ae864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 1 Apr 2020 14:07:09 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 335f882..fe8e4eb 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 7d63653..f1e9991 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 284f019..9f54aca 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 63c691b..65c6554 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 35c0762..0f73e78 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index cbdf688..7e73285 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 51958ba..232becd 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index a0cbb85..e65f727 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 1c38fc4..552f97e 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 9c029b3..beba8ba 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 876096e..8f191db 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index c56e1c6..f0a5b7e 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 4e4a397..d9d461d 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 442875c..309d149 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 8573c4e..f34bc03 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index a578bda..f9e982f 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 067d448..3b96564 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-${profileActive}-SNAPSHOT + 1.0-SNAPSHOT ../../pom.xml 4.0.0 From 3654d602146cec06338c0e197807f07880c50022 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 1 Apr 2020 15:12:26 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E3=80=90bug7947=E3=80=91PLC=E7=9B=91?= =?UTF-8?q?=E5=90=AC=E5=B7=A5=E6=AD=A5=E8=A3=85=E9=98=9F=E5=88=97=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.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/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 0aef82a..d1e1299 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 @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -101,7 +102,7 @@ public class StationRequestBean implements Serializable { private String queueGroupNo; @ApiParam("数据map") - private Map dataMap; + private Map dataMap=new HashMap<>(); @ApiParam("流程状态集合") private List routeStatusList; From 83d7a618bf59d91d71f585c9a63f243b72c0a968 Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 1 Apr 2020 18:05:05 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BB=84=E4=BB=B6model?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java index 5553485..257d5ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentResultModel.java @@ -20,6 +20,9 @@ public class ButtonComponentResultModel { @ApiParam("成功信号") private boolean isSuccess; + @ApiParam("是否跳过工序") + private boolean isJumpProcess; + @ApiParam("提示信息") private String msg; From 8c4cb0748b2b33f042659f8817b592eb0897669b Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 1 Apr 2020 20:29:23 +0800 Subject: [PATCH 08/22] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E3=80=901483=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E6=96=B0=E5=A2=9E=E6=8B=89=E5=8A=A8=E8=A7=84?= =?UTF-8?q?=E5=88=99=E8=A1=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901484=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E7=89=A9=E6=96=99=E8=A1=A8=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1=E3=80=901485=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E5=BA=93=E4=BD=8D=E7=89=A9=E6=96=99=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1=E3=80=901486?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E5=AD=98=E5=82=A8=E5=8C=BA=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1=E3=80=901487?= =?UTF-8?q?=E3=80=91=EF=BC=9ALES-=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E3=80=901488=E3=80=91=EF=BC=9ALES-=E6=8B=89=E5=8A=A8=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=B1=9E=E6=80=A7=E5=8F=98=E6=9B=B4=20=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=901489=E3=80=91=EF=BC=9ALES-=E5=85=A5=E5=9C=BA?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E7=AA=97=E5=8F=A3=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=A1=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901490=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E5=B7=A1=E7=BA=BF=E6=8B=89=E5=8A=A8=20=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=901491=E3=80=91=EF=BC=9ALES-=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8B=89=E5=8A=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901492=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E8=BF=87=E7=82=B9=E6=8B=89=E5=8A=A8=20=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=901493=E3=80=91=EF=BC=9ALES-=E6=89=8B=E5=B7=A5?= =?UTF-8?q?=E6=8B=89=E5=8A=A8=20=E4=BB=BB=E5=8A=A1=E3=80=901494=E3=80=91?= =?UTF-8?q?=EF=BC=9ALES-=E9=A2=84=E7=95=99=E5=A4=96=E9=83=A8=E6=8B=89?= =?UTF-8?q?=E5=8A=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 6e21241..7ccc46c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -115,6 +115,10 @@ public class WmsASNMaster extends BaseBean { @ApiParam("备注") public String remark; + @Column(name = "DOCK",columnDefinition = "varchar(50) default '1'") + @ApiParam("道口") + public String dock; + @Transient @ApiParam("供应商电话") private String vendorCall; From 3529d1b8451401a3ed44edd5c5458b08cc720e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 1 Apr 2020 20:30:46 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E7=B1=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=A7=84=E5=88=99=E8=8C=83=E5=9B=B4=E5=92=8C=E8=A7=84?= =?UTF-8?q?=E5=88=99=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 69 +++++++++++++--------- 1 file changed, 41 insertions(+), 28 deletions(-) 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 0fde085..fc12b72 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 @@ -5357,18 +5357,18 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RULE { - IS_SAME_CUSTOMER("同客户", "isSameCustomer", 2, 10), - IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", 1, 10), - IS_SAME_PRIORITY("同优先级", "isSamePriority", 1, 10), - IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", 2, 10), - IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", 2, 10), - IS_SAME_PART("同物料", "isSamePart", 2, 10), - IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", 2, 10), - IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", 2, 10), - IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", 1, 10), - IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", 1, 10), - IS_CROSS_AREA("允许跨区", "isCrossArea", 2, 10), - IS_COLLECTION("物料整箱归集", "isCollection", 2, 10); + IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10), + IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10), + IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10), + IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10), + IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10), + IS_SAME_PART("同物料", "isSamePart", "2", 10), + IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10), + IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10), + IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10), + IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10), + IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10), + IS_COLLECTION("物料整箱归集", "isCollection", "2", 10); private String chName; @@ -5376,12 +5376,12 @@ public class WmsEnumUtil { private int waveMergeType; - private int value; + private String fieldValue; - WAVE_MERGE_RULE(String chName, String enName, int value, int waveMergeType) { + WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) { this.chName = chName; this.enName = enName; - this.value = value; + this.fieldValue = fieldValue; this.waveMergeType = waveMergeType; } @@ -5393,8 +5393,8 @@ public class WmsEnumUtil { return enName; } - public int getValue() { - return value; + public String getFieldValue() { + return fieldValue; } public int getWaveMergeType() { @@ -5408,23 +5408,29 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RANGE { CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", - "custNo, custName", "custNo, custName", "custNo", 20), + "custNo, custName", "custNo, custName", "custNo", + 20, ""), WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse", - "code, name", "code, name", "code", 20), + "code, name", "code, name", "code", + 20, ""), PRIORITY("优先级", "priority", "PRIORITY_NEW", "", - "", "", 20), + "", "", 20, ""), SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", 20), + "zoneNo, zoneName", "zoneNo", "zoneNo", + 20, ""), DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", 20), + "zoneNo, zoneName", "zoneNo", "zoneNo", + 20, ""), PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart", - "partNo, partName", "partNo", "partNo", 20), - PART_GROUP_NO("物料组代码", "partGroupNo", "", "", - "", "", 20), + "partNo, partName", "partNo", "partNo", + 20, ""), + PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup", + "partGroupNo, partGroupName", "partGroupNo", + "partGroupNo", 20, ""), BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "", - "", "", 20), + "", "", 20, ""), ORDER_STATUS("单据状态", "orderStatus", "MASTER_ORDER_STATUS", "", - "", "", 20); + "", "", 20, ""); // 中文名称 String chName; @@ -5441,8 +5447,10 @@ public class WmsEnumUtil { // 合并操作类型 private int waveMergeType; + private String fieldValue; + WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName, - String searchColumnName, String explicitColumnName, int waveMergeType) { + String searchColumnName, String explicitColumnName, int waveMergeType, String fieldValue) { this.chName = chName; this.enName = enName; this.entityName = entityName; @@ -5450,6 +5458,7 @@ public class WmsEnumUtil { this.searchColumnName = searchColumnName; this.explicitColumnName = explicitColumnName; this.waveMergeType = waveMergeType; + this.fieldValue = fieldValue; } public String getChName() { @@ -5479,6 +5488,10 @@ public class WmsEnumUtil { public int getWaveMergeType() { return waveMergeType; } + + public String getFieldValue() { + return fieldValue; + } } /** From 241ec4974ba9b524266b845dd6c0edfde8743d38 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 1 Apr 2020 23:54:54 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/model/QueueOrderModel.java | 12 ++++ .../i3plus/pojo/mes/model/MesQueueShipping.java | 66 +++++++++++++++++++ .../pojo/mes/model/MesQueueShippingDetail.java | 73 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 29 +++++++-- .../i3plus/pojo/mes/model/StepDispatchModel.java | 5 +- 5 files changed, 178 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java index a3f4547..e641bcf 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java @@ -67,4 +67,16 @@ public class QueueOrderModel implements Serializable { this.snStatus = snStatus; this.workType = workType; } + public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workType = workType; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java new file mode 100644 index 0000000..45dcf3d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShipping.java @@ -0,0 +1,66 @@ +package cn.estsh.i3plus.pojo.mes.model; + +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 :MES_JIT发运队列 + * @Reference : + * @Author : qianhausheng + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_SHIPPING") +@Api("MES_JIT发运队列") +public class MesQueueShipping extends BaseBean implements Serializable { + + private static final long serialVersionUID = 655875369308414110L; + + @Column(name = "JIT_NO") + @ApiParam("队列编号") + private String jitNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "CUST_FLAG_NO") + @ApiParam("客户标识号") + private String custFlagNo; + + @Column(name = "SEQ") + @ApiParam("排序号") + private Double seq; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name = "CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户产线代码") + private String custPlantCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java new file mode 100644 index 0000000..2e83143 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesQueueShippingDetail.java @@ -0,0 +1,73 @@ +package cn.estsh.i3plus.pojo.mes.model; + +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 :MES_JIT发运队列明细 + * @Reference : + * @Author : qianhausheng + * @CreateDate : 2020-03-06 10:16 上午 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_QUEUE_SHIPPING_DETAIL") +@Api("MES_JIT发运队列明细") +public class MesQueueShippingDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1442091799346314190L; + + @Column(name = "JIT_NO") + @ApiParam("队列编号") + private String jitNo; + + @Column(name = "PROD_CFG_CODE") + @ApiParam("配置代码") + private String prodCfgCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name = "status") + @ApiParam("状态") + private Integer status; + + @Column(name="SERIAL_NUMBER") + @ApiParam("过程条码") + private String serialNumber; + + @Column(name = "QUEUE_GROUP_NO") + @ApiParam("分组队列编号") + private String queueGroupNo; + + @Column(name = "GROUP_NO") + @ApiParam("组内编号") + private Integer groupNo; + + @Column(name = "GROUP_SEQ") + @ApiParam("分组序号") + private String groupSeq; + + @Column(name = "qty") + @ApiParam("数量") + private Double qty; +} 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 60b7948..7b12171 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 @@ -129,16 +129,33 @@ public class QueueOrderModel implements Serializable { this.groupNo = groupNo; this.prodCfgCode = prodCfgCode; } + public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType,Double finsihQty,Double qty) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.workType = workType; + this.finsihQty=finsihQty; + this.qty=qty; + this.orderNo=orderNo; + } - public QueueOrderModel(String queueGroupNo, Integer groupNo, String orderNo, - Double queueSeq, Double queDetailSeq, String partNo, String partNameRdd, String organizeCode) { - this.queueGroupNo = queueGroupNo; - this.groupNo = groupNo; - this.orderNo = orderNo; + public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String partNo, String partNameRdd, String workType) { + this.id = id; this.queueSeq = queueSeq; this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; this.partNo = partNo; this.partNameRdd = partNameRdd; - this.organizeCode = organizeCode; + this.workType = workType; + this.orderNo=orderNo; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java index bf9d485..7585012 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java @@ -18,12 +18,15 @@ public class StepDispatchModel { private String cellParamKey; + private String requestBeanKey; + private String scanInfo; - public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String scanInfo) { + public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String scanInfo) { this.stepListKey = stepListKey; this.firstScanKey = firstScanKey; this.cellParamKey = cellParamKey; + this.requestBeanKey = requestBeanKey; this.scanInfo = scanInfo; } } From dce52df770c9452d317f28331c7946af7b3b2baa Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 2 Apr 2020 00:12:43 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=A0=E5=8F=82?= =?UTF-8?q?=E7=BB=99=E5=B7=A5=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java index 7585012..ec019ee 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java @@ -20,13 +20,16 @@ public class StepDispatchModel { private String requestBeanKey; + private String moduleDataMapKey; + private String scanInfo; - public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String scanInfo) { + public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) { this.stepListKey = stepListKey; this.firstScanKey = firstScanKey; this.cellParamKey = cellParamKey; this.requestBeanKey = requestBeanKey; + this.moduleDataMapKey = moduleDataMapKey; this.scanInfo = scanInfo; } } From 851bd1feecac81c16969f6a1ecc7d8685f298e2f Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 2 Apr 2020 00:48:26 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/QueueOrderModel.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) 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 7b12171..60d0f9e 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 @@ -120,7 +120,39 @@ public class QueueOrderModel implements Serializable { this.snStatus = snStatus; this.workType = workType; } + public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.snStatus = snStatus; + this.workType = workType; + this.finsihQty=finsihQty; + this.qty=qty; + this.orderNo=orderNo; + } + public QueueOrderModel(String orderNo,Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.snStatus = snStatus; + this.workType = workType; + this.orderNo=orderNo; + } public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) { this.id = id; this.queDetailSeq = queDetailSeq; From 4dae2eea7d7bba7b6455a3f2d9c1588da14f74f3 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Apr 2020 09:56:15 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E3=80=90MES=20=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 c594693..5f5e21f 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 @@ -18,7 +18,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_ACTION_MODULE { WORK_ORDER_LANDED(10, "生产工单下达"), - QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达"); + QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达"), + MES_WORK_ORDER(30, "生产工单导入"); private int value; private String description; From 5fc4c6c025e32879b8bb353abfa84bd4af6ea140 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 2 Apr 2020 10:31:21 +0800 Subject: [PATCH 14/22] mes --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 ++-- .../cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java | 10 +++------- 2 files changed, 5 insertions(+), 9 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 9b37512..0db0a4c 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 @@ -2651,8 +2651,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MONITOR_TASK_OBJECT_TYPE { - PLC(10, "PLC"); -// DB(20, "DB"); + PLC(10, "PLC"), + DB(20, "DB"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java index 2752dac..4dfc1ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java @@ -38,13 +38,9 @@ public class MesMonitorTaskDetail extends BaseBean implements Serializable { @ApiParam("数据对象编号") private String dataObjectNo; -// @Column(name = "STORE_OBJECT_CODE") -// @ApiParam("存储对象代码") -// private String storeObjectCode; -// -// @Column(name = "STORE_FIELD_CODE") -// @ApiParam("存储字段代码") -// private String storeFieldCode; + @Column(name = "STORE_OBJECT_CODE") + @ApiParam("存储对象代码") + private String storeObjectCode; @Transient @ApiParam("任务名称") From c0e3f1cb4fcf2e94f51ae0acba49962faa0e12bf Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Apr 2020 11:08:28 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E3=80=90=E6=89=BE=E5=9B=9E=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 2dad813..64f03c6 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 @@ -5502,6 +5502,10 @@ public class WmsEnumUtil { WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"), WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围"); + int value; + String code; + String description; + WAVE_MERGE_TYPE(int value, String code, String description) { this.value = value; this.code = code; @@ -5725,6 +5729,14 @@ public class WmsEnumUtil { } public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { From 9b3dd796550e0df399f541c9054563637f6c4454 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 2 Apr 2020 11:10:43 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E3=80=90=E5=86=B2=E7=AA=81=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 68 +++++++++++++++++------------------------------------------------ 1 file changed, 18 insertions(+), 50 deletions(-) diff --git a/pom.xml b/pom.xml index d6a60cc..7a083c9 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-${profileActive}-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform @@ -202,24 +202,24 @@ - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + @@ -254,36 +254,4 @@ ${project.artifactId}-${project.version} - - - dev - - DEV - - - true - - - - test - - TEST - - - - docker - - DOCKER - - - - prod - - PROD - - - - - ${project.artifactId}-${project.version} - \ No newline at end of file From a432b77ca0b1c2d53dee65517f6a82e10bbaf3ac Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 2 Apr 2020 12:41:53 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E4=BB=BB=E5=8A=A11536=E3=80=901536=20PDA?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E8=BD=A6=E7=89=8C=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 + .../i3plus/pojo/wms/bean/WmsTransportRule.java | 91 ++++++++++++++++++++++ .../wms/repository/WmsTransportRuleRepository.java | 16 ++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 13 ++++ 4 files changed, 124 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransportRuleRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index b807a04..ead19c3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -107,6 +107,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "车牌号") private String carNo; + @Column(name = "DRIVER_NO") + @ApiParam("司机") + public String driverNo; + @Column(name = "CUST_ORDER_NO") @ApiParam(value = "客户单号") private String custOrderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java new file mode 100644 index 0000000..5c91192 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransportRule.java @@ -0,0 +1,91 @@ +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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import javax.persistence.*; +import java.util.List; + + +/** + * @Description : 运输规则表 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-03-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_TRANSPORT_RULE") +@Api("运输规则表") +public class WmsTransportRule extends BaseBean { + private static final long serialVersionUID = 6120257805546343124L; + + @Column(name = "COMMAND_TYPE") + @ApiParam(value = "指令类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.IMPORT_ORDER_TYPE.class, refForeignKey = "value", value = "description") + private String commandType; + + @Column(name = "BUSI_TYPE") + @ApiParam("业务类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "OUT_MOVEMENT_BUSI_TYPE") + public Integer busiType; + + @Column(name = "BUSI_SCENE_TYPE") + @ApiParam("业务场景") + //@AnnoOutputColumn(refClass = WmsEnumUtil.BUSI_SCENE_TYPE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BUSI_SCENE_TYPE") + public Integer busiSceneType; + + + @Column(name = "SRC_AREA_NO") + @ApiParam("发货库存地") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String srcAreaNo; + + + @Column(name = "DEST_AREA_NO") + @ApiParam("目标库存地") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String destAreaNo; + + @Column(name = "OUT_VENDOR_NO") + @ApiParam("委外供应商编码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String outVendorNo; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String partNo; + + @Column(name = "CUST_NO") + @ApiParam("客户代码") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + public String custNo; + + @Column(name = "IS_TRANSPORT") + @ApiParam("是否安排运输") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "TRUE_OR_FALSE") + public int isTransport; + + @Column(name = "REMARK",length = 255) + @ApiParam("备注") + public String remark; + + @ApiParam("物料编码") + @Transient + public List partNoLst; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransportRuleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransportRuleRepository.java new file mode 100644 index 0000000..4a9acce --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTransportRuleRepository.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.WmsTransportRule; +import org.springframework.stereotype.Repository; + +/** + * @Description : 运输规则dao层 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-03-27 10:30 + * @Modify: + **/ +@Repository +public interface WmsTransportRuleRepository 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 c92cbc1..6f59761 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 @@ -2907,4 +2907,17 @@ public class WmsHqlPack { return result; } + /** + * 运输规则分页查询条件 + * @param wmsTransportRule + * @return + */ + public static DdlPackBean packHqlBasPlugin(WmsTransportRule wmsTransportRule) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getNumEqualPack(wmsTransportRule.getBusiType(), "busiType", result); + DdlPreparedPack.getStringLikerPack(wmsTransportRule.getCustNo(), "custNo", result); + DdlPreparedPack.getStringLikerPack(wmsTransportRule.getPartNo(), "partNo", result); + getStringBuilderPack(wmsTransportRule, result); + return result; + } } From d2fb33d88849286575ecedd708d97d98a0572cac Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 2 Apr 2020 12:50:16 +0800 Subject: [PATCH 18/22] =?UTF-8?q?bug1536=E3=80=901536=20PDA=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E8=BD=A6=E7=89=8C=E4=BF=A1=E6=81=AF=E5=8A=9F=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 79 ++++++++++++++++++---- 1 file changed, 66 insertions(+), 13 deletions(-) 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 64f03c6..dcc9407 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 @@ -5502,9 +5502,9 @@ public class WmsEnumUtil { WAVE_MERGE_RULE(10, "WAVE_MERGE_RULE", "合并规则"), WAVE_MERGE_RANGE(20, "WAVE_MERGE_RANGE", "合并范围"); - int value; - String code; - String description; + private int value; + private String code; + private String description; WAVE_MERGE_TYPE(int value, String code, String description) { this.value = value; @@ -5689,6 +5689,16 @@ public class WmsEnumUtil { } 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; + } } /** @@ -5728,16 +5738,7 @@ public class WmsEnumUtil { 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; - } - public static String valueOfDescription(int val) { + public static String valueOfDescription ( int val){ String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -5787,4 +5788,56 @@ public class WmsEnumUtil { return tmp; } } + + + /** + * 业务场景Supplier + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BUSI_SCENE_TYPE { + YFAS_DELIVERY(10, "YFAS_DELIVERY", "YFAS送货"), + TURN_ZAITU_LOCATE(20, "TURN_ZAITU_LOCATE", "转储到在途库位"), + ORGANIZE_TRUN(30, "ORGANIZE_TRUN", "工厂内转储"), + SUPPLIER_SELF(40, "SUPPLIER_SELF", "供应商自提"), + CUSTOMER_SELF(50, "CUSTOMER_SELF", "客户自提"); + private int value; + private String code; + private String description; + + BUSI_SCENE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static BUSI_SCENE_TYPE codeOf(String code) { + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + return values()[i]; + } + } + return null; + } + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } \ No newline at end of file From 8a836e340aef6f206962dec77177c372913bac29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 2 Apr 2020 13:26:23 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 48 +++++++++++++++++++--- 1 file changed, 42 insertions(+), 6 deletions(-) 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 fc12b72..530863f 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 @@ -5378,6 +5378,12 @@ public class WmsEnumUtil { private String fieldValue; + private int value; + + private String code; + + private String description; + WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) { this.chName = chName; this.enName = enName; @@ -5400,6 +5406,18 @@ public class WmsEnumUtil { public int getWaveMergeType() { return waveMergeType; } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public int getValue() { + return value; + } } /** @@ -5408,24 +5426,24 @@ public class WmsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RANGE { CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", - "custNo, custName", "custNo, custName", "custNo", + "custNo,custName", "custNo,custName", "custNo", 20, ""), WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse", - "code, name", "code, name", "code", + "code,name", "code,name", "code", 20, ""), PRIORITY("优先级", "priority", "PRIORITY_NEW", "", "", "", 20, ""), SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", + "zoneNo,zoneName", "zoneNo", "zoneNo", 20, ""), DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", - "zoneNo, zoneName", "zoneNo", "zoneNo", + "zoneNo,zoneName", "zoneNo", "zoneNo", 20, ""), PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart", - "partNo, partName", "partNo", "partNo", + "partNo,partName", "partNo", "partNo", 20, ""), PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup", - "partGroupNo, partGroupName", "partGroupNo", + "partGroupNo,partGroupName", "partGroupNo", "partGroupNo", 20, ""), BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "", "", "", 20, ""), @@ -5449,6 +5467,12 @@ public class WmsEnumUtil { private String fieldValue; + private int value; + + private String code; + + private String description; + WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName, String searchColumnName, String explicitColumnName, int waveMergeType, String fieldValue) { this.chName = chName; @@ -5492,6 +5516,18 @@ public class WmsEnumUtil { public String getFieldValue() { return fieldValue; } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } } /** From cd99a63233d661751bbc7cd0e4e621cd81061e5c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 2 Apr 2020 20:12:59 +0800 Subject: [PATCH 20/22] mes --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 35 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesDataObject.java | 8 +++++ .../i3plus/pojo/mes/bean/MesMonitorTaskDetail.java | 4 +++ 3 files changed, 47 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 0db0a4c..c87401e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -13,6 +13,41 @@ import org.apache.commons.lang3.StringUtils; public class MesPcnEnumUtil { /** + * 监听任务明细-采集数据方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_DETAIL_COLLECT_TYPE { + SELF_ADDITION(10, "自增列"), + FEED_FIELD(20, "反馈字段"); + + private int value; + private String description; + + MONITOR_TASK_DETAIL_COLLECT_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; + } + } + + /** * JIS发运模式类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index 7e0b93f..af4d758 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -70,6 +70,14 @@ public class MesDataObject extends BaseBean implements Serializable { @ApiParam("自增列值") private Long selfAdditionValue; + @Column(name = "ORDER_BY_FIELD") + @ApiParam("采集排序字段") + private String orderbyField; + + @Column(name = "ORDER_BY_VALUE") + @ApiParam("采集排序值") + private Integer orderbyValue; + @Transient @ApiParam("操作类型名称") private String operateTypeName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java index 4dfc1ba..36ff11f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java @@ -42,6 +42,10 @@ public class MesMonitorTaskDetail extends BaseBean implements Serializable { @ApiParam("存储对象代码") private String storeObjectCode; + @Column(name = "COLLECT_TYPE") + @ApiParam("采集数据方式") + private Integer collectType; + @Transient @ApiParam("任务名称") private String taskName; From 9f918b66649a9537ad4df50a1e8a5bed78f0be4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 2 Apr 2020 20:15:26 +0800 Subject: [PATCH 21/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A2=E6=AC=A1?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=92=8C=E8=8C=83=E5=9B=B4=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=B1=BB=E5=AD=97=E6=AE=B5=E5=80=BC=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 125 ++++++++++++--------- 1 file changed, 73 insertions(+), 52 deletions(-) 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 d7b809e..d669fdb 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 @@ -5357,24 +5357,36 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WAVE_MERGE_RULE { - IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10), - IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10), - IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10), - IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10), - IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10), - IS_SAME_PART("同物料", "isSamePart", "2", 10), - IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10), - IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10), - IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10), - IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10), - IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10), - IS_COLLECTION("物料整箱归集", "isCollection", "2", 10); - - private String chName; - - private String enName; - - private int waveMergeType; + IS_SAME_CUSTOMER("同客户", "isSameCustomer", "2", 10, + 0, "isSameCustomer", "同客户"), + IS_SAME_WAREHOUSE("同仓库", "isSameWareHouse", "2", 10, + 0, "isSameWareHouse", "同仓库"), + IS_SAME_PRIORITY("同优先级", "isSamePriority", "1", 10, + 0, "isSamePriority", "同优先级"), + IS_SAME_SRC_ZONE("同来源存储区", "isSameSrcZone", "2", 10, + 0, "isSameSrcZone", "同来源存储区"), + IS_SAME_DEST_ZONE("同目标存储区", "isSameDestZone", "2", 10, + 0, "isSameDestZone", "同目标存储区"), + IS_SAME_PART("同物料", "isSamePart", "2", 10, + 0, "isSamePart", "同物料"), + IS_SAME_PART_GROUP("同物料组", "isSamePartGroup", "2", 10, + 0, "isSamePartGroup", "同物料组"), + IS_SAME_DELIVERY_TIME("同发货时间", "isSameDeliveryTime", "2", 10, + 0, "isSameDeliveryTime", "同发货时间"), + IS_SAME_BUSI_TYPE("同业务类型", "isSameBusiType", "1", 10, + 0, "isSameBusiType", "同业务类型"), + IS_SAME_ORDER_STATUS("同单据状态", "isSameOrderStatus", "1", 10, + 0, "isSameOrderStatus", "同单据状态"), + IS_CROSS_AREA("允许跨区", "isCrossArea", "2", 10, + 0, "isCrossArea", "允许跨区"), + IS_COLLECTION("物料整箱归集", "isCollection", "2", 10, + 0, "isCollection", "物料整箱归集"); + + private String fieldChName; + + private String fieldEnName; + + private int mergeOperatorType; private String fieldValue; @@ -5384,27 +5396,31 @@ public class WmsEnumUtil { private String description; - WAVE_MERGE_RULE(String chName, String enName, String fieldValue, int waveMergeType) { - this.chName = chName; - this.enName = enName; + WAVE_MERGE_RULE(String fieldChName, String fieldEnName, String fieldValue, int mergeOperatorType, int value, + String code, String description) { + this.fieldChName = fieldChName; + this.fieldEnName = fieldEnName; this.fieldValue = fieldValue; - this.waveMergeType = waveMergeType; + this.mergeOperatorType = mergeOperatorType; + this.value = value; + this.description = description; + this.code = code; } - public String getChName() { - return chName; + public String getFieldChName() { + return fieldChName; } - public String getEnName() { - return enName; + public String getFieldEnName() { + return fieldEnName; } public String getFieldValue() { return fieldValue; } - public int getWaveMergeType() { - return waveMergeType; + public int getMergeOperatorType() { + return mergeOperatorType; } public String getDescription() { @@ -5427,33 +5443,34 @@ public class WmsEnumUtil { public enum WAVE_MERGE_RANGE { CUST_NO("客户代码", "custNo", "cn.estsh.i3plus.pojo.wms.bean.BasCustomer", "custNo,custName", "custNo,custName", "custNo", - 20, ""), + 20, "", "custNo", 0, "客户代码"), WAREHOUSE_CODE("仓库代码", "srcWhNo", "cn.estsh.i3plus.pojo.wms.bean.WareHouse", "code,name", "code,name", "code", - 20, ""), + 20, "", "srcWhNo", 0, "仓库代码"), PRIORITY("优先级", "priority", "PRIORITY_NEW", "", - "", "", 20, ""), + "", "", 20, "", + "priority", 0, "优先级"), SRC_ZONE_NO("来源存储区代码", "srcZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", "zoneNo,zoneName", "zoneNo", "zoneNo", - 20, ""), + 20, "", "srcZoneNo", 0, "来源存储区代码"), DEST_ZONE_NO("目标存储区代码", "destZoneNo", "cn.estsh.i3plus.pojo.wms.bean.WmsZones", "zoneNo,zoneName", "zoneNo", "zoneNo", - 20, ""), + 20, "", "destZoneNo", 0, "目标存储区代码"), PART_NO("物料号", "partNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPart", "partNo,partName", "partNo", "partNo", - 20, ""), + 20, "", "partNo", 0, "物料号"), PART_GROUP_NO("物料组代码", "partGroupNo", "cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup", "partGroupNo,partGroupName", "partGroupNo", - "partGroupNo", 20, ""), + "partGroupNo", 20, "", "partGroupNo", 0, "物料组代码"), BUSI_TYPE("业务类型", "busiType", "OUT_MOVEMENT_BUSI_TYPE", "", - "", "", 20, ""), + "", "", 20, "", "busiType", 0, "业务类型"), ORDER_STATUS("单据状态", "orderStatus", "MASTER_ORDER_STATUS", "", - "", "", 20, ""); + "", "", 20, "", "orderStatus", 0, "单据状态"); // 中文名称 - String chName; + String fieldChName; // 英文名称 - String enName; + String fieldEnName; // 下拉枚举名称 String entityName; // 下拉列表显示列名称,多个列名需要根据逗号分隔 @@ -5463,7 +5480,7 @@ public class WmsEnumUtil { // 回显列名 String explicitColumnName; // 合并操作类型 - private int waveMergeType; + private int mergeOperatorType; private String fieldValue; @@ -5473,24 +5490,28 @@ public class WmsEnumUtil { private String description; - WAVE_MERGE_RANGE(String chName, String enName, String entityName, String listColumnName, - String searchColumnName, String explicitColumnName, int waveMergeType, String fieldValue) { - this.chName = chName; - this.enName = enName; + WAVE_MERGE_RANGE(String fieldChName, String fieldEnName, String entityName, String listColumnName, + String searchColumnName, String explicitColumnName, int mergeOperatorType, String fieldValue, + String code, int value, String description) { + this.fieldChName = fieldChName; + this.fieldEnName = fieldEnName; this.entityName = entityName; this.listColumnName = listColumnName; this.searchColumnName = searchColumnName; this.explicitColumnName = explicitColumnName; - this.waveMergeType = waveMergeType; + this.mergeOperatorType = mergeOperatorType; this.fieldValue = fieldValue; + this.code = code; + this.value = value; + this.description = description; } - public String getChName() { - return chName; + public String getFieldEnName() { + return fieldEnName; } - public String getEnName() { - return enName; + public String getFieldChName() { + return fieldChName; } public String getEntityName() { @@ -5509,8 +5530,8 @@ public class WmsEnumUtil { return explicitColumnName; } - public int getWaveMergeType() { - return waveMergeType; + public int getMergeOperatorType() { + return mergeOperatorType; } public String getFieldValue() { @@ -5522,7 +5543,7 @@ public class WmsEnumUtil { } public String getDescription() { - return description; + return "description"; } public String getCode() { From 3442fd48011f51885cb76c231ac603cbdad55d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Thu, 2 Apr 2020 20:15:58 +0800 Subject: [PATCH 22/22] =?UTF-8?q?=E6=B3=A2=E6=AC=A1=E8=A7=84=E5=88=99?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=96=B0=E5=A2=9E=E5=BC=80=E7=AA=97=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java | 16 ++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 17 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java index f2e7cf7..360d029 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsWaveRuleDetails.java @@ -50,6 +50,22 @@ public class WmsWaveRuleDetails extends BaseBean { @ApiParam(value = "字段值") public String fieldValue; + @Column(name = "ENTITY_NAME") + @ApiParam(value = "实例类名") + public String entityName; + + @Column(name = "LIST_COLUMN_NAME") + @ApiParam(value = "列表列名") + public String listColumnName; + + @Column(name = "SEARCH_COLUMN_NAME") + @ApiParam(value = "搜索列名") + public String searchColumnName; + + @Column(name = "EXPLICIT_COLUMN_NAME") + @ApiParam(value = "回显列名") + public String explicitColumnName; + public Long getRuleId() { return ruleId == null ? 0L : ruleId.longValue(); } 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 6f59761..06bf167 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 @@ -2901,6 +2901,7 @@ public class WmsHqlPack { public static DdlPackBean packHqlWmsWaveRule(WmsWaveRule rule) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(rule.getRuleCode(), "ruleCode", result); + DdlPreparedPack.getStringEqualPack(rule.getRuleDesc(), "ruleDesc", result); DdlPreparedPack.getStringBiggerPack(rule.getStartEffectDate(), "startEffectDate", result); DdlPreparedPack.getStringSmallerPack(rule.getEndEffectDate(), "endEffectDate", result); getStringBuilderPack(rule, result);