diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml
index 49c0aff..fb62e96 100644
--- a/modules/i3plus-core-apiservice/pom.xml
+++ b/modules/i3plus-core-apiservice/pom.xml
@@ -26,7 +26,12 @@
i3plus.icloud
- i3plus-icloud-wms
+ i3plus-icloud-mes
+
+
+
+ i3plus.icloud
+ i3plus-icloud-mes-pcn
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java
index fd54c57..c55d700 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java
@@ -1,6 +1,8 @@
package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService;
+import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnCommonCloud;
+import cn.estsh.i3plus.icloud.mes.sdk.IMesCommonCloud;
import cn.estsh.i3plus.icloud.wms.sdk.IWmsCommonCloud;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
@@ -16,7 +18,6 @@ import cn.estsh.impp.framework.base.service.ICommonService;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
-import cn.estsh.impp.framework.boot.quartz.IQuartzJobService;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.Api;
@@ -51,14 +52,27 @@ public class SysTaskController extends CoreBaseController {
@Autowired
private IWmsCommonCloud wmsCommonCloud;
+ @Autowired
+ private IMesCommonCloud mesCommonCloud;
+
+ @Autowired
+ private IMesPcnCommonCloud mesPcnCommonCloud;
+
private ICommonService getCommonService(int softType){
ICommonService commonService = coreCommonService;
+ // 平台
if(softType == CommonEnumUtil.SOFT_TYPE.CORE.getValue()){
- //平台定时任务
commonService = coreCommonService;
- }else if(softType == CommonEnumUtil.SOFT_TYPE.WMS.getValue()){
+ // WMS
+ } else if(softType == CommonEnumUtil.SOFT_TYPE.WMS.getValue()){
commonService = wmsCommonCloud;
+ // MES
+ } else if(softType == CommonEnumUtil.SOFT_TYPE.MES.getValue()){
+ commonService = mesCommonCloud;
+ // MES_PCN
+ } else if(softType == CommonEnumUtil.SOFT_TYPE.MES_PCN.getValue()){
+ commonService = mesPcnCommonCloud;
}
return commonService;
}
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java
index 5947c7f..158a165 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java
@@ -3,6 +3,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskCycleService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService;
+import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnScheduleJobCloud;
+import cn.estsh.i3plus.icloud.mes.sdk.IMesScheduleJobCloud;
import cn.estsh.i3plus.icloud.wms.sdk.IWmsScheduleJobCloud;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
@@ -60,6 +62,12 @@ public class SysTaskPlanController extends CoreBaseController{
@Autowired
private IWmsScheduleJobCloud wmsScheduleJobCloud;
+ @Autowired
+ private IMesScheduleJobCloud mesScheduleJobCloud;
+
+ @Autowired
+ private IMesPcnScheduleJobCloud mesPcnScheduleJobCloud;
+
/**
* 根据来源切换定时任务服务
* @param source CommonEnumUtil.SOFT_TYPE
@@ -68,11 +76,18 @@ public class SysTaskPlanController extends CoreBaseController{
private IQuartzJobService getJobService(int source){
IQuartzJobService quartzJobService = scheduleTool;
+ //平台定时任务
if(source == CommonEnumUtil.SOFT_TYPE.CORE.getValue()){
- //平台定时任务
quartzJobService = scheduleTool;
+ // WMS
}else if(source == CommonEnumUtil.SOFT_TYPE.WMS.getValue()){
quartzJobService = wmsScheduleJobCloud;
+ // MES
+ } else if(source == CommonEnumUtil.SOFT_TYPE.MES.getValue()){
+ quartzJobService = mesScheduleJobCloud;
+ // MES_PCN
+ } else if(source == CommonEnumUtil.SOFT_TYPE.MES_PCN.getValue()){
+ quartzJobService = mesPcnScheduleJobCloud;
}
return quartzJobService;
}
diff --git a/pom.xml b/pom.xml
index 0a79893..d2ded21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,18 @@
${project.version}
+
+ i3plus.icloud
+ i3plus-icloud-mes
+ ${project.version}
+
+
+
+ i3plus.icloud
+ i3plus-icloud-mes-pcn
+ ${project.version}
+
+
i3plus.pojo