From d87b636f92269b4ec97cb5ca00680409755814a9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 15:38:43 +0800
Subject: [PATCH] 收货优化修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 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 4ab88da..0d6bed9 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;
@@ -49,7 +50,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) {
- if (waitPakin.getItems().isEmpty()) {
+ if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
throw new CoolException("鍙傛暟閿欒锛氱墿鏂欒窡韪爜涓虹┖锛�");
}
if (StringUtils.isBlank(waitPakin.getBarcode())) {
@@ -83,6 +84,8 @@
//鐘舵�佷慨鏀逛负鍏ュ簱涓�
.setIoStatus(Short.parseShort(PakinIOStatus.PAKIN_IO_STATUS_DONE.val))
.setAnfme(sum)
+ .setUpdateBy(userId)
+ .setCreateBy(userId)
.setBarcode(waitPakin.getBarcode());
if (!this.save(waitPakin1)) {
throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒");
@@ -107,6 +110,7 @@
}
}
List<WaitPakinItem> items = new ArrayList<>();
+ //涓嶈壇鏍囩缁勬墭
if (!Objects.isNull(waitPakin.getType()) && waitPakin.getType().equals("defective")) {
List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().in(AsnOrderItem::getTrackCode, tracks));
if (Objects.isNull(orderItems) || orderItems.isEmpty()) {
@@ -127,9 +131,14 @@
.setUpdateBy(userId)
.setCreateBy(userId)
.setMatnrCode(item.getMatnrCode());
+ AsnOrder order = asnOrderService.getById(item.getAsnId());
+ if (!Objects.isNull(order)) {
+ pakinItem.setType(null == order.getType() ? null :order.getType())
+ .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()) );
+ }
for (PakinItem waitPakinItem : waitPakin.getItems()) {
if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) {
- if (waitPakinItem.getReceiptQty() > item.getAnfme()) {
+ if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) >= 0) {
throw new CoolException("缁勬嫋鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒");
}
pakinItem.setAnfme(waitPakinItem.getReceiptQty()).setTrackCode(waitPakinItem.getTrackCode());
@@ -163,25 +172,56 @@
.setUpdateBy(userId)
.setCreateBy(userId)
.setMatnrCode(item.getMatnrCode());
+ AsnOrder order = asnOrderService.getById(item.getAsnId());
+ if (!Objects.isNull(order)) {
+ pakinItem.setType(null == order.getType() ? null :order.getType())
+ .setWkType(null == order.getWkType() ? null : Short.parseShort(order.getWkType()) );
+ }
+
for (PakinItem waitPakinItem : waitPakin.getItems()) {
if (waitPakinItem.getTrackCode().equals(item.getTrackCode())) {
- if (waitPakinItem.getReceiptQty() > item.getAnfme()) {
- throw new CoolException("缁勬嫋鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺锛侊紒");
+ if (waitPakinItem.getReceiptQty() > item.getAnfme() || waitPakinItem.getReceiptQty().compareTo(0.0) <= 0) {
+ throw new CoolException("缁勬嫋鏁伴噺涓嶈兘澶т簬鏀惰揣鏁伴噺涓斾笉鑳藉皬浜庨浂锛侊紒");
}
pakinItem.setAnfme(waitPakinItem.getReceiptQty()).setTrackCode(waitPakinItem.getTrackCode());
}
}
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("缁勬嫋鏁伴噺淇敼澶辫触锛侊紒");
}
+
+ //TODO 缁勬嫋瀹屾垚鍚庯紝鎵ｅ噺鏀惰揣鍖哄簱瀛�
+
return pakin;
}
--
Gitblit v1.9.1