From a372a11167f095bd70d1070d70ec36af56489898 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 四月 2025 17:56:58 +0800
Subject: [PATCH] 人工上架任务修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 b2ee5fa..741bcda 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
@@ -238,11 +238,6 @@
if (Objects.isNull(order)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- order.setExceStatus(Short.parseShort(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val));
-
- if (!this.updateById(order)) {
- throw new CoolException("鍗曟嵁鍏抽棴澶辫触锛侊紒");
- }
try {
operateOrderLogs(order);
} catch (Exception e) {
@@ -263,12 +258,21 @@
if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(asrder.getAnfme()) || asrder.getAnfme().compareTo(0.00) == 0) {
- throw new CoolException("鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
+ asrder.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
+
+ if (!this.updateById(asrder)) {
+ throw new CoolException("鍗曟嵁鍏抽棴澶辫触锛侊紒");
}
+ List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, asrder.getId()));
+ if (orderItems.isEmpty()) {
+ throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒");
+ }
+// if (Objects.isNull(asrder.getAnfme()) || asrder.getAnfme().compareTo(0.00) == 0) {
+// throw new CoolException("鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
+// }
AsnOrder order = this.getById(asrder.getId());
AsnOrderLog orderLog = new AsnOrderLog();
- order.setExceStatus(Short.parseShort(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val));
+ order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
BeanUtils.copyProperties(order, orderLog);
orderLog.setId(null);
orderLog.setAsnId(order.getId());
@@ -276,7 +280,7 @@
if (!this.saveOrUpdate(order)) {
throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- orderLog.setExceStatus(Short.parseShort(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val));
+ orderLog.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
if (!asnOrderLogService.save(orderLog)) {
throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
}
@@ -286,6 +290,7 @@
AsnOrderItemLog itemLog = new AsnOrderItemLog();
BeanUtils.copyProperties(item, itemLog);
itemLog.setAsnItemId(itemLog.getId())
+ .setLogId(orderLog.getId())
.setAsnId(item.getAsnId());
logs.add(itemLog);
});
--
Gitblit v1.9.1