From 5fdde9f474d8b136f818dd77f6ed499515ebc8ad Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 31 七月 2025 19:02:00 +0800
Subject: [PATCH] 物料导入报错问题修复

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
index e83f81f..8adaa8a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
@@ -46,6 +46,8 @@
     private AsnOrderItemLogService asnOrderItemLogService;
     @Autowired
     private TransferOrderService transferOrderService;
+    @Autowired
+    private TransferService transferService;
 
     /**
      * @param
@@ -155,19 +157,23 @@
                         if (!asnOrderService.updateById(order)) {
                             throw new CoolException("鍗曟嵁鐘舵�佹洿鏂板け璐ワ紒锛�");
                         }
-
-                        List<TransferOrder> orders = transferOrderService.list(new LambdaQueryWrapper<TransferOrder>().eq(TransferOrder::getTransferId, order.getPoId()));
-                        if (orders.isEmpty()) {
-                            throw new CoolException("鏁版嵁閿欒锛氬叧鑱旇〃淇℃伅涓嶅瓨鍦紒锛�");
-                        }
-                        Set<Long> orderIds = orders.stream().map(TransferOrder::getOrderId).collect(Collectors.toSet());
-                        if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
-                                .in(WkOrderItem::getOrderId, orderIds))) {
-                            throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
-                        }
-                        if (!this.asnOrderService.removeByIds(orderIds)) {
-                            throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
-                        }
+//                        List<TransferOrder> orders = transferOrderService.list(new LambdaQueryWrapper<TransferOrder>().eq(TransferOrder::getTransferId, order.getPoId()));
+//                        if (orders.isEmpty()) {
+//                            throw new CoolException("鏁版嵁閿欒锛氬叧鑱旇〃淇℃伅涓嶅瓨鍦紒锛�");
+//                        }
+//                        Set<Long> orderIds = orders.stream().map(TransferOrder::getOrderId).collect(Collectors.toSet());
+//                        if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
+//                                .in(WkOrderItem::getOrderId, orderIds))) {
+//                            throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�");
+//                        }
+//                        if (!this.asnOrderService.removeByIds(orderIds)) {
+//                            throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
+//                        }
+                          if (!transferService.update(new LambdaUpdateWrapper<Transfer>()
+                                  .eq(Transfer::getId, order.getPoId())
+                                  .set(Transfer::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
+                              throw new CoolException("璋冩嫈鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
+                          }
                         return;
                     } else {
                         if (!Objects.isNull(order.getPoId())) {
@@ -182,7 +188,7 @@
                         if (!asnOrderService.updateById(order)) {
                             throw new CoolException("鍗曟嵁鐘舵�佹洿鏂板け璐ワ紒锛�");
                         }
-                        //濡傛灉涓鸿皟鎷斿崟鎵ц瀹屾垚锛岄渶妫�鏌ヨ皟鎷斿叆搴撳崟鏄惁瀹屾垚锛屽畬鎴愬悗鎵嶈兘鍒犻櫎鍗曟嵁淇℃伅
+                        //濡傛灉涓鸿皟鎷斿崟鎹繚鐣�
                         return;
                     } else {
                         if (!Objects.isNull(order.getPoId())) {

--
Gitblit v1.9.1