|
|
|
@ -359,12 +359,14 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
|
|
|
|
|
if (mesPartInspection != null) {
|
|
|
|
|
workCenterCode = mesPartInspection.getWorkCenterCode();
|
|
|
|
|
}
|
|
|
|
|
if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType() && !headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
|
|
|
|
|
for (MesPartModel mesPartModel : mesPartModels) {
|
|
|
|
|
doCreateReworkMove(requestModel,getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()),target,workCenterCode,mesPartModel.getPartNo(), mesPartInspection.getId());
|
|
|
|
|
if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType()) {
|
|
|
|
|
if (!headModel && !CollectionUtils.isEmpty(mesPartModels) && mesPartModels.size() > 0) {
|
|
|
|
|
for (MesPartModel mesPartModel : mesPartModels) {
|
|
|
|
|
doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesPartModel.getPartNo(), mesPartInspection.getId());
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
doCreateReworkMove(requestModel, getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()), target, workCenterCode, mesReworkTask.getPartNo(), mesPartInspection.getId());
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
doCreateReworkMove(requestModel,getDestLocateNo(requestModel.getOrganizeCode(), mesPartInspection.getId()),target,workCenterCode,mesReworkTask.getPartNo(), mesPartInspection.getId());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (MesExtEnumUtil.PART_INSPECTION_SOURCE_TYPE.LOT.getValue() == mesReworkTask.getType()) {
|
|
|
|
|