forked from I3-YF/i3plus-mes-pcn-yfai
Merge remote-tracking branch 'origin/dev' into dev
jun
11 months ago
commit
3e29148f92
@ -0,0 +1,21 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.equiplog;
|
||||
|
||||
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.swslog.ISwsWriteDbLogService;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
public class MesWorkCellScanMonitorLogExtService implements ISwsWriteDbLogService {
|
||||
|
||||
@Override
|
||||
public void doWriteDbLog(StationResultBean resultBean) {
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
2
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/strategy/numberrule/INumberRulePackAttributeStrategy.java → modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/INumberRulePackAttributeStrategy.java
2
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/strategy/numberrule/INumberRulePackAttributeStrategy.java → modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/INumberRulePackAttributeStrategy.java
@ -1,4 +1,4 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.strategy.numberrule;
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.numberrule;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesNumberRuleStrategyModel;
|
||||
import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
|
||||
4
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/strategy/numberrule/strategy/XiaoPengNumberRuleStrategy.java → modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/strategy/XiaoPengNumberRuleStrategy.java
4
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/strategy/numberrule/strategy/XiaoPengNumberRuleStrategy.java → modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/strategy/XiaoPengNumberRuleStrategy.java
@ -1,6 +1,6 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.strategy.numberrule.strategy;
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.numberrule.strategy;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.strategy.numberrule.INumberRulePackAttributeStrategy;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.numberrule.INumberRulePackAttributeStrategy;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesNumberRuleStrategyModel;
|
||||
import cn.estsh.i3plus.platform.common.tool.TimeTool;
|
||||
import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
|
||||
@ -1,44 +0,0 @@
|
||||
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.BaseSwsService;
|
||||
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.function.IFsmModuleFunctionService;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
|
||||
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 org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @Description : 工位参数按钮事件接口实现【重置上下文】
|
||||
**/
|
||||
@Service
|
||||
public class MesFunctionResetCellContextService extends BaseSwsService implements IFsmModuleFunctionService {
|
||||
|
||||
@Autowired
|
||||
private IMesProductionProcessContextStepService productionProcessContextStepService;
|
||||
|
||||
@Autowired
|
||||
private IMesProductionDispatchContextStepService productionDispatchContextStepService;
|
||||
|
||||
@Override
|
||||
public boolean doFunction(StationRequestBean reqBean, StationResultBean resultBean, ButtonDynamicModel buttonDynamicModel) {
|
||||
|
||||
//清除上下文中的所有基础数据
|
||||
productionProcessContextStepService.doFlushProductionProcessContext(reqBean);
|
||||
|
||||
//清除上下文中的所有业务数据
|
||||
productionDispatchContextStepService.doFlushProductionDispatchContext(reqBean);
|
||||
|
||||
//TODO 清除工位队列LOCK, 工位状态对象, 流程数据等信息
|
||||
|
||||
this.sendMessage(reqBean, resultBean.writeDbLog(), String.format("生产线[%s]工位[%s]%s成功!",
|
||||
reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), buttonDynamicModel.getButtonName()), MesPcnEnumUtil.STATION_BUSI_TYPE.MESSAGE, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT);
|
||||
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,58 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
|
||||
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StepResult;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @Description : 完成工步
|
||||
* @Author : zxw
|
||||
**/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class MesEndStepService extends BaseStepService {
|
||||
|
||||
|
||||
@Autowired
|
||||
private IMesProductionDispatchContextStepService mesProductionDispatchContextStepService;
|
||||
|
||||
/*
|
||||
* @param reqBean
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public StepResult execute(StationRequestBean reqBean) {
|
||||
|
||||
StationResultBean resultBean = new StationResultBean();
|
||||
|
||||
StepResult stepResult = StepResult.getSuccessComplete();
|
||||
|
||||
mesProductionDispatchContextStepService.deleteFirstMouldNoContext(reqBean);
|
||||
mesProductionDispatchContextStepService.deleteMouldNoContext(reqBean);
|
||||
mesProductionDispatchContextStepService.deleteProductResultContext(reqBean);
|
||||
mesProductionDispatchContextStepService.deleteReadySignalContext(reqBean);
|
||||
|
||||
mesProductionDispatchContextStepService.deleteMesRawPartChargingDataContext(reqBean);
|
||||
mesProductionDispatchContextStepService.deletePartDataContext(reqBean);
|
||||
mesProductionDispatchContextStepService.deleteProdRuleDataContext(reqBean);
|
||||
mesProductionDispatchContextStepService.deleteProductionPartContext(reqBean);
|
||||
mesProductionDispatchContextStepService.deleteProductionPartNoContext(reqBean);
|
||||
mesProductionDispatchContextStepService.deleteProductionPsInContext(reqBean);
|
||||
mesProductionDispatchContextStepService.deleteProductionPsOutContext(reqBean);
|
||||
mesProductionDispatchContextStepService.deleteScanAssemblySnContext(reqBean);
|
||||
mesProductionDispatchContextStepService.deleteSendProcessCmdContext(reqBean);
|
||||
mesProductionDispatchContextStepService.deleteScanWorkOrderNoContext(reqBean);
|
||||
mesProductionDispatchContextStepService.deleteScanProductSnContext(reqBean);
|
||||
|
||||
this.sendMessage(reqBean, new StationResultBean().busiType(MesPcnEnumUtil.STATION_BUSI_TYPE.STEP_CUSTOM_CONTENT.getValue()).dataType(MesPcnEnumUtil.STATION_DATA_TYPE.TABLES.getValue()));
|
||||
|
||||
return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "完成工步执行成功");
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,89 +0,0 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
|
||||
|
||||
import akka.actor.ActorRef;
|
||||
import akka.actor.ActorSystem;
|
||||
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.BaseStepService;
|
||||
import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
|
||||
import cn.estsh.i3plus.pojo.mes.model.StepResult;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
/**
|
||||
* @Description : 加工异常处理工步
|
||||
* @Author : zxw
|
||||
**/
|
||||
@Slf4j
|
||||
@Service
|
||||
public class MesSaveProcessResultStepService extends BaseStepService {
|
||||
@Autowired
|
||||
private SnowflakeIdMaker snowflakeIdMaker;
|
||||
|
||||
@Autowired
|
||||
private ActorSystem actorSystem;
|
||||
|
||||
@Autowired
|
||||
private IMesProductionProcessContextStepService productionProcessContextStepService;
|
||||
|
||||
@Autowired
|
||||
private MesVariableWhenFinishedReadStepService mesVariableWhenFinishedReadStepService;
|
||||
|
||||
@Autowired
|
||||
private MesMouldRecordGenerateStepService mesMouldRecordGenerateStepService;
|
||||
|
||||
@Autowired
|
||||
private MesProductSnSaveStepService MesProductSnSaveStepService;
|
||||
|
||||
@Autowired
|
||||
private MesProductionRecordGenerateStepService mesProductionRecordGenerateStepService;
|
||||
|
||||
@Autowired
|
||||
private IMesProductionDispatchContextStepService mesProductionDispatchContextStepService;
|
||||
|
||||
@Autowired
|
||||
private MesProductResultErrorHandleStepService mesProductResultErrorHandleStepService;
|
||||
|
||||
@Autowired
|
||||
private MesReportGenerateStepService mesReportGenerateStepService;
|
||||
|
||||
public static final String ORDER_NO_JIS_SORT = "ORDER_NO_JIS_SORT";
|
||||
|
||||
private static final Map<String, ActorRef> refMap = new ConcurrentHashMap<>(200);
|
||||
|
||||
@Override
|
||||
public StepResult execute(StationRequestBean reqBean) {
|
||||
StationResultBean resultBean = new StationResultBean();
|
||||
|
||||
StepResult stepResult = StepResult.getSuccessComplete();
|
||||
/**
|
||||
* 生成开模记录
|
||||
*/
|
||||
mesMouldRecordGenerateStepService.execute(reqBean);
|
||||
/**
|
||||
* 保存零件条码信息工步
|
||||
*/
|
||||
MesProductSnSaveStepService.execute(reqBean);
|
||||
/**
|
||||
* 生成加工记录工步
|
||||
*/
|
||||
mesProductionRecordGenerateStepService.execute(reqBean);
|
||||
/**
|
||||
* 加工异常处理工步
|
||||
*/
|
||||
mesProductResultErrorHandleStepService.execute(reqBean);
|
||||
/**
|
||||
* 报工
|
||||
*/
|
||||
// mesReportGenerateStepService.execute(reqBean);
|
||||
|
||||
|
||||
return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "保存加工结果成功");
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue