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

44424 PCN：工单判可疑的码，扫描工单检验通过后，在扫描装配件工步时扫描判可疑码，工单标记为可疑

Browse Source
uat_temp_xw_202502100000_44424
xiangwei.zhang 3 months ago
parent fd5ceb1cbe
commit c6c20e07c2
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File

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

@ -411,7 +411,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
MesMove move = createMove(model, srcLocate, mesPartModel.getLocateNo(), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(),mesPartModel.getPartNo()); MesMove move = createMove(model, srcLocate, mesPartModel.getLocateNo(), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(),mesPartModel.getPartNo());
moveRepository.save(move); moveRepository.save(move);
} }
} else if (headModel) { } else {
//移库 //移库
MesMove move = createMove(model, srcLocate, configService.getCfgValue(org, "LGORT"), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode()); MesMove move = createMove(model, srcLocate, configService.getCfgValue(org, "LGORT"), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
moveRepository.save(move); moveRepository.save(move);
@ -441,7 +441,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
MesMove move = createMove(model,locateNo , mesPartModel.getLocateNo(), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(), mesPartModel.getPartNo()); MesMove move = createMove(model,locateNo , mesPartModel.getLocateNo(), org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(), mesPartModel.getPartNo());
moveRepository.save(move); moveRepository.save(move);
} }
} else if (headModel) { } else {
MesMove move = createMove(model, getDestLocateNo(model, org), target, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode()); MesMove move = createMove(model, getDestLocateNo(model, org), target, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
moveRepository.save(move); moveRepository.save(move);
} }
@ -580,7 +580,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
MesMove move = createMove(model, mesPartModel.getLocateNo(), dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(),mesPartModel.getPartNo()); MesMove move = createMove(model, mesPartModel.getLocateNo(), dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(),mesPartModel.getPartNo());
moveRepository.save(move); moveRepository.save(move);
} }
} else if (headModel) { } else{
MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode()); MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
moveRepository.save(move); moveRepository.save(move);
} }
@ -693,7 +693,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
MesMove move = createMove(model, mesPartModel.getLocateNo(), dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(),mesPartModel.getPartNo()); MesMove move = createMove(model, mesPartModel.getLocateNo(), dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode(),mesPartModel.getPartNo());
moveRepository.save(move); moveRepository.save(move);
} }
} else if (headModel) { } else{
MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode()); MesMove move = createMove(model, srcLocateNo, dest, org, null == produceSn ? model.getWorkCenterCode() : produceSn.getWorkCenterCode());
moveRepository.save(move); moveRepository.save(move);
} }

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

@ -475,7 +475,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
} }
moveRepository.saveAll(moveList); moveRepository.saveAll(moveList);
} else if (headModel) { } else {
//移库 转正常、放行：8000移至2000 //移库 转正常、放行：8000移至2000
MesMove move = createMove(model, sourceValue, target, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE); MesMove move = createMove(model, sourceValue, target, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE);
ConvertBean.serviceModelInitialize(move, model.getUserName()); ConvertBean.serviceModelInitialize(move, model.getUserName());
@ -594,8 +594,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
sourceValue = refundSource; sourceValue = refundSource;
} }
if (!headModel) { if (!headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
if (!CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
List<MesMove> moveList = new ArrayList<>(); List<MesMove> moveList = new ArrayList<>();
for (MesPartModel mesPartModel : mesPartModels) { for (MesPartModel mesPartModel : mesPartModels) {
@ -603,9 +602,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
ConvertBean.serviceModelInitialize(move,model.getUserName()); ConvertBean.serviceModelInitialize(move,model.getUserName());
moveList.add(move); moveList.add(move);
} }
moveRepository.saveAll(moveList); moveRepository.saveAll(moveList);
}
} else { } else {
MesMove move = createMove(model, sourceValue, configService.getCfgValue(org, "SCRAP"), org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.SCRAP_MOVE); MesMove move = createMove(model, sourceValue, configService.getCfgValue(org, "SCRAP"), org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.SCRAP_MOVE);
ConvertBean.serviceModelInitialize(move,model.getUserName()); ConvertBean.serviceModelInitialize(move,model.getUserName());
@ -693,7 +690,7 @@ public class MesNcProcessingService implements IMesNcProcessingService {
} }
moveRepository.saveAll(moveList); moveRepository.saveAll(moveList);
} else if (headModel) { } else {
//移库 转正常、放行：8000移至2000 //移库 转正常、放行：8000移至2000
MesMove move = createMove(model, sourceValue, target, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE); MesMove move = createMove(model, sourceValue, target, org, null == sn ? workCenterCode : sn.getWorkCenterCode(), MesExtEnumUtil.MOVE_TYPE.NORMAL_MOVE);
ConvertBean.serviceModelInitialize(move, model.getUserName()); ConvertBean.serviceModelInitialize(move, model.getUserName());

Write Preview
Loading…
Cancel
Save