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 | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gs/xky/service/XkyService.java b/src/main/java/com/gs/xky/service/XkyService.java
index b907d43..2c57e2a 100644
--- a/src/main/java/com/gs/xky/service/XkyService.java
+++ b/src/main/java/com/gs/xky/service/XkyService.java
@@ -44,7 +44,7 @@
long currentTimeMillis = System.currentTimeMillis();
long startDate = currentTimeMillis - (20 * 60 * 1000); // 璁＄畻 20 鍒嗛挓鍓嶇殑鏃堕棿鎴�
- XkyCommonParam param = XkyCommonParam.GetInit();
+ XkyCommonParam<BodyParam> param = XkyCommonParam.GetInit();
BodyParam bodyParam = new BodyParam();
bodyParam.setStartDate(startDate);
bodyParam.setEndDate(currentTimeMillis);
@@ -71,13 +71,15 @@
if ("6".equals(deliveryNo.getStatus()) || "0".equals(deliveryNo.getLogisticsStatus())) {
log.info("銆怗etSaveDetail銆戠Щ闄ら�佽揣鍗�: {}", deliveryNo.getDeliveryNo());
remove(deliveryNo);
- } else if ("1".equals(deliveryNo.getStatus()) && "2".equals(deliveryNo.getLogisticsStatus())) {
- log.info("銆怗etSaveDetail銆戝鐞嗛�佽揣鍗�: {}", deliveryNo.getDeliveryNo());
+ } 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);
@@ -131,7 +133,7 @@
}
private XkyDetail getDetail(String deliveryNo) throws IOException {
- XkyCommonParam param = XkyCommonParam.GetInit();
+ XkyCommonParam<BodyParam> param = XkyCommonParam.GetInit();
// 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
BodyParam bodyParam = new BodyParam();
@@ -148,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