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/service/impl/WaveServiceImpl.java | 114 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 79 insertions(+), 35 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
index f721dff..218fa07 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -41,17 +41,11 @@
@Autowired
private WaveItemService waveItemService;
@Autowired
- private TaskService taskService;
- @Autowired
private TaskItemService taskItemService;
@Autowired
private LocItemService locItemService;
@Autowired
private LocService locService;
- @Autowired
- private OutStockService outStockService;
- @Autowired
- private WaveService waveService;
@Autowired
private WaveRuleServiceImpl waveRuleService;
@Autowired
@@ -94,7 +88,7 @@
.setWaveId(item.getWaveId());
params.add(locParams);
}
- List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, null);
+ List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, null,waves.getStationId(),waves.getLocCode());
generateOutTask(results, loginUserId, waves);
} catch (Exception e) {
log.error(e.getMessage());
@@ -102,11 +96,7 @@
}
List<Long> orderIds = waveItems.stream().map(WaveItem::getOrderId).collect(Collectors.toList());
/**淇敼鍑哄簱鍗曠姸鎬�*/
- if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
- .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_WORKING.val)
- .in(WkOrder::getId, orderIds))) {
- throw new CoolException("鍑哄簱鍗曟嵁鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
+ updateAsnOrders(orderIds, null, AsnExceStatus.OUT_STOCK_STATUS_TASK_WORKING.val, null, "鍑哄簱鍗曟嵁鐘舵�佷慨鏀瑰け璐ワ紒锛�");
return R.ok();
}
@@ -124,7 +114,7 @@
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
List<Long> WaveIds = JSONArray.parseArray(JSON.toJSONString(map.get("ids")), Long.class);
- List<Wave> waves = waveService.listByIds(WaveIds);
+ List<Wave> waves = this.listByIds(WaveIds);
if (Objects.isNull(waves)) {
throw new CoolException("鏁版嵁閿欒锛� 娉㈡涓嶅瓨鍦紒锛�");
}
@@ -133,7 +123,9 @@
throw new CoolException("褰撳墠鐘舵�佹棤娉曚笅鍙戞墽琛岋紒锛�");
}
- List<WaveItem> items = waveItemService.list(new LambdaQueryWrapper<WaveItem>().eq(WaveItem::getWaveId, wave.getId()));
+ List<WaveItem> items = waveItemService.list(new LambdaQueryWrapper<WaveItem>()
+ .le(WaveItem::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val)
+ .eq(WaveItem::getWaveId, wave.getId()));
if (items.isEmpty()) {
throw new CoolException("娉㈡鏄庣粏涓嶅瓨鍦紒锛�");
}
@@ -159,7 +151,7 @@
.setWaveId(item.getWaveId());
params.add(locParams);
}
- List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, waveRule);
+ List<OrderOutItemDto> results = LocManageUtil.getOutOrderList(params, waveRule,wave.getStationId(),wave.getLocCode());
if (results.isEmpty()) {
wave.setUpdateBy(loginUserId).setUpdateTime(new Date());
if (wave.getAnfme().compareTo(wave.getWorkQty()) == 0) {
@@ -168,7 +160,7 @@
wave.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val);
}
wave.setMemo("-->搴撳瓨涓嶈冻");
- waveService.updateById(wave);
+ this.updateById(wave);
return R.ok();
}
try {
@@ -203,14 +195,13 @@
throw new CoolException("涓嬪彂鎵ц寮傚父锛岃绋嶅�欓噸璇曪紒");
}
}
- if (!waveService.update(new LambdaUpdateWrapper<Wave>()
- .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val)
- .set(Wave::getWorkQty, taskItems.stream().mapToDouble(TaskItem::getAnfme).sum())
- .set(Wave::getUpdateBy, loginUserId)
- .set(Wave::getMemo, null)
- .set(Wave::getUpdateTime, new Date())
- .eq(Wave::getId, wave.getId()))) {
- throw new CoolException("娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+
+ Double sum = taskItems.stream().mapToDouble(TaskItem::getAnfme).sum();
+ Double v = Math.round((wave.getWorkQty() + sum) * 1000000) / 1000000.0;
+ if (wave.getAnfme().compareTo(v) == 0) {
+ updateWaveSnapshot(wave, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val, v, loginUserId, null, "娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ } else {
+ updateWaveSnapshot(wave, WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val, v, loginUserId, null, "娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
}
@@ -252,18 +243,69 @@
});
List<Long> orders = orderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toList());
- if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
- .set(WkOrder::getWorkQty, 0.0)
- .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
- .in(WkOrder::getId, orders))) {
- throw new CoolException("鍗曟嵁鏇存柊澶辫触锛�!");
- }
+ updateAsnOrders(orders, 0.0, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val, null, "鍗曟嵁鏇存柊澶辫触锛侊紒");
- this.update(new LambdaUpdateWrapper<Wave>()
- .eq(Wave::getId, id)
- .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val));
+ updateWaveSnapshot(wave, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val, null, null, null, "娉㈡鐘舵�佷慨鏀瑰け璐ワ紒锛�");
return R.ok();
+ }
+
+ private void updateWaveSnapshot(Wave wave, Short exceStatus, Double workQty, Long loginUserId, String memo, String errorMessage) {
+ Wave update = new Wave();
+ update.setId(wave.getId());
+ update.setVersion(wave.getVersion());
+ update.setExceStatus(exceStatus);
+ update.setWorkQty(workQty);
+ update.setUpdateBy(loginUserId);
+ update.setMemo(memo);
+ update.setUpdateTime(loginUserId == null ? null : new Date());
+ if (!this.updateById(update)) {
+ throw new CoolException(errorMessage);
+ }
+ wave.setExceStatus(exceStatus);
+ wave.setWorkQty(workQty);
+ wave.setUpdateBy(loginUserId);
+ if (loginUserId != null) {
+ wave.setUpdateTime(update.getUpdateTime());
+ }
+ wave.setMemo(memo);
+ if (update.getVersion() != null) {
+ wave.setVersion(update.getVersion());
+ }
+ }
+
+ private void updateAsnOrders(List<Long> orderIds, Double workQty, Short exceStatus, Long loginUserId, String errorMessage) {
+ if (Cools.isEmpty(orderIds)) {
+ return;
+ }
+ List<WkOrder> orders = asnOrderService.listByIds(orderIds.stream().distinct().collect(Collectors.toList()));
+ for (WkOrder order : orders) {
+ WkOrder update = new WkOrder();
+ update.setId(order.getId());
+ update.setVersion(order.getVersion());
+ if (workQty != null) {
+ update.setWorkQty(workQty);
+ }
+ update.setExceStatus(exceStatus);
+ if (loginUserId != null) {
+ update.setUpdateBy(loginUserId);
+ update.setUpdateTime(new Date());
+ }
+ if (!asnOrderService.updateById(update)) {
+ throw new CoolException(errorMessage);
+ }
+ if (workQty != null) {
+ order.setWorkQty(workQty);
+ }
+ order.setExceStatus(exceStatus);
+ if (loginUserId != null) {
+ order.setUpdateBy(loginUserId);
+ order.setUpdateTime(update.getUpdateTime());
+ }
+ if (update.getVersion() != null) {
+ order.setVersion(update.getVersion());
+ }
+ }
}
/**
@@ -280,12 +322,14 @@
public void generateOutTask(List<OrderOutItemDto> itemParams, Long loginUserId, Wave wave) throws Exception {
for (OrderOutItemDto itemDto : itemParams) {
LocToTaskParams taskParams = new LocToTaskParams();
- Loc loc = locService.getById(itemDto.getLocId());
+ Loc loc = locService.getById(itemDto.getLoc().getId());
if (Objects.isNull(loc)) {
continue;
}
- taskParams.setItems(Arrays.asList(itemDto.getLocItem()))
+ taskParams.setItems(itemDto.getLocItemList())
.setSiteNo(itemDto.getSiteNo())
+ .setTargSiteAreaList(itemDto.getTargSiteAreaList())
+ .setTargSiteAreaNow(itemDto.getTargSiteAreaNow())
.setType(Constants.TASK_TYPE_WAVE_OUT_STOCK)
.setSourceId(wave.getId())
.setTarLoc(loc.getCode());
--
Gitblit v1.9.1