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

Merge remote-tracking branch 'refs/remotes/origin/mes-uat-temp-logic-20250526-47187' into mes-dev

Browse Source
mes-dev
logic.fang 2 months ago
parent df532b43d2 6fa7d7dc2c
commit 9ae050a020
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File

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

@ -371,10 +371,16 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
if (!headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
String destLocateNo = getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId());
for (MesPartModel mesPartModel : mesPartModels) {
doCreateReworkMove(requestModel,destLocateNo, target, workCenterCode, mesPartModel.getPartNo(), mesPartInspection.getId());
//20250527-47187 PCN-电子化返工拆解功能问题（仅在“非拆解”模式下才创建移库单）
if(CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){
doCreateReworkMove(requestModel,destLocateNo, target, workCenterCode, mesPartModel.getPartNo(), mesPartInspection.getId());
}
}
} else {
doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId());
//20250527-47187 PCN-电子化返工拆解功能问题（仅在“非拆解”模式下才创建移库单）
if(CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){
doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId());
}
}
}
}
@ -397,7 +403,10 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
workCenterCode = mesPartInspection.getWorkCenterCode();
}
if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType()) {
doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId());
//20250527-47187 PCN-电子化返工拆解功能问题（仅在“非拆解”模式下才创建移库单）
if(CollectionUtils.isEmpty(requestModel.getAssemblyModelList())){
doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId());
}
}
} else {
//拆解

Write Preview
Loading…
Cancel
Save