From b1123ede8199b691d6d684af6b3b58b223b6bdae Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 11 二月 2026 14:05:31 +0800
Subject: [PATCH] 修改预约库位变更
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 e2b0562..d0f6cab 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
@@ -143,6 +143,10 @@
* @param loginUserId
* @return
*/
+ /** 鍏ュ簱鍗曚笟鍔＄被鍨嬶細鎷ｆ枡鍏ュ簱銆佺洏鐐瑰叆搴撶瓑涓嶅彲淇敼鏄庣粏锛屾澶勪负瀛楀吀 value锛屾寜瀹為檯閰嶇疆琛ュ厖 */
+ private static final Set<String> ASN_WKTYPE_NO_EDIT = Collections.unmodifiableSet(new HashSet<>(
+ Arrays.asList("53", "57"))); // 53=鎷ｆ枡鍐嶅叆搴� 57=鐩樼偣鍐嶅叆搴擄紙涓� TaskType 涓�鑷达紝鑻ュ瓧鍏镐笉鍚岃鏀逛负瀹為檯 value锛�
+
@Override
@Transactional(rollbackFor = Exception.class)
public R updateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
@@ -153,11 +157,23 @@
if (Objects.isNull(orders.getId())) {
throw new CoolException("鏁版嵁閿欒锛氬崟鎹甀D涓嶈兘涓虹┖锛侊紒");
}
- if (!this.updateById(orders)) {
- throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
+ WkOrder currentOrder = this.getById(orders.getId());
+ if (Objects.isNull(currentOrder)) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ // 浠呮湭鎵ц鐘舵�佸彲淇敼
+ if (!Objects.equals(currentOrder.getExceStatus(), AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val)) {
+ throw new CoolException("褰撳墠鍗曟嵁鐘舵�佷笉鍏佽淇敼锛屼粎鏈墽琛岀姸鎬佸彲淇敼");
+ }
+ // 鎷ｆ枡鍏ュ簱銆佺洏鐐瑰叆搴撶被鍨嬩笉鍙慨鏀�
+ if (StringUtils.isNotBlank(currentOrder.getWkType()) && ASN_WKTYPE_NO_EDIT.contains(currentOrder.getWkType())) {
+ throw new CoolException("鎷ｆ枡鍏ュ簱銆佺洏鐐瑰叆搴撶被鍨嬬殑鍗曟嵁涓嶈兘淇敼");
}
if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) {
- return R.ok("鏄庣粏鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ throw new CoolException("鏄庣粏鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (!this.updateById(orders)) {
+ throw new CoolException("涓诲崟淇敼澶辫触锛侊紒");
}
svaeOrUpdateOrderItem(params, loginUserId);
@@ -299,7 +315,7 @@
}
PurchaseItem service = purchaseItemService.getById(item.getId());
- Double qty = Math.round((service.getQty() + item.getAnfme()) * 100) / 100.0;
+ Double qty = Math.round((service.getQty() + item.getAnfme()) * 1000000) / 1000000.0;
if (qty.compareTo(service.getAnfme()) > 0) {
throw new CoolException("鏂板缓鍗曟嵁鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺锛侊紒");
}
@@ -326,7 +342,7 @@
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- Double toQty = Math.round((purchaseItem.getQty() + item.getAnfme()) * 100) / 100.0;
+ Double toQty = Math.round((purchaseItem.getQty() + item.getAnfme()) * 1000000) / 1000000.0;
purchaseItem.setQty(toQty);
if (!purchaseItemService.updateById(purchaseItem)) {
throw new CoolException("PO鍗曟槑缁嗕慨鏀瑰け璐ワ紒锛�");
@@ -339,7 +355,7 @@
throw new CoolException(("Asn鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒"));
}
//浠诲姟鎵ц瀹屾垚锛屼慨鏀瑰凡瀹屾垚鏁伴噺鍜孭O鍗曟墽琛岀姸鎬�
- Double qty = Math.round((sum + purchase.getQty()) * 100) / 100.0;
+ Double qty = Math.round((sum + purchase.getQty()) * 1000000) / 1000000.0;
purchase.setQty(qty)
.setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
@@ -373,7 +389,7 @@
list.forEach(item -> {
PurchaseItem purchaseItem = purchaseItemService.getById(item.getPoDetlId());
if (!Objects.isNull(purchaseItem)) {
- Double minusQty = Math.round((purchaseItem.getQty() - item.getAnfme()) * 100) / 100.0;
+ Double minusQty = Math.round((purchaseItem.getQty() - item.getAnfme()) * 1000000) / 1000000.0;
purchaseItem.setQty(minusQty);
if (!purchaseItemService.updateById(purchaseItem)) {
throw new CoolException("PO鍗曟槑缁嗘洿鏂板け璐ワ紒锛�");
@@ -386,7 +402,7 @@
Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>()
.eq(Purchase::getCode, list.stream().findFirst().get().getPoCode()));
if (!Objects.isNull(purchase)) {
- Double qty = Math.round((purchase.getQty() - sum) * 100) / 100.0;
+ Double qty = Math.round((purchase.getQty() - sum) * 1000000) / 1000000.0;
purchase.setQty(qty)
.setExceStatus(POExceStatus.PO_EXCE_STATUS_EXCE_ING.val);
--
Gitblit v1.9.1