|
|
@ -1343,7 +1343,8 @@ public class MesWorkOrderService implements IMesWorkOrderService {
|
|
|
|
isItemMove = false;
|
|
|
|
isItemMove = false;
|
|
|
|
MesPart itemPart = getMesPart(model.getMesPartMap(), orderPart.getPartNo());
|
|
|
|
MesPart itemPart = getMesPart(model.getMesPartMap(), orderPart.getPartNo());
|
|
|
|
if (StringUtil.isEmpty(itemPart.getEsd()) || !mesMoveRuleMap.containsKey(itemPart.getEsd())) {
|
|
|
|
if (StringUtil.isEmpty(itemPart.getEsd()) || !mesMoveRuleMap.containsKey(itemPart.getEsd())) {
|
|
|
|
MesPcnException.throwMesBusiException("客供品移库零件【%s】维护的ESD属性未匹配到零件生产组【%s】中的移库规则", orderPart.getPartNo(),workOrder.getPartProdGroupCode());
|
|
|
|
LOGGER.info("客供品移库零件【{}】维护的ESD属性未匹配到零件生产组【{}】中的移库规则", orderPart.getPartNo(),workOrder.getPartProdGroupCode());
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
moveRule = mesMoveRuleMap.get(itemPart.getEsd()).iterator().next();
|
|
|
|
moveRule = mesMoveRuleMap.get(itemPart.getEsd()).iterator().next();
|
|
|
|
if (MesExtEnumUtil.MOVE_TYPE_REPORT_TYPE.REPORT_MOVE.getValue() == moveRule.getReportType()) {
|
|
|
|
if (MesExtEnumUtil.MOVE_TYPE_REPORT_TYPE.REPORT_MOVE.getValue() == moveRule.getReportType()) {
|
|
|
@ -1356,7 +1357,8 @@ public class MesWorkOrderService implements IMesWorkOrderService {
|
|
|
|
} else if (MesExtEnumUtil.MOVE_TYPE_REPORT_TYPE.SHIPPING.getValue() == moveRule.getReportType()) {
|
|
|
|
} else if (MesExtEnumUtil.MOVE_TYPE_REPORT_TYPE.SHIPPING.getValue() == moveRule.getReportType()) {
|
|
|
|
shippingList.add(getMesJisShipping(model.getOrganizeCode(), workOrder.getWorkOrderNo(), workOrder.getCustCode(), record.getProductSn(), moveRule.getErpSrcLocateNo(), orderPart, model.getUserName()));
|
|
|
|
shippingList.add(getMesJisShipping(model.getOrganizeCode(), workOrder.getWorkOrderNo(), workOrder.getCustCode(), record.getProductSn(), moveRule.getErpSrcLocateNo(), orderPart, model.getUserName()));
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
MesPcnException.throwMesBusiException("客供品移库零件【%s】在零件生产组【%s】的移库规则中,汇报类型未维护", orderPart.getPartNo(), workOrder.getPartProdGroupCode());
|
|
|
|
LOGGER.info("客供品移库零件【{}】在零件生产组【{}】的移库规则中,汇报类型未维护", orderPart.getPartNo(), workOrder.getPartProdGroupCode());
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//汇报
|
|
|
|
//汇报
|
|
|
|
if (isItemReport) {
|
|
|
|
if (isItemReport) {
|
|
|
|