From 643bf4e6dde0b63597115d2aaba5c6579a345983 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 21 Jul 2023 11:08:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=8A=E6=96=AD=E8=8E=B7=E5=8F=96=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/ptxhyy/entity/ThrHslbService.java | 1 + .../glxp/mipsdl/client/pzh/PzhzdClient.java | 123 ++++++++++-------- .../entity => dao/ptxyy}/ThrHslbMapper.java | 3 +- .../mybatis/mapper/ptxyy/ThrHslbMapper.xml | 2 +- 4 files changed, 72 insertions(+), 57 deletions(-) rename src/main/java/com/glxp/mipsdl/{client/ptxhyy/entity => dao/ptxyy}/ThrHslbMapper.java (65%) diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbService.java b/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbService.java index ee632a7..d3f3375 100644 --- a/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbService.java +++ b/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbService.java @@ -1,5 +1,6 @@ package com.glxp.mipsdl.client.ptxhyy.entity; +import com.glxp.mipsdl.dao.ptxyy.ThrHslbMapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java b/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java index 5c935be..4b9ad10 100644 --- a/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java +++ b/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java @@ -170,30 +170,35 @@ public class PzhzdClient implements BaseHttpClient { // uPurchaseinRequest.setFbillflag("3"); // } uPurchaseinRequest.setBillcode(udiwmsOrderQueryRequest.getBillNo()); - List udiwmsOrderResponses = getPurchasein(uPurchaseinRequest); - if (udiwmsOrderResponses != null && udiwmsOrderResponses.size() > 0) { - List returnsList = new ArrayList<>(); - if ("采购入库".equals(udiwmsOrderQueryRequest.getBillAction())) { - for (int i = 0; i < udiwmsOrderResponses.size(); i++) { - if (udiwmsOrderResponses.get(i).getBillType().equals("采购入库")) { - returnsList.add(udiwmsOrderResponses.get(i)); - } - } - } else if ("退货出库".equals(udiwmsOrderQueryRequest.getBillAction())) { - for (int i = 0; i < udiwmsOrderResponses.size(); i++) { - if (udiwmsOrderResponses.get(i).getBillType().equals("退货出库")) { - returnsList.add(udiwmsOrderResponses.get(i)); - } - } - } else if ("WareHouseIn".equals(udiwmsOrderQueryRequest.getAction())) { - returnsList.addAll(udiwmsOrderResponses); - } - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal((long) returnsList.size()); - pageSimpleResponse.setList(returnsList); - return ResultVOUtils.success(pageSimpleResponse); - } else - return ResultVOUtils.error(500, "未查询到数据"); + BaseResponse> baseResponse = getPurchasein(uPurchaseinRequest); +// if (baseResponse.getCode() != 20000) { +// +// } + return baseResponse; +// List udiwmsOrderResponses = baseResponse.getData().getList(); +// if (udiwmsOrderResponses != null && udiwmsOrderResponses.size() > 0) { +// List returnsList = new ArrayList<>(); +// if ("采购入库".equals(udiwmsOrderQueryRequest.getBillAction())) { +// for (int i = 0; i < udiwmsOrderResponses.size(); i++) { +// if (udiwmsOrderResponses.get(i).getBillType().equals("采购入库")) { +// returnsList.add(udiwmsOrderResponses.get(i)); +// } +// } +// } else if ("退货出库".equals(udiwmsOrderQueryRequest.getBillAction())) { +// for (int i = 0; i < udiwmsOrderResponses.size(); i++) { +// if (udiwmsOrderResponses.get(i).getBillType().equals("退货出库")) { +// returnsList.add(udiwmsOrderResponses.get(i)); +// } +// } +// } else if ("WareHouseIn".equals(udiwmsOrderQueryRequest.getAction())) { +// returnsList.addAll(udiwmsOrderResponses); +// } +// PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); +// pageSimpleResponse.setTotal((long) returnsList.size()); +// pageSimpleResponse.setList(returnsList); +// return ResultVOUtils.success(pageSimpleResponse); +// } else +// return ResultVOUtils.error(500, "未查询到数据"); } else if ( "WareHouseOut".equals(udiwmsOrderQueryRequest.getAction()) || @@ -212,31 +217,32 @@ public class PzhzdClient implements BaseHttpClient { uSaleoutQueryRequest.setFbillflag("3"); } uSaleoutQueryRequest.setBillcode(udiwmsOrderQueryRequest.getBillNo()); - - List udiwmsOrderResponses = getSaleout(uSaleoutQueryRequest); - if (udiwmsOrderResponses != null && udiwmsOrderResponses.size() > 0) { - List returnsList = new ArrayList<>(); - if ("销售出库".equals(udiwmsOrderQueryRequest.getBillAction())) { - for (int i = 0; i < udiwmsOrderResponses.size(); i++) { - if (udiwmsOrderResponses.get(i).getBillType().equals("销售出库")) { - returnsList.add(udiwmsOrderResponses.get(i)); - } - } - } else if ("退货入库".equals(udiwmsOrderQueryRequest.getBillAction())) { - for (int i = 0; i < udiwmsOrderResponses.size(); i++) { - if (udiwmsOrderResponses.get(i).getBillType().equals("退货入库")) { - returnsList.add(udiwmsOrderResponses.get(i)); - } - } - } else if ("WareHouseIn".equals(udiwmsOrderQueryRequest.getAction())) { - returnsList.addAll(udiwmsOrderResponses); - } - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - pageSimpleResponse.setTotal((long) returnsList.size()); - pageSimpleResponse.setList(returnsList); - return ResultVOUtils.success(pageSimpleResponse); - } else - return ResultVOUtils.error(500, "未查询到数据"); + BaseResponse> baseResponse = getSaleout(uSaleoutQueryRequest); + return baseResponse; +// List udiwmsOrderResponses = baseResponse.getData().getList(); +// if (udiwmsOrderResponses != null && udiwmsOrderResponses.size() > 0) { +// List returnsList = new ArrayList<>(); +// if ("销售出库".equals(udiwmsOrderQueryRequest.getBillAction())) { +// for (int i = 0; i < udiwmsOrderResponses.size(); i++) { +// if (udiwmsOrderResponses.get(i).getBillType().equals("销售出库")) { +// returnsList.add(udiwmsOrderResponses.get(i)); +// } +// } +// } else if ("退货入库".equals(udiwmsOrderQueryRequest.getBillAction())) { +// for (int i = 0; i < udiwmsOrderResponses.size(); i++) { +// if (udiwmsOrderResponses.get(i).getBillType().equals("退货入库")) { +// returnsList.add(udiwmsOrderResponses.get(i)); +// } +// } +// } else if ("WareHouseIn".equals(udiwmsOrderQueryRequest.getAction())) { +// returnsList.addAll(udiwmsOrderResponses); +// } +// PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); +// pageSimpleResponse.setTotal((long) returnsList.size()); +// pageSimpleResponse.setList(returnsList); +// return ResultVOUtils.success(pageSimpleResponse); +// } else +// return ResultVOUtils.error(500, "未查询到数据"); } else { return ResultVOUtils.error(500, "单据类型错误！"); } @@ -488,7 +494,7 @@ public class PzhzdClient implements BaseHttpClient { return setEntity; } - public List getPurchasein(UPurchaseinRequest uPurchaseinRequest) { + public BaseResponse getPurchasein(UPurchaseinRequest uPurchaseinRequest) { uPurchaseinRequest.setCorp(setEntity.getUnitCode()); UBaseResponse> response = uCloudHttpClient.purchaseinQuery(uPurchaseinRequest); if (response != null) { @@ -532,13 +538,17 @@ public class PzhzdClient implements BaseHttpClient { } purchaseinResponses.add(udiwmsOrderResponse); } - return purchaseinResponses; + + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(response.getData().getAllcount() + 0l); + pageSimpleResponse.setList(purchaseinResponses); + return ResultVOUtils.success(pageSimpleResponse); } } - return null; + return ResultVOUtils.error(500, "获取单据失败!"); } - public List getSaleout(USaleoutQueryRequest uSaleoutQueryRequest) { + public BaseResponse getSaleout(USaleoutQueryRequest uSaleoutQueryRequest) { uSaleoutQueryRequest.setCorp(setEntity.getUnitCode()); UBaseResponse> response = uCloudHttpClient.saleoutQuery(uSaleoutQueryRequest); @@ -582,10 +592,13 @@ public class PzhzdClient implements BaseHttpClient { } purchaseinResponses.add(purchaseinResponse); } - return purchaseinResponses; + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(response.getData().getAllcount() + 0l); + pageSimpleResponse.setList(purchaseinResponses); + return ResultVOUtils.success(pageSimpleResponse); } } - return null; + return ResultVOUtils.error(500, "下载出库单据失败！"); } //采购入库单签字 diff --git a/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbMapper.java b/src/main/java/com/glxp/mipsdl/dao/ptxyy/ThrHslbMapper.java similarity index 65% rename from src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbMapper.java rename to src/main/java/com/glxp/mipsdl/dao/ptxyy/ThrHslbMapper.java index 4f3eae2..b8d4ff8 100644 --- a/src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/ThrHslbMapper.java +++ b/src/main/java/com/glxp/mipsdl/dao/ptxyy/ThrHslbMapper.java @@ -1,6 +1,7 @@ -package com.glxp.mipsdl.client.ptxhyy.entity; +package com.glxp.mipsdl.dao.ptxyy; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.mipsdl.client.ptxhyy.entity.ThrHslbEntity; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/resources/mybatis/mapper/ptxyy/ThrHslbMapper.xml b/src/main/resources/mybatis/mapper/ptxyy/ThrHslbMapper.xml index 53f4052..5117df5 100644 --- a/src/main/resources/mybatis/mapper/ptxyy/ThrHslbMapper.xml +++ b/src/main/resources/mybatis/mapper/ptxyy/ThrHslbMapper.xml @@ -1,4 +1,4 @@ - +