puxiao.liao
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

控制加工单数量 新表

Browse Source
uat-temp-wj-chongqingdaqu-prod-temp-control-order-qty
王杰 4 months ago
parent 14e5f7ef2f
commit bb93d155e3
8 changed files with 235 additions and 84 deletions
Show Stats Download Patch File Download Diff File

3
modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesShiftService.java
Unescape Escape View File

@ -27,4 +27,7 @@ public interface IMesShiftService {
@ApiOperation(value = "获取当前班次时间日期")
Map<String,String> getShiftTimeMap(MesProdShiftRecord record);
@ApiOperation(value = "根据当前时间计算实际整天班次的时间")
Map<String, String> calcAllDayShiftTimeMapByCurTime(String organizeCode, String workCenterCode);
}

12
modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionDispatchContextStepService.java
Unescape Escape View File

@ -55,18 +55,6 @@ public interface IMesProductionDispatchContextStepService {
@ApiOperation(value = "删除上下文发送允许加工指令执行结果")
void removeSendProcessCmdContext(StationRequestBean reqBean);
@ApiOperation(value = "获取上下文产出零件号")
List<MesEquipVariableCollectContext> getProductionPartNoContext(StationRequestBean reqBean);
@ApiOperation(value = "验证上下文产出零件号是否存在")
Boolean checkProductionPartNoIsExistContext(StationRequestBean reqBean);
@ApiOperation(value = "保存上下文产出零件号", notes = "[JSON]List<MesEquipVariableCollectContext>")
Boolean dispatchProductionPartNoContext(StationRequestBean reqBean, List<MesEquipVariableCollectContext> productionPartNoList);
@ApiOperation(value = "删除上下文产出零件号")
void removeProductionPartNoContext(StationRequestBean reqBean);
@ApiOperation(value = "获取上下文头道模具号")
MesEquipVariableCollectContext getFirstMouldNoContext(StationRequestBean reqBean);

5
modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkOrderExtService.java
Unescape Escape View File

@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
import io.swagger.annotations.ApiOperation;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -64,6 +65,8 @@ public interface IMesWorkOrderExtService {
void updateMesWorkOrderOrderStatusShippingByWorkOrderNo(String organizeCode, List<String> workOrderNoList,String userName);
@ApiOperation(value = "控制工单数量查询")
Map<String, Double> getControlOrderQtyMap(String organizeCode, String workCenterCode, String startTime, String endTime, List<String> partNoList);
Map<String, Double> getControlOrderQtyMap(String organizeCode, String workCenterCode, List<String> partNoList, String startTime, String endTime);
@ApiOperation(value = "完成工单数量查询")
Map<String, Double> getCompleteOrderQtyMap(String organizeCode, String workCenterCode, List<String> partNoList, String lotNo);
}

104
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesShiftServiceImpl.java
Unescape Escape View File

@ -2,7 +2,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.base;
import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesShiftService;
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
import cn.estsh.i3plus.mes.pcn.util.DateUtil;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
@ -13,17 +13,17 @@ import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.MesProdShiftRecord;
import cn.estsh.i3plus.pojo.mes.bean.MesShift;
import cn.estsh.i3plus.pojo.mes.repository.MesShiftRepository;
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
/**
@ -55,31 +55,49 @@ public class MesShiftServiceImpl implements IMesShiftService {
@Override
public List<MesShift> queryMesShift(String organizeCode, String workCenterCode) {
if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(workCenterCode)) return null;
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(workCenterCode, "workCenterCode", packBean);
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{MesPcnExtConstWords.SHIFT_CODE}, packBean);
return mesShiftRepository.findByHqlWhere(packBean);
}
@Override
public Map<String, String> getShiftTimeMap(MesProdShiftRecord record) {
if (StringUtils.isEmpty(record.getStartTime())) return null;
List<MesShift> shiftList = queryMesShift(record.getOrganizeCode(), record.getWorkCenterCode());
if (CollectionUtils.isEmpty(shiftList)) {
return null;
}
if (CollectionUtils.isEmpty(shiftList)) return null;
Optional<MesShift> shiftOptional = shiftList.stream().filter(t -> t.getShiftCode().equals(record.getShiftCode())).findFirst();
if (!shiftOptional.isPresent()) {
return null;
}
if (StringUtils.isEmpty(shiftOptional.get().getStartTime()) || StringUtils.isEmpty(shiftOptional.get().getEndTime()) || StringUtils.isEmpty(record.getStartTime())) {
return null;
if (null == shiftOptional || !shiftOptional.isPresent()) return null;
if (StringUtils.isEmpty(shiftOptional.get().getStartTime()) || StringUtils.isEmpty(shiftOptional.get().getEndTime())) return null;
if (StringUtils.isEmpty(shiftList.get(0).getStartTime())) return null;
//当天
String today = TimeTool.getToday();
//当天早班的开始时间
String todayStartTime = today + MesPcnExtConstWords.ONE_SPACE + shiftList.get(0).getStartTime();
//实际开班时间 比 当天早班的开始时间 小的情况下, 代表的是前一天的班次
if (record.getStartTime().compareTo(todayStartTime) < 0) {
String yesterday = calcDay(today, -1);
return calcShiftTime(shiftOptional.get().getStartTime(), shiftOptional.get().getEndTime(), yesterday);
} else {
//当天的班次
return calcShiftTime(shiftOptional.get().getStartTime(), shiftOptional.get().getEndTime(), today);
}
String startData = TimeTool.parseStringFormat(record.getStartTime(), DateUtil.BASE_FORMAT, DateUtil.SHORT_FORMAT);
//白班
String startTime = startData + " " + shiftOptional.get().getStartTime();
String endTime = startData + " " + shiftOptional.get().getEndTime();
//晚班
if (MesExtEnumUtil.SHIFT_CODE.SHIFT_CODE_20.getValue().equals(record.getShiftCode())) {
endTime = TimeTool.getToday(DateUtil.addDays(record.getStartTime(), 1)) + " " + shiftOptional.get().getEndTime();
}
//计算的实际班次开始与结束的时间
private Map<String, String> calcShiftTime(String shiftStartTime, String shiftEndTime, String calcDay) {
//待计算的实际班次开始与结束的时间
String startTime, endTime;
if (shiftStartTime.compareTo(shiftEndTime) < 0) {
//不跨天
startTime = calcDay + MesPcnExtConstWords.ONE_SPACE + shiftStartTime;
endTime = calcDay + MesPcnExtConstWords.ONE_SPACE + shiftEndTime;
} else {
//跨天
startTime = calcDay + MesPcnExtConstWords.ONE_SPACE + shiftStartTime;
endTime = calcDay(calcDay, 1) + MesPcnExtConstWords.ONE_SPACE + shiftEndTime;
}
Map<String, String> shiftTimeMap = new HashMap<>(2);
shiftTimeMap.put(MesPcnExtConstWords.START_TIME, startTime);
@ -87,4 +105,46 @@ public class MesShiftServiceImpl implements IMesShiftService {
return shiftTimeMap;
}
//计算天数
private String calcDay(String day, int amount) {
try {
DateFormat sdf = new SimpleDateFormat(MesPcnExtConstWords.DATE_FORMAT_SEPARATOR);
return TimeTool.timeCalc(sdf.parse(day), Calendar.DATE, amount, MesPcnExtConstWords.DATE_FORMAT_SEPARATOR);
} catch (ParseException e) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("时间计算失败")
.build();
}
}
//根据当前时间计算实际整天班次的时间
@Override
public Map<String, String> calcAllDayShiftTimeMapByCurTime(String organizeCode, String workCenterCode) {
//根据生产线查询关联的班次集合, 根据班次代码正序
List<MesShift> shiftList = queryMesShift(organizeCode, workCenterCode);
if (CollectionUtils.isEmpty(shiftList)) return null;
if (StringUtils.isEmpty(shiftList.get(0).getStartTime()) || StringUtils.isEmpty(shiftList.get(shiftList.size() - 1).getEndTime())) return null;
//当天
String today = TimeTool.getToday();
//当天早班的开始时间
String todayStartTime = today + MesPcnExtConstWords.ONE_SPACE + shiftList.get(0).getStartTime();
//当前时间 比 当天早班的开始时间 小的情况下, 代表的是前一天的班次
Map<String, String> shiftTimeMap;
if (TimeTool.getNowTime(true).compareTo(todayStartTime) < 0) {
String yesterday = calcDay(today, -1);
shiftTimeMap = calcShiftTime(shiftList.get(0).getStartTime(), shiftList.get(shiftList.size() - 1).getEndTime(), yesterday);
shiftTimeMap.put(MesPcnExtConstWords.LOT_NO, yesterday);
} else {
//当天的班次
shiftTimeMap = calcShiftTime(shiftList.get(0).getStartTime(), shiftList.get(shiftList.size() - 1).getEndTime(), today);
shiftTimeMap.put(MesPcnExtConstWords.LOT_NO, today);
}
return shiftTimeMap;
}
}

43
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderExtService.java
Unescape Escape View File

@ -5,15 +5,14 @@ import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProduceSnExtService;
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderExtService;
import cn.estsh.i3plus.ext.mes.pcn.apiservice.aspect.MonitorLog;
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
import cn.estsh.i3plus.platform.common.tool.MathOperation;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
import cn.estsh.i3plus.pojo.mes.bean.*;
import cn.estsh.i3plus.pojo.mes.repository.MesWorkOrderControlQtyRecordRepository;
import cn.estsh.i3plus.pojo.mes.repository.MesWorkOrderRepository;
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
import cn.hutool.core.date.DateUtil;
@ -40,6 +39,9 @@ public class MesWorkOrderExtService implements IMesWorkOrderExtService {
@Autowired
private IMesCustomerSnTransformService customerSnTransformService;
@Autowired
private MesWorkOrderControlQtyRecordRepository workOrderControlQtyRecordRepository;
//根据生产工单号集合 查询生产工单数据
@Override
public List<MesWorkOrder> getWorkOrderList(String organizeCode, List<String> workOrderNoList) {
@ -268,7 +270,7 @@ public class MesWorkOrderExtService implements IMesWorkOrderExtService {
}
@Override
public Map<String, Double> getControlOrderQtyMap(String organizeCode, String workCenterCode, String startTime, String endTime, List<String> partNoList) {
public Map<String, Double> getControlOrderQtyMap(String organizeCode, String workCenterCode, List<String> partNoList, String startTime, String endTime) {
if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(workCenterCode) ||
StringUtils.isEmpty(startTime) || StringUtils.isEmpty(endTime) || CollectionUtils.isEmpty(partNoList)) return null;
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
@ -278,11 +280,36 @@ public class MesWorkOrderExtService implements IMesWorkOrderExtService {
else DdlPreparedPack.getInPackList(partNoList, MesPcnExtConstWords.PART_NO, packBean);
List<MesWorkOrder> workOrderList = workOrderRepository.findByHqlWhere(packBean);
workOrderList = CollectionUtils.isEmpty(workOrderList) ? null :
workOrderList.stream().filter(o -> (null != o
&& o.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.CREATE.getValue()) != 0
&& !o.getOrderFlag().equals(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue()))).collect(Collectors.toList());
workOrderList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getPartNo()) && !StringUtils.isEmpty(o.getWorkOrderStatus()) && !StringUtils.isEmpty(o.getOrderFlag())
&& o.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.CREATE.getValue()) != 0 && !o.getOrderFlag().equals(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.P.getValue()))).collect(Collectors.toList());
if (CollectionUtils.isEmpty(workOrderList)) return null;
Map<String, List<MesWorkOrder>> workOrderMap = workOrderList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesWorkOrder::getPartNo));
Map<String, Double> controlOrderQtyMap = new HashMap<>();
Double qty;
for (Map.Entry<String, List<MesWorkOrder>> entry : workOrderMap.entrySet()) {
if (null == entry) continue;
qty = new Double(MesPcnExtConstWords.ZERO);
for (MesWorkOrder workOrder : entry.getValue()) {
if (null == workOrder) continue;
qty = MathOperation.add(qty, workOrder.getWorkOrderStatus().compareTo(MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()) >= 0 ? workOrder.getCompleteQty() : workOrder.getQty());
}
controlOrderQtyMap.put(entry.getKey(), qty);
}
return controlOrderQtyMap;
}
@Override
public Map<String, Double> getCompleteOrderQtyMap(String organizeCode, String workCenterCode, List<String> partNoList, String lotNo) {
if (StringUtils.isEmpty(organizeCode) || StringUtils.isEmpty(workCenterCode) || StringUtils.isEmpty(lotNo) || CollectionUtils.isEmpty(partNoList)) return null;
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(lotNo, MesPcnExtConstWords.LOT_NO, packBean);
DdlPreparedPack.getStringEqualPack(workCenterCode, MesPcnExtConstWords.WORK_CENTER_CODE, packBean);
if (partNoList.size() == 1) DdlPreparedPack.getStringEqualPack(partNoList.get(0), MesPcnExtConstWords.PART_NO, packBean);
else DdlPreparedPack.getInPackList(partNoList, MesPcnExtConstWords.PART_NO, packBean);
List<MesWorkOrderControlQtyRecord> workOrderControlQtyRecordList = workOrderControlQtyRecordRepository.findByHqlWhere(packBean);
return CollectionUtils.isEmpty(workOrderControlQtyRecordList) ? null :
workOrderControlQtyRecordList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesWorkOrderControlQtyRecord::getPartNo, Collectors.summingDouble(MesWorkOrderControlQtyRecord::getQty)));
}
}

123
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionDataSaveBeforeControlOrderStepService.java
Unescape Escape View File

@ -1,23 +1,24 @@
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.step;
import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesShiftService;
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.IMesProductionRecordService;
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderExtService;
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProdRuleContext;
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsInContext;
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionPsOutContext;
import cn.estsh.i3plus.ext.mes.pcn.pojo.context.*;
import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.IStepService;
import cn.estsh.i3plus.mes.pcn.util.StringUtil;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.tool.MathOperation;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.mes.bean.MesProductionRecord;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderControlQtyRecord;
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.repository.MesWorkOrderControlQtyRecordRepository;
import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
import com.alibaba.fastjson.JSONObject;
@ -27,10 +28,7 @@ import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.StringJoiner;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -51,11 +49,19 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep
private IMesProductionRecordService productionRecordService;
@Autowired
private IMesShiftService shiftService;
@Autowired
private IMesWorkOrderExtService workOrderExtService;
@Autowired
private MesWorkOrderControlQtyRecordRepository workOrderControlQtyRecordRepository;
@Override
public StepResult execute(StationRequestBean reqBean) {
StepResult stepResult = StepResult.getSuccessComplete();
StationResultBean resultBean = new StationResultBean();
//获取上下文信息: 处理加工不可用规则
@ -76,6 +82,11 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep
//获取进料主条码数据信息
List<MesProductionPsInContext> productionPsInContextList = productionDispatchContextStepService.getProductionPsInContext(reqBean);
Map<Integer, MesProductionPsInContext> psiMap = CollectionUtils.isEmpty(productionPsInContextList) ? null : productionPsInContextList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getForeignKey()))).collect(Collectors.toMap(MesProductionPsInContext::getForeignKey, o -> o));
//获取上下文产出零件信息
List<MesProductionPartContext> productionPartContextList = productionDispatchContextStepService.getProductionPartContext(reqBean);
//当前不能生产的零件号
List<String> unProductionPartNoList = null;
Loop:
synchronized (new StringJoiner(MesPcnExtConstWords.COLON).add(reqBean.getOrganizeCode()).add(reqBean.getWorkCenterCode()).add(MesPcnExtConstWords.WORK_ORDER_COMPLETE_CONTEXT).toString().intern()) {
@ -87,15 +98,34 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep
if (CollectionUtils.isEmpty(reportPsMap)) break Loop;
List<MesWorkOrder> workOrderList = workOrderExtService.getWorkOrderList()
//需要汇报的零件号
List<String> partNoList = new ArrayList<>(reportPsMap.keySet());
//根据当前时间计算实际整天班次的时间
Map<String, String> shiftTimeMap = shiftService.calcAllDayShiftTimeMapByCurTime(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode());
//控制工单数量查询
Map<String, Double> controlOrderQtyMap = workOrderExtService.getControlOrderQtyMap(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(),
partNoList, shiftTimeMap.get(MesPcnExtConstWords.START_TIME), shiftTimeMap.get(MesPcnExtConstWords.END_TIME));
//存在工单的零件号
List<String> existOrderPartNoList = CollectionUtils.isEmpty(controlOrderQtyMap) ? null : new ArrayList<>(controlOrderQtyMap.keySet());
//查询存在工单的零件号对应的完成工单数量
Map<String, Double> completeOrderQtyMap = workOrderExtService.getCompleteOrderQtyMap(
reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), existOrderPartNoList, shiftTimeMap.get(MesPcnExtConstWords.LOT_NO));
//匹配失败需要清除本次扫描/读取信息
if (!stepResult.isCompleted() && workOrderCheckCompleteQtyStepService.doBusiCheckToDelete(reqBean, stepResult, productionPartContextList, productionPsInContextList))
return stepResult.nextTriggerEvent(MesPcnExtConstWords.NEXT_TRIGGER_EVENT_PART_NO);
Double planQty, completeQty;
for (Map.Entry<String, List<MesProductionPsOutContext>> entry : reportPsMap.entrySet()) {
if (null == entry) continue;
planQty = (!CollectionUtils.isEmpty(controlOrderQtyMap) && controlOrderQtyMap.containsKey(entry.getKey())) ? controlOrderQtyMap.get(entry.getKey()) : new Double(MesPcnExtConstWords.ZERO);
completeQty = (!CollectionUtils.isEmpty(completeOrderQtyMap) && completeOrderQtyMap.containsKey(entry.getKey())) ? completeOrderQtyMap.get(entry.getKey()) : new Double(MesPcnExtConstWords.ZERO);
if (MathOperation.compareTo(MathOperation.add(completeQty, new Double(entry.getValue().size())), planQty) <= 0) continue;
if (CollectionUtils.isEmpty(unProductionPartNoList)) unProductionPartNoList = new ArrayList<>();
unProductionPartNoList.add(entry.getKey());
}
if (!CollectionUtils.isEmpty(unProductionPartNoList)) break Loop;
//非排序线 保存加工结果工步 execute 方法 使用的是 新事务
stepResult = ((IStepService) SpringContextsUtil.getBean("mesProductionDataSaveStepService")).execute(reqBean);
@ -107,10 +137,38 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep
stepService.executeStepAfterExecute(reqBean, stepResult);
}
if (stepResult.isCompleted()) insertWorkOrderControlQtyRecord(reqBean, reportPsMap, shiftTimeMap.get(MesPcnExtConstWords.LOT_NO));
return stepResult;
}
//非排序线 保存加工结果工步 execute 方法 使用的是 新事务
return ((IStepService) SpringContextsUtil.getBean("mesProductionDataSaveStepService")).execute(reqBean);
if (CollectionUtils.isEmpty(unProductionPartNoList))
return ((IStepService) SpringContextsUtil.getBean("mesProductionDataSaveStepService")).execute(reqBean);
stepNonCompleteAndSendMsg(reqBean, resultBean.writeDbLog(), stepResult, String.format("控制加工单数量验证零件号%s当前无法继续生产!", unProductionPartNoList.toString()));
stepResult.nextTriggerEvent(MesPcnExtConstWords.NEXT_TRIGGER_EVENT_ASSEMBLY);
if (!CollectionUtils.isEmpty(productionPsInContextList)) {
productionDispatchContextStepService.removeProductionPsInContext(reqBean);
stepResult.nextTriggerEvent(MesPcnExtConstWords.NEXT_TRIGGER_EVENT_PRODUCT_SN);
}
if (!CollectionUtils.isEmpty(productionPartContextList)) {
productionDispatchContextStepService.removeProductionPartContext(reqBean);
productionProcessContextStepService.removeFunctionChooseCavityOrderContext(reqBean);
productionProcessContextStepService.removeFunctionChooseCavityPartContext(reqBean);
stepResult.nextTriggerEvent(MesPcnExtConstWords.NEXT_TRIGGER_EVENT_PART_NO);
}
productionDispatchContextStepService.removeProdRuleDataContext(reqBean);
if (productionDispatchContextStepService.checkFirstMouldNoIsExistContext(reqBean)) {
//存在头道模具号场景下 必须抛出异常 因为头道模具号的接口逻辑会配置非常变值,也就是每次返回回去都会拿到头道模具号 就会出现死循环线程
productionDispatchContextStepService.removeFirstMouldNoContext(reqBean);
foundExThrowNoShowMsg();
}
return stepResult;
}
@ -141,4 +199,41 @@ public class MesProductionDataSaveBeforeControlOrderStepService extends BaseStep
return (null != optional && optional.isPresent()) ? true : false;
}
private void insertWorkOrderControlQtyRecord(StationRequestBean reqBean, Map<String, List<MesProductionPsOutContext>> reportPsMap, String lotNo) {
if (CollectionUtils.isEmpty(reportPsMap)) return;
//获取上下文产品加工规则数据信息集合
List<MesProdRuleContext> prodRuleContextList = productionDispatchContextStepService.getProdRuleDataContext(reqBean);
//加工规则根据数据关联键分组
Map<Integer, MesProdRuleContext> prodRuleContextMap = CollectionUtils.isEmpty(prodRuleContextList) ? null :
prodRuleContextList.stream().filter(o -> null != o).collect(Collectors.toMap(MesProdRuleContext::getForeignKey, o -> o));
//获取上下文工位扫描监控信息
MesScanMonitorContext scanMonitorContext = productionProcessContextStepService.getScanMonitorContext(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode(), reqBean.getWorkCellCode());
for (Map.Entry<String, List<MesProductionPsOutContext>> entry : reportPsMap.entrySet()) {
if (null == entry) continue;
for (MesProductionPsOutContext productionPsOutContext : entry.getValue()) {
if (null == productionPsOutContext) continue;
MesWorkOrderControlQtyRecord workOrderControlQtyRecord = new MesWorkOrderControlQtyRecord();
workOrderControlQtyRecord.setOrganizeCode(reqBean.getOrganizeCode());
workOrderControlQtyRecord.setWorkCenterCode(reqBean.getWorkCenterCode());
workOrderControlQtyRecord.setWorkCellCode(reqBean.getWorkCellCode());
workOrderControlQtyRecord.setProductSn(productionPsOutContext.getProductSn());
workOrderControlQtyRecord.setQty(productionPsOutContext.getQty());
workOrderControlQtyRecord.setPartNo(productionPsOutContext.getPartNo());
workOrderControlQtyRecord.setLotNo(lotNo);
workOrderControlQtyRecord.setShiftCode(productionPsOutContext.getShiftCode());
workOrderControlQtyRecord.setShiftGroup(productionPsOutContext.getShiftGroup());
workOrderControlQtyRecord.setPid(productionPsOutContext.getId());
if (null != scanMonitorContext) workOrderControlQtyRecord.setMouldRecordId(scanMonitorContext.getMouldRecordId());
if (!CollectionUtils.isEmpty(prodRuleContextMap) && prodRuleContextMap.containsKey(productionPsOutContext.getForeignKey())) {
workOrderControlQtyRecord.setProductionRecordId(prodRuleContextMap.get(productionPsOutContext.getForeignKey()).getProductionRecordId());
}
ConvertBean.serviceModelInitialize(workOrderControlQtyRecord, reqBean.getUserInfo());
workOrderControlQtyRecordRepository.insert(workOrderControlQtyRecord);
}
}
}
}

27
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionDispatchContextStepService.java
Unescape Escape View File

@ -125,33 +125,6 @@ public class MesProductionDispatchContextStepService extends BaseStepService imp
removeFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.SEND_PROCESS_CMD_CONTEXT);
}
//获取上下文产出零件号
@Override
public List<MesEquipVariableCollectContext> getProductionPartNoContext(StationRequestBean reqBean) {
String productionPartNoJson = getFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.FIRST_MOULD_NO_CONTEXT);
return !StringUtils.isEmpty(productionPartNoJson) ? JSONObject.parseArray(productionPartNoJson, MesEquipVariableCollectContext.class) : null;
}
//验证上下文产出零件号是否存在
@Override
public Boolean checkProductionPartNoIsExistContext(StationRequestBean reqBean) {
String firstMouldNo = getFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.FIRST_MOULD_NO_CONTEXT);
return !StringUtils.isEmpty(firstMouldNo) ? true : false;
}
//保存上下文产出零件号 [JSON]List<MesEquipVariableCollectContext>
@Override
public Boolean dispatchProductionPartNoContext(StationRequestBean reqBean, List<MesEquipVariableCollectContext> productionPartNoList) {
if (CollectionUtils.isEmpty(productionPartNoList)) return false;
return dispatchFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.FIRST_MOULD_NO_CONTEXT, JSONObject.toJSONString(productionPartNoList));
}
//删除上下文产出零件号
@Override
public void removeProductionPartNoContext(StationRequestBean reqBean) {
removeFsmBusiData(reqBean.getOrganizeCode(), getContextKey(reqBean), MesPcnExtConstWords.FIRST_MOULD_NO_CONTEXT);
}
//获取上下文头道模具号
@Override
public MesEquipVariableCollectContext getFirstMouldNoContext(StationRequestBean reqBean) {

2
modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
Unescape Escape View File

@ -568,6 +568,8 @@ public class MesPcnExtConstWords {
public static final Integer FIVE_HUNDRED = 500;
// 中括号
public static final String SQUARE_BRACKETS = "[]";
//空格
public static final String ONE_SPACE = " ";
// &
public static final String AND = "&";
// 空

Write Preview
Loading…
Cancel
Save