From 03dbce0ba849005d060af569ffe3a58c0a1e0e45 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 23 五月 2025 14:24:06 +0800
Subject: [PATCH] 盘点再入库
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index 011bd52..10e29b7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -254,6 +254,7 @@
* @version 1.0
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public R createByPo(Map<String, Object> params) {
Long purchaseId = Long.parseLong(params.get("purchaseId").toString());
List<PurchaseItem> itemList = JSONArray.parseArray(JSONObject.toJSONString(params.get("items")), PurchaseItem.class);
@@ -286,6 +287,12 @@
String trackCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, item);
if (StringUtils.isBlank(trackCode)) {
throw new CoolException("鍗曟嵁璺熻釜鐮佺敓鎴愬け璐ワ細璇锋鏌ャ�宻ys_asn_mantr_label銆嶆槸鍚﹂厤缃畬鎴愶紒锛�");
+ }
+
+ PurchaseItem service = purchaseItemService.getById(item.getId());
+ Double qty = service.getQty() + item.getAnfme();
+ if (qty.compareTo(service.getAnfme()) > 0) {
+ throw new CoolException("鏂板缓鍗曟嵁鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺锛侊紒");
}
orderItem.setAnfme(item.getAnfme())
.setAsnId(order.getId())
@@ -355,9 +362,9 @@
PurchaseItem purchaseItem = purchaseItemService.getById(item.getPoDetlId());
if (!Objects.isNull(purchaseItem)) {
purchaseItem.setQty(purchaseItem.getQty() - item.getAnfme());
- }
- if (!purchaseItemService.updateById(purchaseItem)) {
- throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
+ if (!purchaseItemService.updateById(purchaseItem)) {
+ throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
+ }
}
});
@@ -365,17 +372,14 @@
Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>()
.eq(Purchase::getCode, list.stream().findFirst().get().getPoCode()));
- purchase.setQty(purchase.getQty() - sum)
- .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
+ if (!Objects.isNull(purchase)) {
+ purchase.setQty(purchase.getQty() - sum)
+ .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
- if (!purchaseService.updateById(purchase)) {
- throw new CoolException("PO鍗曟嵁鏇存柊澶辫触锛侊紒");
+ if (!purchaseService.updateById(purchase)) {
+ throw new CoolException("PO鍗曟嵁鏇存柊澶辫触锛侊紒");
+ }
}
- }
-
- if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>()
- .in(AsnOrderItem::getAsnId, ids))) {
- throw new CoolException("Details Delete Fail");
}
if (!this.remove(new LambdaQueryWrapper<AsnOrder>()
@@ -384,6 +388,12 @@
throw new CoolException("浠诲姟涓崟鎹笉鍙垹闄わ紒锛�");
}
+
+ if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>()
+ .in(AsnOrderItem::getAsnId, ids))) {
+// throw new CoolException("Details Delete Fail");
+ }
+
return R.ok("鎿嶄綔鎴愬姛锛侊紒");
}
--
Gitblit v1.9.1