From b839bdc85e784e545cb5d371ed3f638747fb6a06 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期一, 22 十二月 2025 09:05:22 +0800
Subject: [PATCH] 新增企业微信的接口

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

diff --git a/src/main/java/com/gs/xky/service/XkyService.java b/src/main/java/com/gs/xky/service/XkyService.java
index f8e8321..23aadac 100644
--- a/src/main/java/com/gs/xky/service/XkyService.java
+++ b/src/main/java/com/gs/xky/service/XkyService.java
@@ -97,13 +97,22 @@
     private void processBatchDeliveries(List<XkyEntity> batchDeliveries) {
         batchDeliveries.forEach(deliveryNo -> {
             try {
-                if ("6".equals(deliveryNo.getStatus()) || "0".equals(deliveryNo.getLogisticsStatus())) {
+                if ("6".equals(deliveryNo.getStatus()) || "8".equals(deliveryNo.getStatus()) || "0".equals(deliveryNo.getLogisticsStatus())) {
                     log.info("銆恜rocessBatchDeliveries銆戠Щ闄ら�佽揣鍗�: {}", deliveryNo.getDeliveryNo());
                     remove1(deliveryNo);
                 } else if ("1".equals(deliveryNo.getStatus()) && ("2".equals(deliveryNo.getLogisticsStatus()) || "1".equals(deliveryNo.getLogisticsStatus()))) {
                     log.info("銆恜rocessBatchDeliveries銆戝鐞嗛�佽揣鍗�: {}, 鐗╂祦鐘舵��: {}", deliveryNo.getDeliveryNo(), deliveryNo.getLogisticsStatus());
                     XkyDetail detail = getDetail(deliveryNo.getDeliveryNo());
                     deliveryNoticeService.saveDeliveryNotice(detail);
+
+                    // 鏁版嵁鎻掑叆鍚庯紝澶勭悊PO_ERP_NO涓簄ull鐨勮褰�
+                    try {
+                        deliveryNoticeService.setDeliveryNotice();
+                        log.info("銆恜rocessBatchDeliveries銆慞O_ERP_NO null鍊煎鐞嗗畬鎴�: {}", deliveryNo.getDeliveryNo());
+                    } catch (Exception e) {
+                        log.error("銆恜rocessBatchDeliveries銆戝鐞哖O_ERP_NO null鍊煎紓甯�: {}, 寮傚父: {}", deliveryNo.getDeliveryNo(), e.getMessage(), e);
+                    }
+
                     List<BarcodeDeliveryNo> barcodeDeliveryNos = GetBarcodeInformation(deliveryNo.getDeliveryNo());
                     barcodeInformationService.SaveBarcodeInformation(barcodeDeliveryNos, deliveryNo.getDeliveryNo());
                     //宸查�佽揪鐨勬墠鑷姩杞崲涓篗ES鍒拌揣鍗�
@@ -146,6 +155,13 @@
                     .set(MesInvItemArn::getSyncMsg, "SRM鎵嬪姩鍒犻櫎閫佽揣鍗�");
             mesInvItemArnService.update(updateWrapper);
 
+            //MesInvItemArnDetail
+            LambdaUpdateWrapper<MesInvItemArnDetail> deleteWrapper = new LambdaUpdateWrapper<>();
+            deleteWrapper.eq(MesInvItemArnDetail::getMid, mesInvItemArn.getId())
+                    .set(MesInvItemArnDetail::getReturnFlag, 1);
+
+            mesInvItemArnDetailService.update(deleteWrapper);
+
             // 鍒犻櫎MesQaItemsDetect01琛ㄧ殑鏁版嵁
             mesQaItemsDetect01Service.removeQa(mesInvItemArn.getBillNo());
         }

--
Gitblit v1.9.3