From 880621206ae152e69104cabc30200ff3a098eabb Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 09 四月 2026 21:55:37 +0800
Subject: [PATCH] 调整
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 333e880..d250bcf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -147,7 +147,7 @@
}
}
- /** 涓庡彇娑堟帴鍙ｄ竴鑷达細鍏ュ簱鏈墽琛屻�佸嚭搴撲换鍔″垵濮� */
+ /** 淇敼/鍑哄簱鍙栨秷锛氬叆搴撴湭鎵ц銆佸嚭搴撲换鍔″垵濮嬶紙鍏ュ簱鍙栨秷瑙� assertWkOrderExceStatusForCancel锛� */
private static final List<Short> WK_ORDER_UNEXECUTED_EXCE_STATUSES = Collections.unmodifiableList(
Arrays.asList(
AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val,
@@ -157,6 +157,14 @@
if (!WK_ORDER_UNEXECUTED_EXCE_STATUSES.contains(order.getExceStatus())) {
throw new CoolException("浠呮湭鎵ц鐘舵�佺殑鍗曟嵁鍙�" + actionVerb + "锛侊紒");
}
+ }
+
+ /** 鍙栨秷锛氬叆搴撳崟缁勬墭鍓嶅嵆鍙紙缁勬墭鏁板凡鏍￠獙锛夛紱鍑哄簱鍗曚粛椤绘湭鎵ц/鍑哄簱鍒濆 */
+ private void assertWkOrderExceStatusForCancel(WkOrder order) {
+ if (order.getType() != null && order.getType().equals(OrderType.ORDER_IN.type)) {
+ return;
+ }
+ assertWkOrderExceStatusUnexecuted(order, "鍙栨秷");
}
/**
@@ -1045,7 +1053,7 @@
if (pakinCount > 0) {
throw new CoolException("鍗曟嵁宸茬粍鎵橈紝浠呮湭缁勬墭鐘舵�佸彲鍙栨秷锛岃鍏堣В闄ょ粍鎵橈紒锛�");
}
- assertWkOrderExceStatusUnexecuted(finalWkOrder, "鍙栨秷");
+ assertWkOrderExceStatusForCancel(finalWkOrder);
order.getOrderItems().forEach(orderItem -> {
if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
.eq(WkOrderItem::getMatnrCode, orderItem.getMatnr())
--
Gitblit v1.9.1