From 30a83b7337706fff402a5e360dca96745d48f59a Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 17 二月 2025 13:20:56 +0800
Subject: [PATCH] 撤回流程的补充

---
 src/main/java/com/gs/xky/service/XkyService.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gs/xky/service/XkyService.java b/src/main/java/com/gs/xky/service/XkyService.java
index 558e20f..7e67ef0 100644
--- a/src/main/java/com/gs/xky/service/XkyService.java
+++ b/src/main/java/com/gs/xky/service/XkyService.java
@@ -1,6 +1,7 @@
 package com.gs.xky.service;
 
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.gs.xky.config.ApiResponse;
@@ -35,13 +36,15 @@
     private final MesInvItemArnDetailService mesInvItemArnDetailService;
     private final MesInvItemBarcodesService mesInvItemBarcodesService;
 
+    private final MesQaItemsDetect01Service mesQaItemsDetect01Service;
+
     public void GetSaveDetail() throws IOException {
         long currentTimeMillis = System.currentTimeMillis();
 
         XkyCommonParam param = XkyCommonParam.GetInit();
 
         // 璁$畻浜斿垎閽熷墠鐨勬椂闂存埑
-        long startDate = currentTimeMillis - (5 * 60 * 1000); // 5 鍒嗛挓 = 5 * 60 * 1000 姣
+        long startDate = currentTimeMillis - (6 * 60 * 1000); // 5 鍒嗛挓 = 5 * 60 * 1000 姣
 
         // 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
         BodyParam bodyParam = new BodyParam();
@@ -59,6 +62,10 @@
 
         List<XkyEntity> deliveryNoList = noList.getDataList();
 
+        if (CollUtil.isEmpty(deliveryNoList)) {
+            return;
+        }
+
         deliveryNoList.forEach(deliveryNo -> {
             try {
 
@@ -66,7 +73,7 @@
 
                     remove(deliveryNo);
 
-                } else if ("2".equals(deliveryNo.getLogisticsStatus())) {
+                } else if ("1".equals(deliveryNo.getStatus()) && "2".equals(deliveryNo.getLogisticsStatus())) {
                     XkyDetail detail = getDetail(deliveryNo.getDeliveryNo());
                     deliveryNoticeService.saveDeliveryNotice(detail);
                     List<BarcodeDeliveryNo> barcodeDeliveryNos = GetBarcodeInformation(deliveryNo.getDeliveryNo());
@@ -119,6 +126,7 @@
                 updateWrapper3.eq(MesInvItemBarcodes::getBillNo, mesInvItemArn.getBillNo());
                 mesInvItemBarcodesService.remove(updateWrapper3);
 
+                mesQaItemsDetect01Service.removeQa(mesInvItemArn.getBillNo());
             }
         }
     }

--
Gitblit v1.9.3