step

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionDispatchContextStepService.java

@@ -15,6 +15,9 @@ import java.util.Map;
  */
 public interface IMesProductionDispatchContextStepService {
 
+    @ApiOperation(value = "清除上下文中的所有业务数据")
+    void doFlushProductionDispatchContext(StationRequestBean reqBean);
+
     @ApiOperation(value = "存储展示组件MODULE_CONTENT内容")
     Boolean saveModuleContentContext(StationRequestBean reqBean, List<List<StationKvBean>> dataList);
 

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionProcessContextStepService.java

@@ -18,6 +18,9 @@ import java.util.Optional;
  */
 public interface IMesProductionProcessContextStepService {
 
+    @ApiOperation(value = "清除上下文中的所有基础数据")
+    void doFlushProductionDispatchContext(StationRequestBean reqBean);
+
     @ApiOperation(value = "存储生产过程上下文对象【工步根据业务实际情况执行,配置错误等情况无需执行】")
     Boolean saveProductionProcessContext(StationRequestBean reqBean, MesProductionProcessContext productionProcessContext);
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionResetCellContextService.java

@@ -1,12 +1,11 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.station.function;
 
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
-import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IStepService;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.function.IFsmModuleFunctionService;
 import cn.estsh.i3plus.pojo.mes.model.ButtonDynamicModel;
 import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
 import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
-import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,20 +17,20 @@ public class MesFunctionResetCellContextService implements IFsmModuleFunctionSer
 
     @Autowired
     private IMesProductionProcessContextStepService productionProcessContextStepService;
+    @Autowired
+    private IMesProductionDispatchContextStepService productionDispatchContextStepService;
 
     @Override
-    public boolean doFunction(StationRequestBean reqBean) {
+    public boolean doFunction(StationRequestBean reqBean, StationResultBean resultBean, ButtonDynamicModel buttonDynamicModel) {
 
-        //删除BASE上下文数据
-        productionProcessContextStepService.deleteProductionProcessContext(reqBean);
+        productionProcessContextStepService.doFlushProductionDispatchContext(reqBean);
 
-        //删除BUSI上下文数据
-        return ((IStepService) SpringContextsUtil.getBean("mesProductionContextFlushStepService")).execute(reqBean).isCompleted();
+        productionDispatchContextStepService.doFlushProductionDispatchContext(reqBean);
 
+        //TODO 清除工位队列LOCK, 工位状态对象, 流程数据等信息
 
-    }
+        return doFunction(reqBean);
 
-    @Override
-    public boolean doFunction(StationRequestBean reqBean, StationResultBean resultBean, ButtonDynamicModel buttonDynamicModel) { return doFunction(reqBean); }
+    }
 
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionContextFlushService.java

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step.context;
+
+import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
+import cn.estsh.i3plus.mes.pcn.actor.shipping.dispatch.FsmJumpProcessService;
+import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+
+@Service
+@Primary
+public class MesProductionContextFlushService extends FsmJumpProcessService {
+
+    @Autowired
+    private IMesProductionDispatchContextStepService productionDispatchContextStepService;
+
+    //重置工序业务实现
+    @Override
+    public Boolean doJumpProcess(StationRequestBean requestBean) {
+
+        //清除上下文中的所有业务数据
+        productionDispatchContextStepService.doFlushProductionDispatchContext(requestBean);
+
+        return true;
+    }
+
+}

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionDispatchContextStepService.java

@@ -36,6 +36,12 @@ public class MesProductionDispatchContextStepService extends BaseStepService imp
 
     private String getContextKey(String organizeCode, String busiCode) { return new StringJoiner(":").add(organizeCode).add(MesPcnExtConstWords.PRODUCTION_PROCESS_CONTEXT).add(busiCode).toString(); }
 
+    //清除上下文中的所有业务数据
+    @Override
+    public void doFlushProductionDispatchContext(StationRequestBean reqBean) {
+        deleteFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean));
+    }
+
     //存储展示组件MODULE_CONTENT内容
     @Override
     public Boolean saveModuleContentContext(StationRequestBean reqBean, List<List<StationKvBean>> dataList) {

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionProcessContextStepService.java

@@ -44,6 +44,12 @@ public class MesProductionProcessContextStepService extends BaseStepService impl
 
     private String getContextKey(StationRequestBean reqBean) { return getFsmBusikey(reqBean, new StringJoiner(MesPcnExtConstWords.COLON).add(MesPcnExtConstWords.PRODUCTION_PROCESS_CONTEXT).add(MesPcnExtConstWords.BASE_DATA_CONTEXT).toString()); }
 
+    //清除上下文中的所有基础数据
+    @Override
+    public void doFlushProductionDispatchContext(StationRequestBean reqBean) {
+        deleteFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean));
+    }
+
     //存储生产过程上下文对象【工步根据业务实际情况执行,配置错误等情况无需执行】
     @Override
     public Boolean saveProductionProcessContext(StationRequestBean reqBean, MesProductionProcessContext productionProcessContext) {