Commit d49cc5b4 zshaohui

生成任务未加载到缓存中 修改

1 个父辈 decac0ea
...@@ -173,10 +173,10 @@ public class TaskService { ...@@ -173,10 +173,10 @@ public class TaskService {
* @param task * @param task
*/ */
public DataLog updateQueueTask(DataLog task) { public DataLog updateQueueTask(DataLog task) {
tiggerTaskChangeListener(task); //tiggerTaskChangeListener(task);
task = dataLogDao.save(task); task = dataLogDao.save(task);
taskMap.put(task.getId(), task); taskMap.put(task.getId(), task);
//tiggerTaskChangeListener(task); tiggerTaskChangeListener(task);
return task; return task;
} }
......
...@@ -113,7 +113,7 @@ public class IriichiApi extends BaseSmfApiListener { ...@@ -113,7 +113,7 @@ public class IriichiApi extends BaseSmfApiListener {
@Override @Override
public void outTaskStatusChange(String outNotifyUrl, DataLog task) { public void outTaskStatusChange(String outNotifyUrl, DataLog task) {
if ((task.isFinished() || task.isEnd() || task.isWait()) && task.isCheckOutTask()) { if ((task.isFinished() || task.isEnd() || task.isWait() || task.isCancel()) && task.isCheckOutTask()) {
List<InventoryItem> itemList = dataCache.getInventoryByPN(task.getPartNumber(), new ArrayList<>()); List<InventoryItem> itemList = dataCache.getInventoryByPN(task.getPartNumber(), new ArrayList<>());
if (itemList == null || itemList.isEmpty()) { if (itemList == null || itemList.isEmpty()) {
task.setTotalNum(0); task.setTotalNum(0);
...@@ -124,7 +124,9 @@ public class IriichiApi extends BaseSmfApiListener { ...@@ -124,7 +124,9 @@ public class IriichiApi extends BaseSmfApiListener {
} }
task.setTotalNum(totalNum); task.setTotalNum(totalNum);
} }
if (task.isFinished() || task.isEnd() || task.isCancel()){
taskService.moveTaskToFinished(task);
}
//taskService.moveTaskToFinished(task); //taskService.moveTaskToFinished(task);
dataLogManager.save(task); dataLogManager.save(task);
} }
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!