From b5f4b52e998471e8286c2f6ec4267f7bc7b01e0d Mon Sep 17 00:00:00 2001 From: tjx <t2856754968@163.com> Date: 星期一, 26 五月 2025 15:12:09 +0800 Subject: [PATCH] 更改 --- src/test/java/com/gs/xky/XkyApplicationTests.java | 61 +++++++++++++++++++++--------- 1 files changed, 43 insertions(+), 18 deletions(-) diff --git a/src/test/java/com/gs/xky/XkyApplicationTests.java b/src/test/java/com/gs/xky/XkyApplicationTests.java index 35d4455..e9ca87d 100644 --- a/src/test/java/com/gs/xky/XkyApplicationTests.java +++ b/src/test/java/com/gs/xky/XkyApplicationTests.java @@ -1,9 +1,7 @@ package com.gs.xky; -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.alibaba.fastjson.JSON; +import com.gs.xky.config.*; import com.gs.xky.dto.BarcodeDeliveryNo; import com.gs.xky.dto.XkyDetail; import com.gs.xky.entity.MesInvItemArn; @@ -47,28 +45,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,7 +127,9 @@ // partition.forEach(list -> { // staffService.SaveStaff(list); // }); - + XkyCommonParam param = XkyCommonParam.GetInit(); + String jsonString = JSON.toJSONString(param); + System.out.println(jsonString); } -- Gitblit v1.9.3