forked from I3-YF/i3plus-mes-pcn-yfai
step
parent
ce8cec3f64
commit
526d1d3f94
@ -0,0 +1,90 @@
|
|||||||
|
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
|
||||||
|
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesAssemblyExtService;
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProdRuleCfgExtService;
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*;
|
||||||
|
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
|
||||||
|
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
|
||||||
|
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 cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.util.CollectionUtils;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description : 显示装配件扫描项工步
|
||||||
|
* @Author : wangjie
|
||||||
|
**/
|
||||||
|
@Slf4j
|
||||||
|
@Service("mesAssemblyShowStepService")
|
||||||
|
public class MesAssemblyShowSortStepService extends BaseStepService {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IMesProductionProcessContextStepService productionProcessContextStepService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IMesProductionDispatchContextStepService productionDispatchContextStepService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IMesProdRuleCfgExtService prodRuleCfgExtService;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IMesAssemblyExtService assemblyExtService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public StepResult execute(StationRequestBean reqBean) {
|
||||||
|
|
||||||
|
StationResultBean resultBean = new StationResultBean();
|
||||||
|
|
||||||
|
StepResult stepResult = StepResult.getSuccessComplete();
|
||||||
|
|
||||||
|
//获取上下文信息
|
||||||
|
MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getCurCellEquipment(reqBean);
|
||||||
|
|
||||||
|
//配置错误 抛出异常
|
||||||
|
if (!productionProcessContext.getSuccess()) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
|
||||||
|
|
||||||
|
//从上下文中取出生产线对象
|
||||||
|
MesWorkCenter workCenter = productionProcessContext.getWorkCenter();
|
||||||
|
|
||||||
|
//从上下文中取出生产线对象
|
||||||
|
MesCellEquipContext cellEquipContext = productionProcessContext.getCurCellEquip();
|
||||||
|
|
||||||
|
//获取上下文装配件数据信息集合
|
||||||
|
List<MesProductionAssemblyContext> productionAssemblyContextList = productionDispatchContextStepService.getAssemblyDataContext(reqBean, workCenter);
|
||||||
|
|
||||||
|
//存在装配件数据信息, 直接展示
|
||||||
|
// if (!CollectionUtils.isEmpty(productionAssemblyContextList)) return showProductionAssembly();
|
||||||
|
|
||||||
|
//从上下文中取出生产工单数据信息集合
|
||||||
|
List<MesWorkOrderContext> workOrderContextList = productionDispatchContextStepService.getWorkOrderDataContext(reqBean);
|
||||||
|
|
||||||
|
//上下文中不存在生产工单数据信息集合
|
||||||
|
if (CollectionUtils.isEmpty(workOrderContextList)) return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, String.format("生产线[%s]工位[%s]的上下文中已不存在生产工单数据信息,请重新扫描加工单!", reqBean.getWorkCenterCode(), reqBean.getWorkCellCode()));
|
||||||
|
|
||||||
|
//获取排序线的装配件清单
|
||||||
|
productionAssemblyContextList = assemblyExtService.getProductionAssemblySortContextList(
|
||||||
|
new MesProductionAssemblySortContext(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), reqBean.getProcessCode()), workOrderContextList.stream().filter(o -> null != o).map(MesWorkOrderContext::getWorkOrderNo).collect(Collectors.toList()));
|
||||||
|
|
||||||
|
if (CollectionUtils.isEmpty(productionAssemblyContextList)) return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean, stepResult, "");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
return stepResult;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,65 +1,102 @@
|
|||||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
|
//package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
|
||||||
|
//
|
||||||
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
|
//import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesAssemblyExtService;
|
||||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
|
//import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProdRuleCfgExtService;
|
||||||
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
|
//import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionDispatchContextStepService;
|
||||||
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
|
//import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProductionProcessContextStepService;
|
||||||
import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
|
//import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*;
|
||||||
import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
|
//import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
|
||||||
import cn.estsh.i3plus.pojo.mes.model.StepResult;
|
//import cn.estsh.i3plus.pojo.mes.bean.MesWorkCenter;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
//import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
//import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
|
||||||
import org.springframework.stereotype.Service;
|
//import cn.estsh.i3plus.pojo.mes.model.StepResult;
|
||||||
|
//import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
|
||||||
/**
|
//import lombok.extern.slf4j.Slf4j;
|
||||||
* @Description : 显示装配件扫描项工步
|
//import org.springframework.beans.factory.annotation.Autowired;
|
||||||
* @Author : wangjie
|
//import org.springframework.stereotype.Service;
|
||||||
**/
|
//import org.springframework.util.CollectionUtils;
|
||||||
@Slf4j
|
//
|
||||||
@Service("mesAssemblyShowStepService")
|
//import java.util.List;
|
||||||
public class MesAssemblyShowStepService extends BaseStepService {
|
//import java.util.stream.Collectors;
|
||||||
|
//
|
||||||
@Autowired
|
///**
|
||||||
private IMesProductionProcessContextStepService productionProcessContextStepService;
|
// * @Description : 显示装配件扫描项工步
|
||||||
|
// * @Author : wangjie
|
||||||
@Override
|
// **/
|
||||||
public StepResult execute(StationRequestBean reqBean) {
|
//@Slf4j
|
||||||
|
//@Service("mesAssemblyShowStepService")
|
||||||
StationResultBean resultBean = new StationResultBean();
|
//public class MesAssemblyShowStepService extends BaseStepService {
|
||||||
|
//
|
||||||
StepResult stepResult = StepResult.getSuccessComplete();
|
// @Autowired
|
||||||
|
// private IMesProductionProcessContextStepService productionProcessContextStepService;
|
||||||
//获取上下文信息
|
//
|
||||||
MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getCurCellEquipment(reqBean);
|
// @Autowired
|
||||||
|
// private IMesProductionDispatchContextStepService productionDispatchContextStepService;
|
||||||
//配置错误 抛出异常
|
//
|
||||||
if (!productionProcessContext.getSuccess()) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
|
// @Autowired
|
||||||
|
// private IMesProdRuleCfgExtService prodRuleCfgExtService;
|
||||||
//从上下文中取出生产线对象
|
//
|
||||||
MesWorkCenter workCenter = productionProcessContext.getWorkCenter();
|
// @Autowired
|
||||||
|
// private IMesAssemblyExtService assemblyExtService;
|
||||||
// if (MesExtEnumUtil.WORK_CENTER_TYPE.SORT.getValue() == workCenter.getCenterType())
|
//
|
||||||
|
// @Override
|
||||||
|
// public StepResult execute(StationRequestBean reqBean) {
|
||||||
|
//
|
||||||
|
// StationResultBean resultBean = new StationResultBean();
|
||||||
|
//
|
||||||
|
// StepResult stepResult = StepResult.getSuccessComplete();
|
||||||
|
//
|
||||||
|
// //获取上下文信息
|
||||||
|
// MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getCurCellEquipment(reqBean);
|
||||||
|
//
|
||||||
|
// //配置错误 抛出异常
|
||||||
|
// if (!productionProcessContext.getSuccess()) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
|
||||||
|
//
|
||||||
|
// //从上下文中取出生产线对象
|
||||||
|
// MesWorkCenter workCenter = productionProcessContext.getWorkCenter();
|
||||||
|
//
|
||||||
|
// //从上下文中取出生产线对象
|
||||||
|
// MesCellEquipContext cellEquipContext = productionProcessContext.getCurCellEquip();
|
||||||
|
//
|
||||||
return stepResult;
|
// //获取排序线的装配件清单
|
||||||
|
// if (MesExtEnumUtil.WORK_CENTER_TYPE.SORT.getValue() == workCenter.getCenterType()) return doAssemblyShow2Sort(reqBean, resultBean, stepResult, productionProcessContext, workCenter, cellEquipContext);
|
||||||
}
|
//
|
||||||
|
// //验证上下文是否存在装配件数据信息集合
|
||||||
}
|
// List<MesProductionAssemblyContext> productionAssemblyContextList = productionDispatchContextStepService.getAssemblyDataList(workCenter);
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// //获取非排序线的装配件清单
|
||||||
|
// return doAssemblyShow2Nosort(reqBean, resultBean, stepResult, productionProcessContext, workCenter, cellEquipContext);
|
||||||
|
//
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// //获取排序线的装配件清单
|
||||||
|
// private StepResult doAssemblyShow2Sort(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult, MesProductionProcessContext productionProcessContext, MesWorkCenter workCenter, MesCellEquipContext cellEquipContext) {
|
||||||
|
//
|
||||||
|
// //从上下文中取出生产工单数据信息集合
|
||||||
|
// List<MesWorkOrderContext> workOrderContextList =
|
||||||
|
//
|
||||||
|
// //上下文中不存在生产工单数据信息集合
|
||||||
|
// if (CollectionUtils.isEmpty(workOrderContextList)) return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, String.format("生产线[%s]工位[%s]的上下文中已不存在生产工单数据信息,请重新扫描加工单!", reqBean.getWorkCenterCode(), reqBean.getWorkCellCode()));
|
||||||
|
//
|
||||||
|
// List<MesProductionAssemblyContext> productionAssemblyContextList = assemblyExtService.getProductionAssemblySortContextList(
|
||||||
|
// new MesProductionAssemblySortContext(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), reqBean.getProcessCode()), workOrderContextList.stream().filter(o -> null != o).map(MesWorkOrderContext::getWorkOrderNo).collect(Collectors.toList()));
|
||||||
|
//
|
||||||
|
// if (CollectionUtils.isEmpty(productionAssemblyContextList)) return stepResult;
|
||||||
|
//
|
||||||
|
// //设备
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// return stepResult;
|
||||||
|
//
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//
|
||||||
|
//}
|
||||||
|
|||||||
Loading…
Reference in New Issue