From 60fdc9564c65b90a8911ff10a25f3f3a63d3812c Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期五, 20 六月 2025 11:06:27 +0800
Subject: [PATCH] 出库任务历史档优化
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 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 ae9d121..704f4c3 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
@@ -21,6 +21,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.*;
+import java.util.stream.Collectors;
@Component
public class TaskWaveTimer {
@@ -44,10 +45,10 @@
/**
* modifty锛�
- * original : fetch datasource of task type on WAVE_SEED
- * now: Fetch datasource of task type on WCS_EXECUTE_OUT_ARRIVED, After completing the task and for setting the task type equal to WAVE_SEED
+ * original : fetch datasource of task type on WCS_EXECUTE_OUT_TASK_DONE
+ * now: Fetch datasource of task type on WCS_EXECUTE_OUT_ARRIVED, After completing the task and for setting the task type equal to GENERATE_WAVE_SEED
*/
- @Scheduled(cron = "0/15 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void taskWave() {
InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().tenantLine(true).build());
@@ -60,9 +61,9 @@
if (!autoCreateWaveSeed.equals("true")) {
return;
}
- //鏌ヨ鐘舵�佷负瀹瑰櫒鍒拌揪鐘舵�佹墍鏈変换鍔″崟鎹�
+ //鏌ヨ鐘舵�佷负RCS浠诲姟瀹屾垚鎵�鏈変换鍔″崟鎹�
// List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WAVE_SEED.id));
- List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.id));
+ List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT.id));
HashSet<String> sycMatnrs = new HashSet<>();
if (taskList.isEmpty()) {
// throw new CoolException("娌℃湁鍙挱绉嶄换鍔★紒锛�");
@@ -74,12 +75,17 @@
if (taskDetls.isEmpty()) {
continue;
}
+ // 杩囨护宸茬粡鐢熸垚娉㈡鎾鏁版嵁鐨勪换鍔� 璇ヤ换鍔＄殑浠诲姟鏄庣粏鍙蜂笉鑳藉湪鎾鏁版嵁琛ㄩ噷闈�
+ long count = waveSeedService.count(new LambdaQueryWrapper<WaveSeed>().in(WaveSeed::getTaskDetlId, taskDetls.stream().map(TaskDetl::getId).collect(Collectors.toList())).eq(WaveSeed::getHostId, hostId));
+ if (count > 0) {
+ continue;
+ }
for (TaskDetl taskDetl : taskDetls) {
//鍒嗛厤璁㈠崟
Long waveId = taskDetl.getWaveId();
//鍚屼竴涓墿鏂欏彧娣诲姞涓�娆℃挱绉嶄换鍔�
- if(sycMatnrs.contains(taskDetl.getMatnr())) {
+ if (sycMatnrs.contains(taskDetl.getMatnr())) {
continue;
}
sycMatnrs.add(taskDetl.getMatnr());
@@ -99,7 +105,7 @@
.in(OrderDetl::getOrderId, orderIds)
.eq(OrderDetl::getStockIndex, matUniqueKey)
.eq(OrderDetl::getHostId, hostId));
- if(orderDetls.isEmpty()){
+ if (orderDetls.isEmpty()) {
throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
}
@@ -107,25 +113,30 @@
for (OrderDetl orderDetl : orderDetls) {
//fixme 浣滀笟涓暟閲忚皟鏁存斁鑷筹紝鐢熸垚鍑哄簱浠诲姟鎴愬姛鍚�
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
- if (anfme <= 0.0D) { break; }
+ if (issued <= 0.0D) {
+ continue;
+ }
+ if (anfme <= 0.0D) {
+ break;
+ }
double workQty = issued;
- if(anfme - issued < 0){
+ if (anfme - issued < 0) {
workQty = anfme;
}
anfme -= workQty;
orderUtils.updateWorkQty(orderDetl.getId(), workQty, true);
-
- CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, orderDetl.getOrderId()).eq(CacheSite::getHostId, hostId));
- if (cacheSite == null) {
- throw new CoolException("缂撳瓨绔欑┖闂翠笉瀛樺湪");
- }
+//
+ //fixme 鐢熸垚娉㈡鎾鏁版嵁鏃讹紝涓嶈嚜鍔ㄦ坊鍔犵珯鐐圭粦瀹氾紝绔欑偣缁戝畾璋冩暣鑷冲嚭搴撶粦瀹氭挱绉嶅簱浣嶆椂鏇存柊
+// CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, orderDetl.getOrderId()).eq(CacheSite::getHostId, hostId));
+// if (cacheSite == null) {
+// throw new CoolException("缂撳瓨绔欑┖闂翠笉瀛樺湪");
+// }
WaveSeed waveSeed = new WaveSeed();
- waveSeed.setSiteId(cacheSite.getId());
- waveSeed.setSiteNo(cacheSite.getSiteNo());
+// waveSeed.setSiteId(cacheSite.getId());
+// waveSeed.setSiteNo(cacheSite.getSiteNo());
waveSeed.setOrderNo(orderDetl.getOrderNo());
waveSeed.setOrderId(orderDetl.getOrderId());
waveSeed.setOrderDetlId(orderDetl.getId());
@@ -141,28 +152,28 @@
if (!waveSeedService.save(waveSeed)) {
throw new CoolException("娉㈡鎾鍒涘缓澶辫触");
}
- cacheSite.setOrderId(orderDetl.getOrderId());
- cacheSite.setOrderNo(orderDetl.getOrderNo());
- cacheSite.setSiteStatus(CacheSiteStatusType.R.id);
- cacheSite.setUpdateTime(new Date());
- if (!cacheSiteService.updateById(cacheSite)) {
- throw new CoolException("缂撳瓨绔欐洿鏂板け璐�");
- }
+// cacheSite.setOrderId(orderDetl.getOrderId());
+// cacheSite.setOrderNo(orderDetl.getOrderNo());
+// cacheSite.setSiteStatus(CacheSiteStatusType.R.id);
+// cacheSite.setUpdateTime(new Date());
+// if (!cacheSiteService.updateById(cacheSite)) {
+// throw new CoolException("缂撳瓨绔欐洿鏂板け璐�");
+// }
}
}
- task.setTaskSts(TaskStsType.GENERATE_WAVE_SEED.id);
- task.setUpdateTime(new Date());
- if (!taskService.updateById(task)) {
- throw new CoolException("浠诲姟鏇存柊澶辫触");
- }
+// task.setTaskSts(TaskStsType.GENERATE_WAVE_SEED.id);
+// task.setUpdateTime(new Date());
+// if (!taskService.updateById(task)) {
+// throw new CoolException("浠诲姟鏇存柊澶辫触");
+// }
}
}
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- }finally {
+ } finally {
InterceptorIgnoreHelper.clearIgnoreStrategy();
}
}
--
Gitblit v1.9.1