From b8b017c64b4b05a596b95406fed7b1af9f4c6ba8 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 26 五月 2025 20:07:28 +0800
Subject: [PATCH] 添加srm与U9订单数据的对比
---
src/main/java/com/gs/xky/service/XkyService.java | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 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..2c57e2a 100644
--- a/src/main/java/com/gs/xky/service/XkyService.java
+++ b/src/main/java/com/gs/xky/service/XkyService.java
@@ -1,6 +1,8 @@
package com.gs.xky.service;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.gs.xky.config.ApiResponse;
@@ -12,6 +14,8 @@
import com.gs.xky.dto.XkyEntity;
import com.gs.xky.entity.*;
import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -23,9 +27,8 @@
@RequiredArgsConstructor
public class XkyService {
+ private static final Logger log = LoggerFactory.getLogger(XkyService.class);
private final ApiService apiService;
-
-
private final DeliveryNoticeService deliveryNoticeService;
private final TblBarcodeInformationService barcodeInformationService;
@@ -35,47 +38,51 @@
private final MesInvItemArnDetailService mesInvItemArnDetailService;
private final MesInvItemBarcodesService mesInvItemBarcodesService;
+ private final MesQaItemsDetect01Service mesQaItemsDetect01Service;
+
public void GetSaveDetail() throws IOException {
long currentTimeMillis = System.currentTimeMillis();
+ long startDate = currentTimeMillis - (20 * 60 * 1000); // 璁＄畻 20 鍒嗛挓鍓嶇殑鏃堕棿鎴�
- XkyCommonParam param = XkyCommonParam.GetInit();
-
- // 璁＄畻浜斿垎閽熷墠鐨勬椂闂存埑
- long startDate = currentTimeMillis - (5 * 60 * 1000); // 5 鍒嗛挓 = 5 * 60 * 1000 姣
-
- // 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
+ XkyCommonParam<BodyParam> param = XkyCommonParam.GetInit();
BodyParam bodyParam = new BodyParam();
bodyParam.setStartDate(startDate);
bodyParam.setEndDate(currentTimeMillis);
bodyParam.setErpCode(DataAcquisitionConfiguration.TEST_ERP_CODE);
bodyParam.setStatus(new int[]{1, 6});
-// bodyParam.setLogisticsStatus(2);
-
param.setBody(bodyParam);
+
+ // 璁板綍璇锋眰鍙傛暟鏃ュ織
+ log.info("銆怗etSaveDetail 璇锋眰鍙傛暟銆戞椂闂�: {}, 鍙傛暟: {}", currentTimeMillis, JSONUtil.toJsonStr(param));
ApiResponse<XkyEntity> noList = apiService.sendListRequest(param, XkyEntity.class, "https://openapi.xiekeyun.com/delivery/getNoList.json");
-// List<String> deliveryNoList = noList.getDataList().stream().map(XkyEntity::getDeliveryNo).collect(Collectors.toList());
+ // 璁板綍杩斿洖鏁版嵁鏃ュ織
+ log.info("銆怗etSaveDetail 鍝嶅簲鏁版嵁銆戞椂闂�: {}, 杩斿洖: {}", currentTimeMillis, JSONUtil.toJsonStr(noList));
List<XkyEntity> deliveryNoList = noList.getDataList();
+ if (CollUtil.isEmpty(deliveryNoList)) {
+ log.info("銆怗etSaveDetail銆戣繑鍥炲垪琛ㄤ负绌猴紝璺宠繃澶勭悊");
+ return;
+ }
deliveryNoList.forEach(deliveryNo -> {
try {
-
if ("6".equals(deliveryNo.getStatus()) || "0".equals(deliveryNo.getLogisticsStatus())) {
-
+ log.info("銆怗etSaveDetail銆戠Щ闄ら�佽揣鍗�: {}", deliveryNo.getDeliveryNo());
remove(deliveryNo);
-
- } else if ("2".equals(deliveryNo.getLogisticsStatus())) {
+ } else if ("1".equals(deliveryNo.getStatus()) && ("2".equals(deliveryNo.getLogisticsStatus()) || "1".equals(deliveryNo.getLogisticsStatus()))) {
XkyDetail detail = getDetail(deliveryNo.getDeliveryNo());
deliveryNoticeService.saveDeliveryNotice(detail);
List<BarcodeDeliveryNo> barcodeDeliveryNos = GetBarcodeInformation(deliveryNo.getDeliveryNo());
barcodeInformationService.SaveBarcodeInformation(barcodeDeliveryNos, deliveryNo.getDeliveryNo());
-
- deliveryNoticeService.callPdaReceiptBtn("閫佽揣鍗曠鏀禰BTNOK[PL017[" + deliveryNo.getDeliveryNo(), "");
+ //宸查�佽揪鐨勬墠鑷姩杞崲涓篗ES鍒拌揣鍗�
+ if ("2".equals(deliveryNo.getLogisticsStatus())) {
+ deliveryNoticeService.callPdaReceiptBtn("閫佽揣鍗曠鏀禰BTNOK[PL017[" + deliveryNo.getDeliveryNo(), "");
+ }
}
-
} catch (IOException e) {
+ log.error("銆怗etSaveDetail 澶勭悊寮傚父銆戦�佽揣鍗�: {}, 寮傚父: {}", deliveryNo.getDeliveryNo(), e.getMessage(), e);
throw new RuntimeException(e);
}
});
@@ -105,9 +112,10 @@
LambdaQueryWrapper<MesInvItemArn> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(MesInvItemArn::getPaperBillNo, deliveryNo.getDeliveryNo());
+ MesInvItemArn mesInvItemArn = mesInvItemArnService.getOne(wrapper, false);
+
mesInvItemArnService.remove(wrapper);
- MesInvItemArn mesInvItemArn = mesInvItemArnService.getOne(wrapper, false);
if (mesInvItemArn != null) {
LambdaUpdateWrapper<MesInvItemArnDetail> updateWrapper2 = new LambdaUpdateWrapper<>();
@@ -119,12 +127,13 @@
updateWrapper3.eq(MesInvItemBarcodes::getBillNo, mesInvItemArn.getBillNo());
mesInvItemBarcodesService.remove(updateWrapper3);
+ mesQaItemsDetect01Service.removeQa(mesInvItemArn.getBillNo());
}
}
}
private XkyDetail getDetail(String deliveryNo) throws IOException {
- XkyCommonParam param = XkyCommonParam.GetInit();
+ XkyCommonParam<BodyParam> param = XkyCommonParam.GetInit();
// 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
BodyParam bodyParam = new BodyParam();
@@ -141,7 +150,7 @@
}
private List<BarcodeDeliveryNo> GetBarcodeInformation(String deliveryNo) throws IOException {
- XkyCommonParam param = XkyCommonParam.GetInit();
+ XkyCommonParam<BodyParam> param = XkyCommonParam.GetInit();
// 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
BodyParam bodyParam = new BodyParam();
--
Gitblit v1.9.3