From ccbf66ef68ea3c96d81dd2c456824900b5020eeb Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期六, 15 二月 2025 17:06:51 +0800
Subject: [PATCH] 协客云的三个接口修改
---
src/main/java/com/gs/xky/service/XkyService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/gs/xky/service/XkyService.java b/src/main/java/com/gs/xky/service/XkyService.java
index 732e6b3..a90de75 100644
--- a/src/main/java/com/gs/xky/service/XkyService.java
+++ b/src/main/java/com/gs/xky/service/XkyService.java
@@ -38,15 +38,15 @@
XkyCommonParam param = XkyCommonParam.GetInit();
// 璁＄畻浜斿垎閽熷墠鐨勬椂闂存埑
- long startDate = currentTimeMillis - (65 * 60 * 1000); // 5 鍒嗛挓 = 5 * 60 * 1000 姣
+ long startDate = currentTimeMillis - (5 * 60 * 1000); // 5 鍒嗛挓 = 5 * 60 * 1000 姣
// 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
BodyParam bodyParam = new BodyParam();
bodyParam.setStartDate(startDate);
bodyParam.setEndDate(currentTimeMillis);
bodyParam.setErpCode(DataAcquisitionConfiguration.TEST_ERP_CODE);
- bodyParam.setStatus(new int[]{1});
- bodyParam.setLogisticsStatus(2);
+ bodyParam.setStatus(new int[]{1, 4, 6});
+// bodyParam.setLogisticsStatus(2);
param.setBody(bodyParam);
@@ -65,7 +65,7 @@
deliveryNoList.forEach(deliveryNo -> {
try {
- if ("4".equals(deliveryNo.getStatus()) || "8".equals(deliveryNo.getStatus())) {
+ if ("6".equals(deliveryNo.getStatus()) || "0".equals(deliveryNo.getLogisticsStatus())) {
deliveryNoticeWrapper.clear();
updateWrapper.clear();
updateWrapper1.clear();
@@ -82,15 +82,15 @@
barcodeInformationService.remove(updateWrapper1);
}
+ } else if ("2".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(), "");
}
- 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(), "");
} catch (IOException e) {
throw new RuntimeException(e);
}
--
Gitblit v1.9.3