From 10d86aa74f50336a469385be2b2d14410438a234 Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期二, 24 六月 2025 18:22:44 +0800
Subject: [PATCH] 更改
---
src/test/java/com/gs/xky/XkyApplicationTests.java | 79 ++++++++++++++++++++++++---------------
1 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/src/test/java/com/gs/xky/XkyApplicationTests.java b/src/test/java/com/gs/xky/XkyApplicationTests.java
index f743bd8..7c2e4e0 100644
--- a/src/test/java/com/gs/xky/XkyApplicationTests.java
+++ b/src/test/java/com/gs/xky/XkyApplicationTests.java
@@ -1,11 +1,13 @@
package com.gs.xky;
+import com.alibaba.fastjson.JSON;
import com.gs.xky.config.ApiResponse;
import com.gs.xky.config.BodyParam;
import com.gs.xky.config.DataAcquisitionConfiguration;
import com.gs.xky.config.XkyCommonParam;
import com.gs.xky.dto.BarcodeDeliveryNo;
import com.gs.xky.dto.XkyDetail;
+import com.gs.xky.dto.XkyEntity;
import com.gs.xky.entity.MesInvItemArn;
import com.gs.xky.service.*;
import org.junit.jupiter.api.Test;
@@ -36,6 +38,10 @@
@Autowired
private MesInvItemArnService invItemArnService;
+ @Autowired
+ private PurchaseService service;
+ @Autowired
+ private DingtalkInfoService dingtalkInfoService;
@Test
void contextLoads() throws IOException {
@@ -48,43 +54,51 @@
@Test
public void getDeviceRealTimeData() throws IOException {
- // xkyService.GetSaveDetail();
+ xkyService.GetSaveDetail();
}
@Test
void cs() throws IOException {
- XkyCommonParam param = XkyCommonParam.GetInit();
- // 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
- BodyParam bodyParam = new BodyParam();
+ String str = "2225060624DY;";
- bodyParam.setErpCode(DataAcquisitionConfiguration.TEST_ERP_CODE);
- bodyParam.setDeliveryNo("22250526H9UR");
- bodyParam.setStatus(new int[]{1, 6});
- param.setBody(bodyParam);
+ String[] split = str.split(";");
- ApiResponse<XkyDetail> detail = apiService.sendListRequest(param, XkyDetail.class, "https://openapi.xiekeyun.com/delivery/getDetail.json");
+ for (String s : split) {
+ XkyCommonParam param = XkyCommonParam.GetInit();
- XkyDetail deliveryNo = detail.getData();
- if ("6".equals(deliveryNo.getStatus()) || "0".equals(deliveryNo.getLogisticsStatus())) {
-// remove(deliveryNo);
- } else if ("1".equals(deliveryNo.getStatus()) && ("2".equals(deliveryNo.getLogisticsStatus()) || "1".equals(deliveryNo.getLogisticsStatus()))) {
- XkyDetail detail1 = deliveryNo;
- deliveryNoticeService.saveDeliveryNotice(detail1);
- List<BarcodeDeliveryNo> barcodeDeliveryNos = GetBarcodeInformation(deliveryNo.getDeliveryNo());
- barcodeInformationService.SaveBarcodeInformation(barcodeDeliveryNos, deliveryNo.getDeliveryNo());
- if ("2".equals(deliveryNo.getLogisticsStatus())) {
- deliveryNoticeService.callPdaReceiptBtn("閫佽揣鍗曠鏀禰BTNOK[PL017[" + deliveryNo.getDeliveryNo(), "");
+ // 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
+ BodyParam bodyParam = new BodyParam();
+
+ bodyParam.setErpCode(DataAcquisitionConfiguration.TEST_ERP_CODE);
+ bodyParam.setDeliveryNo(s);
+
+ param.setBody(bodyParam);
+
+ ApiResponse<XkyDetail> detail = apiService.sendListRequest(param, XkyDetail.class, "https://openapi.xiekeyun.com/delivery/getDetail.json");
+
+ XkyDetail deliveryNo = detail.getData();
+
+ if (deliveryNo == null) {
+ System.out.println("涓虹┖鐨勯�佽揣鍗曞彿" + s);
+ return;
+ }
+
+ if ("6".equals(deliveryNo.getStatus()) || "0".equals(deliveryNo.getLogisticsStatus())) {
+ XkyEntity xkyEntity = new XkyEntity();
+ xkyEntity.setDeliveryNo(deliveryNo.getDeliveryNo());
+ xkyService.remove1(xkyEntity);
+ } else if ("1".equals(deliveryNo.getStatus()) && ("2".equals(deliveryNo.getLogisticsStatus()) || "1".equals(deliveryNo.getLogisticsStatus()))) {
+ XkyDetail detail1 = deliveryNo;
+ deliveryNoticeService.saveDeliveryNotice(detail1);
+ List<BarcodeDeliveryNo> barcodeDeliveryNos = GetBarcodeInformation(deliveryNo.getDeliveryNo());
+ barcodeInformationService.SaveBarcodeInformation(barcodeDeliveryNos, deliveryNo.getDeliveryNo());
+ if ("2".equals(deliveryNo.getLogisticsStatus())) {
+ deliveryNoticeService.callPdaReceiptBtn("閫佽揣鍗曠鏀禰BTNOK[PL017[" + deliveryNo.getDeliveryNo(), "");
+ }
}
}
-// List<LineList> collect = deliveryNo.getLineList().stream().filter(s -> "1".equals(s.getStatus())).collect(Collectors.toList());
-// System.out.println(JSON.toJSONString(collect));
-// deliveryNoticeService.saveDeliveryNotice(deliveryNo);
-// List<BarcodeDeliveryNo> barcodeDeliveryNos = GetBarcodeInformation(deliveryNo.getDeliveryNo());
-// barcodeInformationService.SaveBarcodeInformation(barcodeDeliveryNos, deliveryNo.getDeliveryNo());
-//
-// deliveryNoticeService.callPdaReceiptBtn("閫佽揣鍗曠鏀禰BTNOK[PL017[" + deliveryNo.getDeliveryNo(), "");
}
private List<BarcodeDeliveryNo> GetBarcodeInformation(String deliveryNo) throws IOException {
@@ -120,9 +134,10 @@
// partition.forEach(list -> {
// staffService.SaveStaff(list);
// });
-
+ XkyCommonParam param = XkyCommonParam.GetInit();
+ String jsonString = JSON.toJSONString(param);
+ System.out.println(jsonString);
}
-
@Test
void cs2() throws IOException {
@@ -144,8 +159,12 @@
}
@Test
- void cs3() throws IOException {
- String str = "{\"state\":\"500\",\"msg\":\"{\\\"Result\\\":{\\\"ResponseStatus\\\":{\\\"ErrorCode\\\":500,\\\"IsSuccess\\\":false,\\\"Errors\\\":[{\\\"FieldName\\\":null,\\\"Message\\\":\\\"鏄庣粏淇℃伅绗�1琛岀殑鐢熶骇閫氱煡鍗曞�间负:銆�127147銆戜笉瀛樺湪锛沑\\\r\\\\n\\\",\\\"DIndex\\\":0}],\\\"SuccessEntitys\\\":[],\\\"SuccessMessages\\\":[],\\\"MsgCode\\\":11},\\\"Id\\\":\\\"\\\",\\\"Number\\\":\\\"\\\",\\\"NeedReturnData\\\":[{}]}}\"}";
+ void cs3() throws Exception {
+// dingtalkInfoService.sendMessage("CGJY20250412166");
+
+// XkyEntity xkyEntity = new XkyEntity();
+// xkyEntity.setDeliveryNo("222505057541");
+// xkyService.remove1(xkyEntity);
}
}
\ No newline at end of file
--
Gitblit v1.9.3