From 2191824072549f0da35d73686a075e59b0196321 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
index 10399de..1f72b35 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
@@ -6,6 +6,7 @@
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.LocStsType;
+import com.zy.asrs.wms.asrs.entity.enums.TaskStsType;
import com.zy.asrs.wms.asrs.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -62,7 +63,7 @@
InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());
try {
//鑾峰彇鍏ュ簱瀹屾垚浠诲姟
- List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, 99));
+ List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.COMPLETE_IN.id));
if (list.isEmpty()) {
return;
}
@@ -80,7 +81,7 @@
throw new CoolException("鏈煡浠诲姟绫诲瀷");
}
- task.setTaskSts(100L);//100.搴撳瓨鏇存柊瀹屾垚
+ task.setTaskSts(TaskStsType.UPDATED_IN.id);//100.搴撳瓨鏇存柊瀹屾垚
task.setUpdateTime(new Date());
if (!taskService.updateById(task)) {
throw new CoolException("搴撳瓨鏇存柊澶辫触");
@@ -100,7 +101,7 @@
InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());
try {
//鑾峰彇鍑哄簱瀹屾垚浠诲姟
- List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, 199));
+ List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id));
if (list.isEmpty()) {
return;
}
@@ -117,7 +118,7 @@
throw new CoolException("鏈煡浠诲姟绫诲瀷");
}
- task.setTaskSts(200L);//200.搴撳瓨鏇存柊瀹屾垚
+ task.setTaskSts(TaskStsType.UPDATED_OUT.id);//200.搴撳瓨鏇存柊瀹屾垚
if (!taskService.updateById(task)) {
throw new CoolException("搴撳瓨鏇存柊澶辫触");
}
@@ -230,6 +231,11 @@
//娣诲姞搴撳瓨鏄庣粏
for (TaskDetl taskDetl : taskDetls) {
+ double anfme = taskDetl.getStock() - taskDetl.getAnfme();
+ if (anfme <= 0) {
+ continue;
+ }
+
LocDetl locDetl = new LocDetl();
locDetl.setLocId(loc.getId());
locDetl.setLocNo(loc.getLocNo());
@@ -237,7 +243,7 @@
locDetl.setMatnr(taskDetl.getMat$().getMatnr());
locDetl.setOrderNo(taskDetl.getOrderNo());
locDetl.setBatch(taskDetl.getBatch());
- locDetl.setAnfme(taskDetl.getStock() - taskDetl.getAnfme());
+ locDetl.setAnfme(anfme);
locDetl.setHostId(hostId);
if (!locDetlService.save(locDetl)) {
throw new CoolException("鎻掑叆搴撳瓨鏄庣粏澶辫触");
--
Gitblit v1.9.1