From 8f82164ccc074676e995f762a56036face7186fc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 24 九月 2024 15:00:12 +0800
Subject: [PATCH] #

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
index f6c92a5..e4af1d9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java
@@ -1,11 +1,14 @@
 package com.zy.asrs.wms.asrs.timer;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;
 import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
 import com.zy.asrs.framework.exception.CoolException;
 import com.zy.asrs.wms.asrs.entity.*;
 import com.zy.asrs.wms.asrs.entity.enums.CacheSiteStatusType;
+import com.zy.asrs.wms.asrs.entity.enums.OrderSettleType;
+import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
 import com.zy.asrs.wms.asrs.service.*;
 import com.zy.asrs.wms.system.entity.Dict;
 import com.zy.asrs.wms.system.service.DictService;
@@ -56,7 +59,7 @@
                 return;
             }
 
-            List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, 198));
+            List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));
             for (Task task : taskList) {
                 Long hostId = task.getHostId();
 
@@ -114,6 +117,9 @@
                         waveSeed.setTaskDetlId(taskDetl.getId());
                         waveSeed.setAnfme(taskDetl.getAnfme());
                         waveSeed.setWorkQty(0D);
+                        waveSeed.setMatnr(taskDetl.getMatnr());
+                        waveSeed.setBatch(taskDetl.getBatch());
+                        waveSeed.setFieldParams(JSON.toJSONString(taskDetl.getUniqueField()));
                         waveSeed.setHostId(hostId);
                         if (!waveSeedService.save(waveSeed)) {
                             throw new CoolException("娉㈡鎾鍒涘缓澶辫触");
@@ -131,7 +137,7 @@
 
                 }
 
-                task.setTaskSts(199L);
+                task.setTaskSts(TaskStsType.COMPLETE_OUT.id);
                 task.setUpdateTime(new Date());
                 if (!taskService.updateById(task)) {
                     throw new CoolException("浠诲姟鏇存柊澶辫触");

--
Gitblit v1.9.1