diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index e65099d..96573ce 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -1863,10 +1863,10 @@ public class ScheduleServiceImpl implements ScheduleService { } //检查是否是上材料的时机 - //String resultCode = this.checkProcessMaterialRoll(site, orderNo, itemNo, seqNo, rollNo, currentTime); - //if ("N".equalsIgnoreCase(resultCode)) { - //throw new XJException("当前卷号不在调试过程中/不处于停机状态(停机原因是更换材料),不允许上/更换材料!"); - //} + String resultCode = this.checkProcessMaterialRoll(site, orderNo, itemNo, seqNo, rollNo, currentTime); + if ("N".equalsIgnoreCase(resultCode)) { + throw new XJException("当前卷号不在调试过程中/不处于停机状态(停机原因是更换材料),不允许上/更换材料!"); + } //调用存储过程检查是否可以接料 //调用是否可以切换刀具的存储过程