Commit 5083ede0 张少辉

1.成品仓/结构仓 任务问题修改

1 个父辈 85cba47b
......@@ -285,7 +285,7 @@ public class AgvDeviceController {
String cid = request.getParameter("cid");
Storage storage = dataCache.getStorage(cid);
if (storage != null) {
Collection<DataLog> queueTasks = taskService.getQueueTasks();
Collection<DataLog> queueTasks = taskService.getQueueTasks(storage.getCid());
queueTasks = queueTasks.stream().sorted(Comparator.comparing(DataLog::getPosName)).collect(Collectors.toList());
for (DataLog queueTask : queueTasks) {
if (queueTask.isWait() && queueTask.isCheckOutTask()) {
......
......@@ -76,7 +76,7 @@ public class AgvFgDeviceController {
Storage storage = dataCache.getStorage(cid);
if (storage != null) {
if (storage.getCorrespondingWarehouse() == CORRESPONDING_WAREHOUSE.FINISHED_GOODS_WAREHOUSE) {
Collection<DataLog> queueTasks = taskService.getQueueTasks();
Collection<DataLog> queueTasks = taskService.getQueueTasks(storage.getCid());
queueTasks = queueTasks.stream().sorted(Comparator.comparing(DataLog::getCreateDate)).collect(Collectors.toList());
for (DataLog queueTask : queueTasks) {
if (queueTask.isWait() && queueTask.isCheckOutTask()) {
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!