|
@@ -342,7 +342,7 @@ public class BizCarrierController extends BaseController {
|
|
|
//当前工序报工信息
|
|
|
List<BizDayworkItem> lastDayworkItem = dayworkItem.stream().filter(item -> item.getProcessStepNumber().equals(lastProcessStepNumber)).collect(Collectors.toList());
|
|
|
if (lastDayworkItem.stream().anyMatch(item -> item.getStatus().equals("4")||item.getStatus().equals("5")||item.getStatus().equals("7"))){
|
|
|
- return error("该载具绑定" + dayworkList.stream().filter(item -> item.getId().equals(dayworkId)).findFirst().orElse(new BizDaywork()).getLotCode()+"批次周转中,请取消周转");
|
|
|
+ return error("该载具已绑定" + dayworkList.stream().filter(item -> item.getId().equals(dayworkId)).findFirst().orElse(new BizDaywork()).getLotCode()+"批次,当前正在周转中,如需继续绑定请取消周转后再进行操作");
|
|
|
}
|
|
|
}
|
|
|
}
|