From b003a49794f49a329e2702918ecfc8d14b371d0d Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 04 三月 2026 14:51:25 +0800
Subject: [PATCH] 云仓WMS接口流程
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 76 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 22 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..1f39b07 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
@@ -69,6 +69,8 @@
private AsnOrderService asnOrderService;
@Autowired
private TaskService taskService;
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
@Override
public boolean notifyInspect(List<WkOrder> orders) {
@@ -143,6 +145,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 +159,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 +317,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 +344,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 +357,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);
@@ -363,6 +381,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R removeOrders(List<Long> ids) {
+ // 宸茬粍鎵樹笉鍙垹闄わ紝闇�鍏堣В闄ょ粍鎵�
+ long palletizedCount = waitPakinItemService.count(new LambdaQueryWrapper<WaitPakinItem>()
+ .in(WaitPakinItem::getAsnId, ids));
+ if (palletizedCount > 0) {
+ throw new CoolException("鍗曟嵁宸茬粍鎵橈紝璇峰厛瑙ｉ櫎缁勬墭鍚庡啀鍒犻櫎锛侊紒");
+ }
for (Long id : ids) {
List<WkOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
.eq(WkOrderItem::getOrderId, id));
@@ -373,7 +397,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 +410,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);
@@ -494,30 +518,38 @@
// throw new CoolException("鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
// }
WkOrder order = this.getById(asrder.getId());
- AsnOrderLog orderLog = new AsnOrderLog();
-// order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
- BeanUtils.copyProperties(order, orderLog);
- orderLog.setId(null);
- orderLog.setAsnId(order.getId());
-
-// if (!this.saveOrUpdate(order)) {
-// throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�");
-// }
-// orderLog.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
- if (!asnOrderLogService.save(orderLog)) {
- throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
+ AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
+ AsnOrderLog orderLog;
+ if (Objects.isNull(one)) {
+ orderLog = new AsnOrderLog();
+ BeanUtils.copyProperties(order, orderLog);
+ orderLog.setId(null);
+ orderLog.setAsnId(order.getId());
+ if (!asnOrderLogService.save(orderLog)) {
+ throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
+ }
+ } else {
+ long existingLogId = one.getId();
+ BeanUtils.copyProperties(order, one);
+ one.setId(existingLogId);
+ one.setAsnId(order.getId());
+ if (!asnOrderLogService.updateById(one)) {
+ throw new CoolException("涓诲崟鍘嗗彶妗ｆ洿鏂板け璐ワ紒锛�");
+ }
+ orderLog = one;
+ asnOrderItemLogService.remove(new LambdaQueryWrapper<AsnOrderItemLog>().eq(AsnOrderItemLog::getLogId, existingLogId));
}
List<AsnOrderItemLog> logs = new ArrayList<>();
List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
items.forEach(item -> {
AsnOrderItemLog itemLog = new AsnOrderItemLog();
BeanUtils.copyProperties(item, itemLog);
- itemLog.setAsnItemId(itemLog.getId())
+ itemLog.setAsnItemId(item.getId())
+ .setId(null)
.setLogId(orderLog.getId())
.setAsnId(item.getOrderId());
logs.add(itemLog);
});
-
if (!asnOrderItemLogService.saveBatch(logs)) {
throw new CoolException("閫氱煡鍗曟槑缁嗗巻鍙叉。淇濆瓨澶辫触锛侊紒");
}
--
Gitblit v1.9.1