From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期五, 23 五月 2025 09:41:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 52 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 31 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..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); @@ -287,6 +288,12 @@ 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()) .setSplrName(item.getSplrName()) @@ -305,9 +312,14 @@ .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("鍗曟嵁涓嶅瓨鍦紒锛�"); + } + purchaseItem.setQty(purchaseItem.getQty() + item.getAnfme()); + if (!purchaseItemService.updateById(purchaseItem)) { + throw new CoolException("PO鍗曟槑缁嗕慨鏀瑰け璐ワ紒锛�"); + } } double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum(); @@ -317,7 +329,6 @@ } //浠诲姟鎵ц瀹屾垚锛屼慨鏀瑰凡瀹屾垚鏁伴噺鍜孭O鍗曟墽琛岀姸鎬� purchase.setQty(sum + purchase.getQty()) - .setAnfme(purchase.getAnfme() - sum) .setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val); if (!purchaseService.saveOrUpdate(purchase)) { @@ -350,11 +361,10 @@ 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鍗曟槑缁嗘洿鏂板け璐ワ紒锛�"); + purchaseItem.setQty(purchaseItem.getQty() - item.getAnfme()); + if (!purchaseItemService.updateById(purchaseItem)) { + throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�"); + } } }); @@ -362,20 +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) - .setAnfme(purchase.getAnfme() + sum); + 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