From 3799e9f3fc8abaafa95094c8c987a8d9da3eb2a9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 13:11:19 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index e34df99..d236929 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.PakinItem;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
@@ -48,7 +49,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) {
+ public synchronized WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) {
if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
throw new CoolException("鍙傛暟閿欒锛氱墿鏂欒窡韪爜涓虹┖锛�");
}
@@ -147,9 +148,10 @@
}
} else {
LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()
- .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch, qty, work_qty, matnr_code, matnr_id, maktx")
+ .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch, qty, unit, stock_unit, work_qty, matnr_code, matnr_id, maktx")
.lambda()
.in(WarehouseAreasItem::getTrackCode, tracks)
+ .eq(StringUtils.isNotBlank(waitPakin.getBatch()), WarehouseAreasItem::getSplrBatch, waitPakin.getBatch())
.groupBy(WarehouseAreasItem::getSplrBatch,
WarehouseAreasItem::getTrackCode);
List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);
@@ -187,11 +189,33 @@
}
items.add(pakinItem);
}
+
+
}
double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
+
if (!waitPakinItemService.saveBatch(items)) {
throw new CoolException("缁勬嫋鏄庣粏淇濆瓨澶辫触锛侊紒");
}
+
+ for (WaitPakinItem pakinItem : items) {
+ WarehouseAreasItem one = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
+ .eq(WarehouseAreasItem::getTrackCode, pakinItem.getTrackCode())
+ .eq(WarehouseAreasItem::getSplrBatch, pakinItem.getBatch()));
+ if (Objects.isNull(one)) {
+ throw new CoolException("鏀惰揣鍖烘暟鎹敊璇紒锛�");
+ }
+ one.setWorkQty(one.getWorkQty() + pakinItem.getAnfme() + one.getQty()) ;
+ if (one.getWorkQty() > one.getAnfme()) {
+ throw new CoolException("缁勬墭鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒");
+ }
+ if (!warehouseAreasItemService.saveOrUpdate(one)) {
+ throw new CoolException("鏀惰揣鍖烘墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+
+
+
waitPakin1.setAnfme(sum1);
if (!this.updateById(waitPakin1)) {
throw new CoolException("缁勬嫋鏁伴噺淇敼澶辫触锛侊紒");
@@ -210,7 +234,8 @@
* @time 2025/3/29 14:42
*/
@Override
- public WaitPakin unBind(WaitPakinParam param) {
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized WaitPakin unBind(WaitPakinParam param) {
String barcode = param.getBarcode();
if (StringUtils.isNotBlank(barcode)) {
WaitPakin waitPakins = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, barcode), false);
--
Gitblit v1.9.1