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/test/java/com/gs/xky/XkyApplicationTests.java |   61 ++++++++++++++++++++++--------
 1 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/src/test/java/com/gs/xky/XkyApplicationTests.java b/src/test/java/com/gs/xky/XkyApplicationTests.java
index 35d4455..b56bdd9 100644
--- a/src/test/java/com/gs/xky/XkyApplicationTests.java
+++ b/src/test/java/com/gs/xky/XkyApplicationTests.java
@@ -1,5 +1,6 @@
 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;
@@ -36,6 +37,8 @@
 
     @Autowired
     private MesInvItemArnService invItemArnService;
+    @Autowired
+    private PurchaseService service;
 
     @Test
     void contextLoads() throws IOException {
@@ -47,28 +50,53 @@
     }
 
     @Test
+    public void getDeviceRealTimeData() throws IOException {
+        xkyService.GetSaveDetail();
+    }
+
+    @Test
     void cs() throws IOException {
-        XkyCommonParam param = XkyCommonParam.GetInit();
 
-        // 鍒涘缓 BodyParam 瀵硅薄骞惰祴鍊�
-        BodyParam bodyParam = new BodyParam();
+        String str = "22250510W8LC";
 
-        bodyParam.setErpCode(DataAcquisitionConfiguration.TEST_ERP_CODE);
-        bodyParam.setDeliveryNo("222504279H65");
-        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();
+            // 鍒涘缓 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 ("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(), "");
+                }
+            }
 //        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.saveDeliveryNotice(deliveryNo);
+//        List<BarcodeDeliveryNo> barcodeDeliveryNos = GetBarcodeInformation(deliveryNo.getDeliveryNo());
+//        barcodeInformationService.SaveBarcodeInformation(barcodeDeliveryNos, deliveryNo.getDeliveryNo());
+//
+//        deliveryNoticeService.callPdaReceiptBtn("閫佽揣鍗曠鏀禰BTNOK[PL017[" + deliveryNo.getDeliveryNo(), "");
+        }
 
-        deliveryNoticeService.callPdaReceiptBtn("閫佽揣鍗曠鏀禰BTNOK[PL017[" + deliveryNo.getDeliveryNo(), "");
+
     }
 
     private List<BarcodeDeliveryNo> GetBarcodeInformation(String deliveryNo) throws IOException {
@@ -104,9 +132,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 {
@@ -129,7 +158,7 @@
 
     @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\\\":[{}]}}\"}";
 
+        service.syncPurchaseOrderDetails();
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3