From 2f8e173048d22c5b40612c3538b9c1aa5a5397f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 27 三月 2026 13:38:05 +0800
Subject: [PATCH] #乐观锁
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index e7fc0bb..c95cfe7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -22,7 +22,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -69,7 +69,7 @@
* @description: 鐩存帴缁勬墭寮�鍏充负true锛屽皢鏀惰揣鍗曠洿鎺ュ姞鍏ヤ复鏃跺簱瀛�
* @version 1.0
*/
- @Scheduled(cron = "0/25 * * * * ?")
+ @Scheduled(cron = "0/1 * * * * ?")
@Transactional(rollbackFor = Exception.class)
public synchronized void IgnoreReceipt() {
Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.DIRECT_WAIT_PAKIN));
@@ -135,10 +135,13 @@
// throw new CoolException("鏀惰揣鍗曚繚瀛樿嚦鏀惰揣鍖烘墽琛屽け璐ワ紒锛�");
// }
- if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
- .set(WkOrder::getQty, order.getAnfme())
- .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
- .eq(WkOrder::getId, order.getId()))) {
+ WkOrder currentOrder = asnOrderService.getById(order.getId());
+ if (Objects.isNull(currentOrder)) {
+ throw new CoolException("鏀惰揣鍗曚笉瀛樺湪锛侊紒");
+ }
+ currentOrder.setQty(order.getAnfme())
+ .setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val);
+ if (!asnOrderService.updateById(currentOrder)) {
throw new CoolException("鏀惰揣鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
}
}
@@ -302,7 +305,7 @@
* @description 鐢熸垚鐗╂枡鏍囩
* @time 2025/3/29 12:35
*/
- @Scheduled(cron = "0 0/05 * * * ? ")
+// @Scheduled(cron = "0 0/05 * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void generateMatnrLabel() {
List<WkOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
--
Gitblit v1.9.1