From 787e2917c8113a56ee58fc3a6ae11b0cd5f8e133 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 26 十二月 2025 14:11:49 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
index 95329c7..b30427c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/StaReserveServiceImpl.java
@@ -35,7 +35,7 @@
qty = Optional.ofNullable(qty).orElse(1);
// reserve sta in
- if (qty < staMapper.tryReserveIn(sta.getId(), qty)) {
+ if (staMapper.tryReserveIn(sta.getId(), qty) < qty) {
throw new BusinessException("Sta[" + sta.getStaNo() + "] can't reserve IN");
}
Date now = new Date();
@@ -48,7 +48,7 @@
reserve.setQty(qty);
reserve.setState(StaReserveStateType.RESERVED.toString());
- reserve.setUniqKey(this.generateReserveUniqKey(sta.getId(), task.getId()));
+ reserve.setUniqKey(this.generateReserveUniqKey(sta.getId(), task.getId(), StaReserveType.IN));
reserve.setExpireTime(new Date(now.getTime() + RESERVE_EXPIRE_TIME));
reserve.setStatus(StatusType.ENABLE.val);
@@ -63,9 +63,44 @@
return reserve;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public StaReserve reserveStaOut(Sta sta, Task task, Integer qty) {
+ qty = Optional.ofNullable(qty).orElse(1);
- private String generateReserveUniqKey(Long staId, Long taskId) {
- return "STA:" + staId + "-TASK:" + taskId + "-T";
+ // reserve sta out
+ if (staMapper.tryReserveOut(sta.getId(), qty) < qty) {
+ throw new BusinessException("Sta[" + sta.getStaNo() + "] can't reserve OUT");
+ }
+
+ Date now = new Date();
+
+ // save staReserve
+ StaReserve reserve = new StaReserve();
+ reserve.setStaId(sta.getId());
+ reserve.setTaskId(task.getId());
+ reserve.setType(StaReserveType.OUT.toString());
+ reserve.setQty(qty);
+ reserve.setState(StaReserveStateType.RESERVED.toString());
+
+ reserve.setUniqKey(this.generateReserveUniqKey(sta.getId(), task.getId(), StaReserveType.OUT));
+ reserve.setExpireTime(new Date(now.getTime() + RESERVE_EXPIRE_TIME));
+
+ reserve.setStatus(StatusType.ENABLE.val);
+ reserve.setCreateTime(now);
+ reserve.setUpdateTime(now);
+
+ if (!this.save(reserve)) {
+ staMapper.releaseReserveOut(sta.getId(), qty);
+ throw new BusinessException("reserve record insert failed");
+ }
+
+ return reserve;
+ }
+
+
+ private String generateReserveUniqKey(Long staId, Long taskId, StaReserveType type) {
+ return "STA:" + staId + "-TASK:" + taskId + "-T:" + type.toString();
}
}
--
Gitblit v1.9.1