opt: 重复套轴问题
This commit is contained in:
@@ -855,6 +855,7 @@ public class AutoCallAirShaftTask extends Prun {
|
||||
if (tasks.size() == 0) {
|
||||
return true;
|
||||
}
|
||||
stepErrorInfo.add("存在为" + dto.getResource_name() + "送轴任务,不会继续套轴...");
|
||||
log.info("存在任务,不允许套轴{}", dto);
|
||||
stepStr += ",5";
|
||||
return false;
|
||||
@@ -881,20 +882,10 @@ public class AutoCallAirShaftTask extends Prun {
|
||||
? shafttubeivt.getContainer_name1() : shafttubeivt.getContainer_name2();
|
||||
// 获取这个子卷号的分切计划
|
||||
PdmBiSlittingproductionplan byContainerName = slittingproductionplanService.getByContainerName(containerCode);
|
||||
if ("1".equals(byContainerName.getOrder_type())) {
|
||||
// 判断母卷
|
||||
if (byContainerName.getParent_container_name().equals(dto.getParent_container_name())) {
|
||||
stepStr += ",4";
|
||||
stepErrorInfo.add(">>>穿拔轴机已经在为" + dto.getResource_name() + "套轴了...");
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
// 判断改切
|
||||
if (byContainerName.getRestruct_container_name().equals(dto.getParent_container_name())) {
|
||||
stepStr += ",4";
|
||||
stepErrorInfo.add(">>>穿拔轴机已经在为" + dto.getResource_name() + "套轴了...");
|
||||
return false;
|
||||
}
|
||||
if (byContainerName.getResource_name().equals(dto.getResource_name())) {
|
||||
stepStr += ",4";
|
||||
stepErrorInfo.add(">>>穿拔轴机" + shafttubeivt.getPoint_code() + "已经在为" + dto.getResource_name() + "套轴了...");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
// 校验是否在拔轴暂存位、分切对接位有相同设备的分切计划信息。
|
||||
|
||||
Reference in New Issue
Block a user