Commit dabe8c62 sunke

欠料发料和产线补料页面不停弹框去除

1 个父辈 57372ee3
...@@ -384,10 +384,12 @@ public class OrderController { ...@@ -384,10 +384,12 @@ public class OrderController {
LiteOrder liteOrder = liteOrderCache.findOrderByNo(orderNo); LiteOrder liteOrder = liteOrderCache.findOrderByNo(orderNo);
if (liteOrder == null) { if (liteOrder == null) {
throw new ValidateException("smfcore.valueNotFind", "未找到{0}[{1}]", new String[]{"orderNo", orderNo}); return new ArrayList<>();
//throw new ValidateException("smfcore.valueNotFind", "未找到{0}[{1}]", new String[]{"orderNo", orderNo});
} }
if (liteOrder.isNew() || liteOrder.isClosed()) { if (liteOrder.isNew() || liteOrder.isClosed()) {
throw new ValidateException("smfcore.order.notExecute", "工单[{0}]不在出库中", new String[]{liteOrder.getOrderNo()}); return new ArrayList<>();
//throw new ValidateException("smfcore.order.notExecute", "工单[{0}]不在出库中", new String[]{liteOrder.getOrderNo()});
} }
List<DataLog> taskList = getOrderTaskByUser(user, liteOrder, false); List<DataLog> taskList = getOrderTaskByUser(user, liteOrder, false);
return taskMapper.toDto(taskList); return taskMapper.toDto(taskList);
......
...@@ -270,10 +270,12 @@ public class RepleOrderController { ...@@ -270,10 +270,12 @@ public class RepleOrderController {
LiteOrder liteOrder = liteOrderCache.findOrderByNo(orderNo); LiteOrder liteOrder = liteOrderCache.findOrderByNo(orderNo);
if (liteOrder == null) { if (liteOrder == null) {
throw new ValidateException("smfcore.valueNotFind", "未找到{0}[{1}]", new String[]{"orderNo", orderNo}); //throw new ValidateException("smfcore.valueNotFind", "未找到{0}[{1}]", new String[]{"orderNo", orderNo});
return new ArrayList<>();
} }
if (liteOrder.isNew() || liteOrder.isClosed()) { if (liteOrder.isNew() || liteOrder.isClosed()) {
throw new ValidateException("smfcore.order.notExecute", "工单[{0}]不在出库中", new String[]{liteOrder.getOrderNo()}); return new ArrayList<>();
//throw new ValidateException("smfcore.order.notExecute", "工单[{0}]不在出库中", new String[]{liteOrder.getOrderNo()});
} }
List<DataLog> taskList = getOrderTaskByUser(liteOrder, false); List<DataLog> taskList = getOrderTaskByUser(liteOrder, false);
return taskMapper.toDto(taskList); return taskMapper.toDto(taskList);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!