From 67a8f1f413b198a69363f56ad7f7106bf1aff590 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 30 五月 2025 14:57:00 +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/AsnOrderServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 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 93a3df4..576f97b 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);
@@ -287,6 +288,12 @@
if (StringUtils.isBlank(trackCode)) {
throw new CoolException("鍗曟嵁璺熻釜鐮佺敓鎴愬け璐ワ細璇锋鏌ャ�宻ys_asn_mantr_label銆嶆槸鍚﹂厤缃畬鎴愶紒锛�");
}
+
+ PurchaseItem service = purchaseItemService.getById(item.getId());
+ Double qty = Math.round((service.getQty() + item.getAnfme()) * 10000) / 10000.0;
+ if (qty.compareTo(service.getAnfme()) > 0) {
+ throw new CoolException("鏂板缓鍗曟嵁鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺锛侊紒");
+ }
orderItem.setAnfme(item.getAnfme())
.setAsnId(order.getId())
.setSplrName(item.getSplrName())
@@ -305,9 +312,16 @@
.setMatnrId(matnr.getId());
orderItems.add(orderItem);
-
-// purchaseItemService.update(new LambdaUpdateWrapper<>().set(PurchaseItem::getAnfme, ));
+ PurchaseItem purchaseItem = purchaseItemService.getOne(new LambdaQueryWrapper<PurchaseItem>().eq(PurchaseItem::getId, item.getId()));
+ if (Objects.isNull(purchaseItem)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ Double toQty = Math.round((purchaseItem.getQty() + item.getAnfme()) * 10000) / 10000.0;
+ purchaseItem.setQty(toQty);
+ if (!purchaseItemService.updateById(purchaseItem)) {
+ throw new CoolException("PO鍗曟槑缁嗕慨鏀瑰け璐ワ紒锛�");
+ }
}
double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
@@ -316,8 +330,8 @@
throw new CoolException(("Asn鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒"));
}
//浠诲姟鎵ц瀹屾垚锛屼慨鏀瑰凡瀹屾垚鏁伴噺鍜孭O鍗曟墽琛岀姸鎬�
- purchase.setQty(sum + purchase.getQty())
- .setAnfme(purchase.getAnfme() - sum)
+ Double qty = Math.round((sum + purchase.getQty()) * 10000) / 10000.0;
+ purchase.setQty(qty)
.setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
if (!purchaseService.saveOrUpdate(purchase)) {
@@ -350,11 +364,11 @@
list.forEach(item -> {
PurchaseItem purchaseItem = purchaseItemService.getById(item.getPoDetlId());
if (!Objects.isNull(purchaseItem)) {
- purchaseItem.setQty(purchaseItem.getQty() - item.getAnfme())
- .setAnfme(purchaseItem.getAnfme() + item.getAnfme());
- }
- if (!purchaseItemService.updateById(purchaseItem)) {
- throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
+ Double minusQty = Math.round((purchaseItem.getQty() - item.getAnfme()) * 10000) / 10000.0;
+ purchaseItem.setQty(minusQty);
+ if (!purchaseItemService.updateById(purchaseItem)) {
+ throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
+ }
}
});
@@ -362,20 +376,15 @@
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)
- .setAnfme(purchase.getAnfme() + sum);
+ if (!Objects.isNull(purchase)) {
+ Double qty = Math.round((purchase.getQty() - sum) * 10000) / 10000.0;
+ purchase.setQty(qty)
+ .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 +393,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