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 1/5] =?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 73f647e3b4300471d23bd047895eb687c0cba83a Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 1 Apr 2020 14:06:50 +0800 Subject: [PATCH 2/5] =?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 3/5] =?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 83d7a618bf59d91d71f585c9a63f243b72c0a968 Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 1 Apr 2020 18:05:05 +0800 Subject: [PATCH 4/5] =?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 5/5] =?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;