forked from I3-YF/i3plus-mes-pcn-yfai
Merge remote-tracking branch 'origin/dev' into dev
administrator
11 months ago
commit
8e349da2f7
@ -1,100 +1,211 @@
|
|||||||
//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.IMesProductionDispatchContextStepService;
|
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.api.busi.IMesProductionProcessContextStepService;
|
||||||
//import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderExtService;
|
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderExtService;
|
||||||
//import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesEquipVariableCollectContext;
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesCellEquipContext;
|
||||||
//import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPartContext;
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesEquipVariableCollectContext;
|
||||||
//import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPartContext;
|
||||||
//import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
|
||||||
//import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
|
||||||
//import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
|
import cn.estsh.i3plus.mes.pcn.actor.shipping.dispatch.IFsmCommonService;
|
||||||
//import cn.estsh.i3plus.pojo.mes.model.StepResult;
|
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
|
||||||
//import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
|
import cn.estsh.i3plus.mes.pcn.util.StationKvBeanUtil;
|
||||||
//import lombok.extern.slf4j.Slf4j;
|
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||||
//import org.springframework.beans.factory.annotation.Autowired;
|
import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
|
||||||
//import org.springframework.stereotype.Service;
|
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
|
||||||
//import org.springframework.util.CollectionUtils;
|
import cn.estsh.i3plus.pojo.mes.model.StationKvBean;
|
||||||
//
|
import cn.estsh.i3plus.pojo.mes.model.StationRequestBean;
|
||||||
//import java.util.ArrayList;
|
import cn.estsh.i3plus.pojo.mes.model.StationResultBean;
|
||||||
//import java.util.List;
|
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
|
import org.springframework.util.StringUtils;
|
||||||
//@Service("mesWorkOrderCheckSortStepService")
|
|
||||||
//public class MesWorkOrderCheckSortStepService extends BaseStepService {
|
import java.util.ArrayList;
|
||||||
//
|
import java.util.List;
|
||||||
// @Autowired
|
import java.util.Map;
|
||||||
// private IMesProductionProcessContextStepService productionProcessContextStepService;
|
import java.util.Optional;
|
||||||
//
|
import java.util.stream.Collectors;
|
||||||
// @Autowired
|
|
||||||
// private IMesProductionDispatchContextStepService productionDispatchContextStepService;
|
/**
|
||||||
//
|
* @Description : 加工单验证工步【排序】
|
||||||
// @Autowired
|
* @Author : wangjie
|
||||||
// private IMesWorkOrderExtService workOrderExtService;
|
**/
|
||||||
//
|
@Slf4j
|
||||||
// @Override
|
@Service("mesWorkOrderCheckSortStepService")
|
||||||
// public StepResult execute(StationRequestBean reqBean) {
|
public class MesWorkOrderCheckSortStepService extends BaseStepService {
|
||||||
//
|
|
||||||
// StationResultBean resultBean = new StationResultBean();
|
@Autowired
|
||||||
//
|
private IMesProductionProcessContextStepService productionProcessContextStepService;
|
||||||
// StepResult stepResult = StepResult.getSuccessComplete();
|
|
||||||
//
|
@Autowired
|
||||||
// //获取上下文信息
|
private IMesProductionDispatchContextStepService productionDispatchContextStepService;
|
||||||
// MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getCurCellEquipment(reqBean);
|
|
||||||
//
|
@Autowired
|
||||||
// //配置错误 抛出异常
|
private IMesWorkOrderExtService workOrderExtService;
|
||||||
// if (!productionProcessContext.getSuccess()) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
|
|
||||||
//
|
@Autowired
|
||||||
// //存储生产过程上下文对象
|
private IFsmCommonService fsmCommonService;
|
||||||
// productionProcessContextStepService.saveProductionProcessContext(reqBean, productionProcessContext);
|
|
||||||
//
|
@Override
|
||||||
// //获取上下文生产扫/读信息:加工单
|
public StepResult execute(StationRequestBean reqBean) {
|
||||||
// List<MesEquipVariableCollectContext> equipVariableCollectContextList = productionDispatchContextStepService.getScanWorkOrderNoContext(reqBean);
|
|
||||||
//
|
StationResultBean resultBean = new StationResultBean();
|
||||||
// if (CollectionUtils.isEmpty(equipVariableCollectContextList)) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), "上下文中缺失待验证的加工单信息!");
|
|
||||||
//
|
StepResult stepResult = StepResult.getSuccessComplete();
|
||||||
// //获取上下文产出零件信息
|
|
||||||
// List<MesProductionPartContext> cachedProductionPartContextList = productionDispatchContextStepService.getProductionPartContext(reqBean);
|
//获取上下文信息
|
||||||
//
|
MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getCurCellEquipment(reqBean);
|
||||||
// //清除本次已获取得到的加工单信息
|
|
||||||
// productionDispatchContextStepService.deleteScanWorkOrderNoContext(reqBean);
|
//配置错误 抛出异常
|
||||||
//
|
if (!productionProcessContext.getSuccess()) execExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
|
||||||
// //非扫描场景 清除历史产出零件信息
|
|
||||||
// if (MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue() != equipVariableCollectContextList.get(0).getMessageSource() && !CollectionUtils.isEmpty(cachedProductionPartContextList)) productionDispatchContextStepService.deleteProductionPartContext(reqBean);
|
//存储生产过程上下文对象
|
||||||
//
|
productionProcessContextStepService.saveProductionProcessContext(reqBean, productionProcessContext);
|
||||||
// //验证工单的有效性
|
|
||||||
// List<MesProductionPartContext> productionPartContextList = new ArrayList<>();
|
//获取上下文生产扫/读信息:加工单
|
||||||
// if (!checkWorkOrderValid(reqBean, resultBean, stepResult, productionProcessContext, equipVariableCollectContextList, productionPartContextList).isCompleted()) return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, stepResult.getMsg());
|
List<MesEquipVariableCollectContext> equipVariableCollectContextList = productionDispatchContextStepService.getScanWorkOrderNoContext(reqBean);
|
||||||
//
|
|
||||||
// //扫描场景下合并历史产出零件信息
|
if (CollectionUtils.isEmpty(equipVariableCollectContextList)) return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "上下文中缺失待验证的加工单信息!");
|
||||||
// if (MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue() == equipVariableCollectContextList.get(0).getMessageSource() && !CollectionUtils.isEmpty(cachedProductionPartContextList)) productionPartContextList.addAll(cachedProductionPartContextList);
|
|
||||||
//
|
//获取上下文产出零件信息
|
||||||
// //保存上下文产出零件信息
|
List<MesProductionPartContext> cachedProductionPartContextList = productionDispatchContextStepService.getProductionPartContext(reqBean);
|
||||||
// productionDispatchContextStepService.saveProductionPartContext(reqBean, productionPartContextList);
|
|
||||||
//
|
//清除本次已获取得到的加工单信息
|
||||||
// //更新展示组件MODULE_CONTENT内容
|
productionDispatchContextStepService.deleteScanWorkOrderNoContext(reqBean);
|
||||||
// doCacheMoudleContext(reqBean, productionPartContextList);
|
|
||||||
//
|
//扫描场景下验证是否匹配工艺跳过码, 验证通过则 保存到上下文扫/读信息:主条码, 传送到下个工步 主条码验证工步, 避免后续排序工单的数量不是1的情况下, 扫描工艺跳过码只能在扫描主条码工步中使用
|
||||||
// if (MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue() != equipVariableCollectContextList.get(0).getMessageSource()) return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean, stepResult, String.format("上下文中的加工单%s验证工单状态成功!", stepResult.getObj().toString()));
|
if (MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue() == equipVariableCollectContextList.get(0).getMessageSource() && matchCraftJumpCode(reqBean, equipVariableCollectContextList))
|
||||||
//
|
return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, String.format("当前扫描信息工艺跳过码[%s]!", equipVariableCollectContextList.get(0).getEquipVariableValue()));
|
||||||
//
|
|
||||||
//
|
//非扫描场景 清除历史产出零件信息
|
||||||
//
|
if (MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue() != equipVariableCollectContextList.get(0).getMessageSource() && !CollectionUtils.isEmpty(cachedProductionPartContextList)) productionDispatchContextStepService.deleteProductionPartContext(reqBean);
|
||||||
//
|
|
||||||
//
|
//验证工单的有效性
|
||||||
//
|
List<MesProductionPartContext> productionPartContextList = new ArrayList<>();
|
||||||
//
|
if (!checkWorkOrderValid(reqBean, resultBean, stepResult, productionProcessContext, equipVariableCollectContextList, productionPartContextList).isCompleted()) return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, stepResult.getMsg());
|
||||||
//
|
|
||||||
//
|
//扫描场景下合并历史产出零件信息
|
||||||
// return stepResult;
|
if (MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue() == equipVariableCollectContextList.get(0).getMessageSource() && !CollectionUtils.isEmpty(cachedProductionPartContextList)) productionPartContextList.addAll(cachedProductionPartContextList);
|
||||||
//
|
|
||||||
// }
|
//非扫描场景 验证是否全部为空腔
|
||||||
//
|
if (MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue() != equipVariableCollectContextList.get(0).getMessageSource() && checkIsAllFinishCode(productionPartContextList))
|
||||||
//
|
return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, String.format("当前%s信息全部为空腔!", MesExtEnumUtil.CELL_MESSAGE_SOURCE.valueOfDescription(equipVariableCollectContextList.get(0).getMessageSource())));
|
||||||
//
|
|
||||||
//
|
//保存上下文产出零件信息
|
||||||
//}
|
productionDispatchContextStepService.saveProductionPartContext(reqBean, productionPartContextList);
|
||||||
|
|
||||||
|
//更新展示组件MODULE_CONTENT内容
|
||||||
|
doCacheMoudleContext(reqBean, productionPartContextList);
|
||||||
|
|
||||||
|
if (MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue() != equipVariableCollectContextList.get(0).getMessageSource()) return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean, stepResult, String.format("上下文中的加工单%s验证工单状态成功!", stepResult.getObj().toString()));
|
||||||
|
|
||||||
|
//当前工位使用的设备
|
||||||
|
MesCellEquipContext cellEquipmentContext = productionProcessContext.getCurCellEquip();
|
||||||
|
|
||||||
|
if (cellEquipmentContext.getCavity().compareTo(productionPartContextList.size()) > 0)
|
||||||
|
return execDynamicsCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, false,
|
||||||
|
MesPcnEnumUtil.STATION_BUSI_TYPE.MESSAGE, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT, String.format("当前扫描信息加工单[%s]验证工单状态成功,已知腔数[%s],还需要再连续扫描[%s]次加工单!",
|
||||||
|
equipVariableCollectContextList.get(0).getEquipVariableValue(), cellEquipmentContext.getCavity(), cellEquipmentContext.getCavity() - productionPartContextList.size()));
|
||||||
|
|
||||||
|
//扫描场景 验证是否全部为空腔
|
||||||
|
if (!checkIsAllFinishCode(productionPartContextList))
|
||||||
|
return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, String.format("当前扫描信息加工单[%s]验证工单状态成功,上下文中的加工单个数[%s]已满足腔数!", equipVariableCollectContextList.get(0).getEquipVariableValue(), productionPartContextList.size()));
|
||||||
|
|
||||||
|
//删除上下文产出零件信息
|
||||||
|
productionDispatchContextStepService.deleteProductionPartContext(reqBean);
|
||||||
|
|
||||||
|
return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "当前扫描信息全部为空腔!");
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
//验证是否匹配工艺跳过码
|
||||||
|
private Boolean matchCraftJumpCode(StationRequestBean reqBean, List<MesEquipVariableCollectContext> equipVariableCollectContextList) {
|
||||||
|
|
||||||
|
if (!equipVariableCollectContextList.get(0).getEquipVariableValue().equals(getCraftJumpCode(reqBean))) return false;
|
||||||
|
|
||||||
|
//保存上下文扫/读信息:主条码, 传送到下个工步 主条码验证工步, 避免后续排序工单的数量不是1的情况下, 扫描工艺跳过码只能在扫描主条码工步中使用
|
||||||
|
productionDispatchContextStepService.saveScanProductSnContext(reqBean, equipVariableCollectContextList);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private Boolean checkIsAllFinishCode(List<MesProductionPartContext> productionPartContextList) {
|
||||||
|
Optional<MesProductionPartContext> optional = productionPartContextList.stream().filter(o -> (null != o && o.getIsFinishCode().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0)).findFirst();
|
||||||
|
return (null != optional && optional.isPresent()) ? false : true;
|
||||||
|
}
|
||||||
|
|
||||||
|
//验证工单的有效性
|
||||||
|
private StepResult checkWorkOrderValid(StationRequestBean reqBean, StationResultBean resultBean, StepResult stepResult,
|
||||||
|
MesProductionProcessContext productionProcessContext, List<MesEquipVariableCollectContext> equipVariableCollectContextList, List<MesProductionPartContext> productionPartContextList) {
|
||||||
|
|
||||||
|
//搜集生产工单号
|
||||||
|
List<String> filterList = equipVariableCollectContextList.stream().filter(o -> (null != o)).map(MesEquipVariableCollectContext::getEquipVariableValue).collect(Collectors.toList());
|
||||||
|
List<String> workOrderNoList = filterList.stream().filter(o -> (!StringUtils.isEmpty(o) && !o.equals(productionProcessContext.getFinishCode()))).distinct().collect(Collectors.toList());
|
||||||
|
|
||||||
|
//获取生产工单信息
|
||||||
|
Map<String, MesWorkOrder> workOrderMap = workOrderExtService.getWorkOrderMap(reqBean.getOrganizeCode(), workOrderNoList);
|
||||||
|
|
||||||
|
if (!CollectionUtils.isEmpty(workOrderNoList)) {
|
||||||
|
|
||||||
|
for (String workOrderNo : workOrderNoList) {
|
||||||
|
|
||||||
|
if (StringUtils.isEmpty(workOrderNo)) continue;
|
||||||
|
|
||||||
|
MesWorkOrder workOrderDb = (CollectionUtils.isEmpty(workOrderMap) || !workOrderMap.containsKey(workOrderNo)) ? null : workOrderMap.get(workOrderNo);
|
||||||
|
if (null == workOrderDb)
|
||||||
|
return stepResult.isCompleted(false).msg(String.format("加工单号[%s]无效!", workOrderNo));
|
||||||
|
|
||||||
|
if (!MesExtEnumUtil.ORDER_STATUS.checkSortAllowStatus(workOrderDb.getWorkOrderStatus()))
|
||||||
|
return stepResult.isCompleted(false).msg(String.format("加工单[%s]信息工单状态[%s]!", workOrderNo, MesExtEnumUtil.ORDER_STATUS.valueOfDescription(workOrderDb.getWorkOrderStatus())));
|
||||||
|
|
||||||
|
if (!workOrderDb.getWorkCenterCode().equals(reqBean.getWorkCenterCode()))
|
||||||
|
return stepResult.isCompleted(false).msg(String.format("加工单[%s]信息所属生产线[%s]与当前生产线[%s]不一致!", workOrderNo, workOrderDb.getWorkCenterCode(), reqBean.getWorkCenterCode()));
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//封装产出零件信息
|
||||||
|
equipVariableCollectContextList.stream().filter(o -> null != o).forEach(o -> productionPartContextList.add(
|
||||||
|
new MesProductionPartContext().copyPartNo((!CollectionUtils.isEmpty(workOrderMap) && workOrderMap.containsKey(o.getEquipVariableValue())) ? workOrderMap.get(o.getEquipVariableValue()) : null)));
|
||||||
|
|
||||||
|
return stepResult.obj(filterList);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
//工艺跳过码
|
||||||
|
private String getCraftJumpCode(StationRequestBean reqBean) {
|
||||||
|
Map<String, String> wcpcMap = fsmCommonService.doHandleFsmWcpcMapDataForDoScan(reqBean);
|
||||||
|
return wcpcMap.containsKey(MesPcnExtConstWords.CRAFT_JUMP_CODE) ? wcpcMap.get(MesPcnExtConstWords.CRAFT_JUMP_CODE) : MesPcnExtConstWords.CRAFT_JUMP_CODE;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void doCacheMoudleContext(StationRequestBean reqBean, List<MesProductionPartContext> productionPartContextList) {
|
||||||
|
//存储展示组件MODULE_CONTENT内容
|
||||||
|
productionDispatchContextStepService.saveModuleContentContext(reqBean, getModuleContextData(reqBean, productionPartContextList));
|
||||||
|
}
|
||||||
|
|
||||||
|
//封装展示组件MODULE_CONTENT内容
|
||||||
|
private List<List<StationKvBean>> getModuleContextData(StationRequestBean reqBean, List<MesProductionPartContext> productionPartContextList) {
|
||||||
|
List<List<StationKvBean>> dataList = new ArrayList<>();
|
||||||
|
List<MesProductionPartContext> orderList = filterProductionPartContext(productionPartContextList, true);
|
||||||
|
List<MesProductionPartContext> finishCodeList = filterProductionPartContext(productionPartContextList, false);
|
||||||
|
if (!CollectionUtils.isEmpty(orderList))
|
||||||
|
orderList.forEach(o -> StationKvBeanUtil.addStationKvBeanList(dataList, new ArrayList<>(),
|
||||||
|
new StationKvBean(MesPcnExtConstWords.WORK_ORDER_NO, "工单号", o.getWorkOrderNo()), new StationKvBean(MesPcnExtConstWords.PART_NO, "零件编码", o.getPartNo()), new StationKvBean(MesPcnExtConstWords.QTY, "工单数", String.valueOf(o.getQty().intValue()))));
|
||||||
|
if (!CollectionUtils.isEmpty(finishCodeList))
|
||||||
|
StationKvBeanUtil.addStationKvBeanList(dataList, new ArrayList<>(), new StationKvBean(MesPcnExtConstWords.CAVITY_FINISH_CODE, "空腔数", String.valueOf(finishCodeList.size())));
|
||||||
|
return dataList;
|
||||||
|
}
|
||||||
|
|
||||||
|
//根据是否空腔搜集数据
|
||||||
|
private List<MesProductionPartContext> filterProductionPartContext(List<MesProductionPartContext> productionPartContextList, Boolean flag) {
|
||||||
|
return flag ? productionPartContextList.stream().filter(o -> (null != o && o.getIsFinishCode().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) != 0)).collect(Collectors.toList()) :
|
||||||
|
productionPartContextList.stream().filter(o -> (null != o && o.getIsFinishCode().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0)).collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue