jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

装配件表修改字段

Browse Source
tags/yfai-mes-ext-v2.3
臧学普 7 months ago
parent ee1e45f425
commit 199565901d
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File

21
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java
Unescape Escape View File

@ -476,6 +476,8 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
mesWorkOrderService.doSaveWorkOrderPrintQueue(mesWorkOrder); mesWorkOrderService.doSaveWorkOrderPrintQueue(mesWorkOrder);
if (!assemblyList.isEmpty()) { if (!assemblyList.isEmpty()) {
for (MesWorkOrderAssembly orderAssembly : assemblyList) { for (MesWorkOrderAssembly orderAssembly : assemblyList) {
orderAssembly.setPartNo(mesWorkOrder.getPartNo());
orderAssembly.setPartName(mesWorkOrder.getPartName());
orderAssembly.setWorkOrderNo(mesWorkOrder.getWorkOrderNo()); orderAssembly.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
orderAssembly.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue()); orderAssembly.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_30.getValue());
orderAssembly.setOrganizeCode(organizeCode); orderAssembly.setOrganizeCode(organizeCode);
@ -558,8 +560,6 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
Map<String, List<MesWorkOrderPart>> orderPartMap = workOrderPartList.stream().collect(Collectors.groupingBy(MesWorkOrderPart::getPartNo)); Map<String, List<MesWorkOrderPart>> orderPartMap = workOrderPartList.stream().collect(Collectors.groupingBy(MesWorkOrderPart::getPartNo));
//遍历排序生产规则 //遍历排序生产规则
for (MesProdRuleSortCfg sortCfg : sortCfgListFilter) { for (MesProdRuleSortCfg sortCfg : sortCfgListFilter) {
String t = sortCfg.getAssemblyPartNo();
System.out.println(sortCfg.getAssemblyPartNo());
List<MesWorkOrderPart> orderPartList = orderPartMap.get(sortCfg.getAssemblyPartNo()); List<MesWorkOrderPart> orderPartList = orderPartMap.get(sortCfg.getAssemblyPartNo());
MesWorkOrderAssembly orderAssembly = new MesWorkOrderAssembly(); MesWorkOrderAssembly orderAssembly = new MesWorkOrderAssembly();
MesWorkOrderPart orderPart = orderPartList.get(0); MesWorkOrderPart orderPart = orderPartList.get(0);
@ -575,6 +575,10 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
if (StringUtils.isNotBlank(sortCfg.getVehicleNo()) && !sortCfg.getVehicleNo().equals(vehicleNo)){ if (StringUtils.isNotBlank(sortCfg.getVehicleNo()) && !sortCfg.getVehicleNo().equals(vehicleNo)){
continue; continue;
} }
orderAssembly.setAssemblyPartNo(sortCfg.getAssemblyPartNo());
orderAssembly.setAssemblyPartName(sortCfg.getAssemblyPartName());
orderAssembly.setProcessName(sortCfg.getProcessName());
orderAssembly.setWorkCenterCode(sortCfg.getWorkCenterCode());
orderAssembly.setDisplayRule(sortCfg.getDisplayRule()); orderAssembly.setDisplayRule(sortCfg.getDisplayRule());
orderAssembly.setMatchRule(sortCfg.getMatchRule()); orderAssembly.setMatchRule(sortCfg.getMatchRule());
orderAssembly.setMatchType(sortCfg.getMatchType()); orderAssembly.setMatchType(sortCfg.getMatchType());
@ -586,8 +590,8 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
orderAssembly.setCraftName(sortCfg.getCraftName()); orderAssembly.setCraftName(sortCfg.getCraftName());
orderAssembly.setCraftCode(sortCfg.getCraftCode()); orderAssembly.setCraftCode(sortCfg.getCraftCode());
orderAssembly.setRouteSeq(sortCfg.getRouteSeq()); orderAssembly.setRouteSeq(sortCfg.getRouteSeq());
orderAssembly.setPartNo(orderPart.getPartNo()); // orderAssembly.setPartNo(orderPart.getPartNo());
orderAssembly.setPartName(orderPart.getPartName()); // orderAssembly.setPartName(orderPart.getPartName());
orderAssembly.setWorkCellCode(sortCfg.getWorkCellCode()); orderAssembly.setWorkCellCode(sortCfg.getWorkCellCode());
orderAssembly.setOrderPartId(orderPart.getId().toString()); orderAssembly.setOrderPartId(orderPart.getId().toString());
orderAssembly.setEquipmentCode(sortCfg.getEquipmentCode()); orderAssembly.setEquipmentCode(sortCfg.getEquipmentCode());
@ -618,6 +622,11 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
List<MesProdRuleSortCfg> prodCfgList = mesProdRuleSortCfgRao.findByHqlWhere(reportRuleSortPackBean); List<MesProdRuleSortCfg> prodCfgList = mesProdRuleSortCfgRao.findByHqlWhere(reportRuleSortPackBean);
for (MesProdRuleSortCfg ruleSortCfg : prodCfgList) { for (MesProdRuleSortCfg ruleSortCfg : prodCfgList) {
MesWorkOrderAssembly orderAssembly = new MesWorkOrderAssembly(); MesWorkOrderAssembly orderAssembly = new MesWorkOrderAssembly();
orderAssembly.setAssemblyPartNo(ruleSortCfg.getAssemblyPartNo());
orderAssembly.setAssemblyPartName(ruleSortCfg.getAssemblyPartName());
orderAssembly.setProcessName(ruleSortCfg.getProcessName());
orderAssembly.setWorkCenterCode(ruleSortCfg.getWorkCenterCode());
orderAssembly.setDisplayRule(ruleSortCfg.getDisplayRule()); orderAssembly.setDisplayRule(ruleSortCfg.getDisplayRule());
orderAssembly.setMatchRule(ruleSortCfg.getMatchRule()); orderAssembly.setMatchRule(ruleSortCfg.getMatchRule());
orderAssembly.setMatchType(ruleSortCfg.getMatchType()); orderAssembly.setMatchType(ruleSortCfg.getMatchType());
@ -652,6 +661,10 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
List<MesProdRuleSortCfg> ruleSortCfgs = mesProdRuleSortCfgRao.findByHqlWhere(prodRuleSortPublicPackBean); List<MesProdRuleSortCfg> ruleSortCfgs = mesProdRuleSortCfgRao.findByHqlWhere(prodRuleSortPublicPackBean);
for (MesProdRuleSortCfg ruleSortCfg : ruleSortCfgs) { for (MesProdRuleSortCfg ruleSortCfg : ruleSortCfgs) {
MesWorkOrderAssembly orderAssembly = new MesWorkOrderAssembly(); MesWorkOrderAssembly orderAssembly = new MesWorkOrderAssembly();
orderAssembly.setAssemblyPartNo(ruleSortCfg.getAssemblyPartNo());
orderAssembly.setAssemblyPartName(ruleSortCfg.getAssemblyPartName());
orderAssembly.setProcessName(ruleSortCfg.getProcessName());
orderAssembly.setWorkCenterCode(ruleSortCfg.getWorkCenterCode());
orderAssembly.setDisplayRule(ruleSortCfg.getDisplayRule()); orderAssembly.setDisplayRule(ruleSortCfg.getDisplayRule());
orderAssembly.setMatchRule(ruleSortCfg.getMatchRule()); orderAssembly.setMatchRule(ruleSortCfg.getMatchRule());
orderAssembly.setMatchType(ruleSortCfg.getMatchType()); orderAssembly.setMatchType(ruleSortCfg.getMatchType());

Write Preview
Loading…
Cancel
Save