|
|
@ -411,7 +411,7 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
|
|
|
|
String serialNo = resultList.get(0).replace("MES_WORK_ORDER_NO_WU_HAN", "");
|
|
|
|
String serialNo = resultList.get(0).replace("MES_WORK_ORDER_NO_WU_HAN", "");
|
|
|
|
String orderNoWuHan=organizeCode+mesWorkOrder.getOrderFlag()+sortInfo.getCustOrderCode()+mesWorkOrder.getShiftCode() + serialNo;
|
|
|
|
String orderNoWuHan=organizeCode+mesWorkOrder.getOrderFlag()+sortInfo.getCustOrderCode()+mesWorkOrder.getShiftCode() + serialNo;
|
|
|
|
mesWorkOrder.setWorkOrderNo(orderNoWuHan);
|
|
|
|
mesWorkOrder.setWorkOrderNo(orderNoWuHan);
|
|
|
|
|
|
|
|
List<MesWorkOrderAssembly> assemblyList = new ArrayList<>();
|
|
|
|
if (!workOrderPartList.isEmpty()) {
|
|
|
|
if (!workOrderPartList.isEmpty()) {
|
|
|
|
for (MesWorkOrderPart orderPart : workOrderPartList) {
|
|
|
|
for (MesWorkOrderPart orderPart : workOrderPartList) {
|
|
|
|
orderPart.setOrganizeCode(organizeCode);
|
|
|
|
orderPart.setOrganizeCode(organizeCode);
|
|
|
@ -419,8 +419,8 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
|
|
|
|
ConvertBean.saveOrUpdate(orderPart, "MES-JOB");
|
|
|
|
ConvertBean.saveOrUpdate(orderPart, "MES-JOB");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
workOrderPartRao.saveAll(workOrderPartList);
|
|
|
|
workOrderPartRao.saveAll(workOrderPartList);
|
|
|
|
|
|
|
|
assemblyList = getAssemblyList(mesWorkOrder.getWorkCenterCode(), mesWorkOrder.getCarModelCode(), workOrderPartList, partProdGroup);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
List<MesWorkOrderAssembly> assemblyList = getAssemblyList(mesWorkOrder.getWorkCenterCode(), mesWorkOrder.getCarModelCode(), workOrderPartList, partProdGroup);
|
|
|
|
|
|
|
|
// /**
|
|
|
|
// /**
|
|
|
|
// * 生产序号
|
|
|
|
// * 生产序号
|
|
|
|
// * 工厂-产线-9位流水号,跳号10
|
|
|
|
// * 工厂-产线-9位流水号,跳号10
|
|
|
@ -672,6 +672,9 @@ public class MesCreateWorkOrderImpl implements IMesCreateWorkOrder {
|
|
|
|
//2.根据bomList中的subPartNo 查询零件清单 partList
|
|
|
|
//2.根据bomList中的subPartNo 查询零件清单 partList
|
|
|
|
List<String> partNoList = bomList.stream().map(MesBom::getItemPartNo).distinct().collect(Collectors.toList());
|
|
|
|
List<String> partNoList = bomList.stream().map(MesBom::getItemPartNo).distinct().collect(Collectors.toList());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (partNoList.isEmpty()) {
|
|
|
|
|
|
|
|
return new ArrayList<>();
|
|
|
|
|
|
|
|
}
|
|
|
|
DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(organizeCode);
|
|
|
|
DdlPackBean partPackBean = DdlPackBean.getDdlPackBean(organizeCode);
|
|
|
|
DdlPreparedPack.getInPackList(partNoList, "partNo", partPackBean);
|
|
|
|
DdlPreparedPack.getInPackList(partNoList, "partNo", partPackBean);
|
|
|
|
List<MesPartSap> partSapList = mesPartSapRao.findByHqlWhere(partPackBean);
|
|
|
|
List<MesPartSap> partSapList = mesPartSapRao.findByHqlWhere(partPackBean);
|
|
|
|