Commit 4772e978 sunke

获取欠料发料任务时展示所有欠料发料任务

1 个父辈 5580b961
...@@ -147,24 +147,33 @@ public class OrderShortageController { ...@@ -147,24 +147,33 @@ public class OrderShortageController {
@GetMapping("/shortageOutTasks") @GetMapping("/shortageOutTasks")
@PreAuthorize("@el.check('reelOut')") @PreAuthorize("@el.check('reelOut')")
public List<TaskDto> shortageOutTasks(@RequestParam Map<String, String> paramsMap) { public List<TaskDto> shortageOutTasks(@RequestParam Map<String, String> paramsMap) {
//判断是否已有在出库中的工单
Integer[] status = new Integer[]{LITEORDER_STATUS.ADDOUTBOUND};
Query query = getQuery(new OrderQueryCondition(), status);
List<LiteOrder> liteOrders = liteOrderManager.findByQuery(query);
List<DataLog> taskList = new ArrayList<>(); List<DataLog> taskList = new ArrayList<>();
if (liteOrders.size() > 0) { List<DataLog> allTasks = taskService.getAllTasks();
LiteOrder liteOrder = liteOrders.get(0); for (DataLog datalog : allTasks) {
List<DataLog> allTasks = taskService.getAllTasks(); if (datalog.isOrderTask()) {
for (DataLog datalog : allTasks) { //判断是否是缺料出库
if (datalog.isOrderTask() && datalog.getSourceId().equals(liteOrder.getId())) { if (datalog.isAddOutbound()) {
//判断是否是缺料出库 taskList.add(datalog);
if (datalog.isAddOutbound()) {
taskList.add(datalog);
}
} }
} }
} }
//判断是否已有在出库中的工单
// Integer[] status = new Integer[]{LITEORDER_STATUS.ADDOUTBOUND};
// Query query = getQuery(new OrderQueryCondition(), status);
// List<LiteOrder> liteOrders = liteOrderManager.findByQuery(query);
// if (liteOrders.size() > 0) {
// LiteOrder liteOrder = liteOrders.get(0);
// List<DataLog> allTasks = taskService.getAllTasks();
// for (DataLog datalog : allTasks) {
// if (datalog.isOrderTask() && datalog.getSourceId().equals(liteOrder.getId())) {
// //判断是否是缺料出库
// if (datalog.isAddOutbound()) {
// taskList.add(datalog);
// }
// }
// }
// }
return taskMapper.toDto(taskList); return taskMapper.toDto(taskList);
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!