From 5ee4872b888b80ebda97b76ec75adfbf68731089 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 04 七月 2025 23:43:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/test/java/com/gs/xky/XkyApplicationTests.java | 132 ++++++++++++++++++++++++++++++++++----------
1 files changed, 102 insertions(+), 30 deletions(-)
diff --git a/src/test/java/com/gs/xky/XkyApplicationTests.java b/src/test/java/com/gs/xky/XkyApplicationTests.java
index 5cf4208..123a12a 100644
--- a/src/test/java/com/gs/xky/XkyApplicationTests.java
+++ b/src/test/java/com/gs/xky/XkyApplicationTests.java
@@ -1,20 +1,21 @@
package com.gs.xky;
-import cn.hutool.core.collection.ListUtil;
-import com.alibaba.fastjson2.JSON;
-import com.gs.xky.config.*;
-import com.gs.xky.dto.EmployeeInfo;
+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.service.ApiService;
-import com.gs.xky.service.MesStaffService;
-import com.gs.xky.service.XkyService;
+import com.gs.xky.dto.XkyEntity;
+import com.gs.xky.entity.MesInvItemArn;
+import com.gs.xky.service.*;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import java.io.IOException;
import java.util.List;
-import java.util.stream.Collectors;
@SpringBootTest
class XkyApplicationTests {
@@ -29,27 +30,92 @@
@Autowired
private MesStaffService staffService;
+ @Autowired
+ private DeliveryNoticeService deliveryNoticeService;
+
+ @Autowired
+ private TblBarcodeInformationService barcodeInformationService;
+
+ @Autowired
+ private MesInvItemArnService invItemArnService;
+ @Autowired
+ private PurchaseService service;
+ @Autowired
+ private DingtalkInfoService dingtalkInfoService;
+
@Test
void contextLoads() throws IOException {
+ List<MesInvItemArn> itemArnMinus = invItemArnService.getItemArnMinus();
+
+ deliveryNoticeService.processMesInvItemArnStatusAsync(itemArnMinus);
+
+ }
+
+ @Test
+ public void getDeviceRealTimeData() throws IOException {
xkyService.GetSaveDetail();
}
@Test
void cs() throws IOException {
+
+ String str = "22250702H88F;";
+
+
+ String[] split = str.split(";");
+
+ for (String s : split) {
+ XkyCommonParam param = XkyCommonParam.GetInit();
+
+ // 鍒涘缓 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(), "");
+ }
+ }
+ }
+ }
+
+ private List<BarcodeDeliveryNo> GetBarcodeInformation(String deliveryNo) throws IOException {
XkyCommonParam param = XkyCommonParam.GetInit();
// 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
BodyParam bodyParam = new BodyParam();
bodyParam.setErpCode(DataAcquisitionConfiguration.TEST_ERP_CODE);
- bodyParam.setDeliveryNo("22250212VVWU");
+ bodyParam.setDeliveryNo(deliveryNo);
param.setBody(bodyParam);
- ApiResponse<XkyDetail> noList = apiService.sendListRequest(param, XkyDetail.class, "https://openapi.xiekeyun.com/delivery/getDetail.json");
- System.out.println(JSON.toJSONString(noList.getData()));
+ ApiResponse<BarcodeDeliveryNo> noList = apiService.sendListRequest(param, BarcodeDeliveryNo.class, "https://openapi.xiekeyun.com/barcode/byDeliveryNo.json");
+
+ return noList.getDataList();
}
@Test
@@ -68,32 +134,38 @@
// partition.forEach(list -> {
// staffService.SaveStaff(list);
// });
-
+ XkyCommonParam param = XkyCommonParam.GetInit();
+ String jsonString = JSON.toJSONString(param);
+ System.out.println(jsonString);
}
-
@Test
void cs2() throws IOException {
- DingTalkParam dingTalkParam = new DingTalkParam(1);
-
- DingTalkResponse<EmployeeInfo> employeeInfoDingTalkResponse = apiService.sendListRequest(dingTalkParam, EmployeeInfo.class, "http://192.168.1.64/eHR/eHRExternalService/Service.ashx");
-
- //閫犳ⅵ鑰咃紙娴欐睙锛夌鎶�鏈夐檺鍏徃 cUnitName
- //http://192.168.1.64/eHR
- List<EmployeeInfo> collect = employeeInfoDingTalkResponse.getData().stream().filter(s -> "閫犳ⅵ鑰咃紙娴欐睙锛夌鎶�鏈夐檺鍏徃".equals(s.getCUnitName())).collect(Collectors.toList());
- System.out.println(collect.size());
-
- List<List<EmployeeInfo>> partition = ListUtil.partition(collect, 100);
-
- partition.forEach(list -> {
- staffService.UpdateStaff(list);
- });
+// DingTalkParam dingTalkParam = new DingTalkParam(1);
+//
+// DingTalkResponse<EmployeeInfo> employeeInfoDingTalkResponse = apiService.sendListRequest(dingTalkParam, EmployeeInfo.class, "http://192.168.1.64/eHR/eHRExternalService/Service.ashx");
+//
+// //閫犳ⅵ鑰咃紙娴欐睙锛夌鎶�鏈夐檺鍏徃 cUnitName
+// //http://192.168.1.64/eHR
+// List<EmployeeInfo> collect = employeeInfoDingTalkResponse.getData().stream().filter(s -> "閫犳ⅵ鑰咃紙娴欐睙锛夌鎶�鏈夐檺鍏徃".equals(s.getCUnitName())).collect(Collectors.toList());
+// System.out.println(collect.size());
+//
+// List<List<EmployeeInfo>> partition = ListUtil.partition(collect, 100);
+//
+// partition.forEach(list -> {
+// staffService.UpdateStaff(list);
+// });
}
@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);
+
+ deliveryNoticeService.setDeliveryNotice();
}
}
\ No newline at end of file
--
Gitblit v1.9.3