From 628bffd89c1dd5068226c50047940203768556da Mon Sep 17 00:00:00 2001 From: yewj Date: Mon, 9 Sep 2024 16:27:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=8E=E9=87=87=E8=B4=AD=E8=AE=A1=E5=88=92=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 70 +++++++++---------- .../req/base/UdiwmsThrOrderRequest.java | 2 + 2 files changed, 37 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index 88a7c5e..ba389b7 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -1428,41 +1428,41 @@ public class CtqyyClient extends CommonHttpClient { */ @Override public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) { - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); if (udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.CGJH001.getBusType())) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); //补充其他查询条件 wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsPlanInfo::getCGDBH, udiwmsThrOrderRequest.getBillNo()); IPage page = vYpzsPlanInfoMapper.selectPage(new Page(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper); List planInfos = page.getRecords(); - List thrOrderResponses = new ArrayList<>(); + List thrOrderResponses = new ArrayList<>(); if (CollUtil.isNotEmpty(planInfos)) { //数据处理以thr_order，thr_order_detail 主子返回 Map> groupedByBz = planInfos.stream() .collect(Collectors.groupingBy(VYpzsPlanInfo::getCGDBH)); groupedByBz.forEach((key, value) -> { VYpzsPlanInfo planInfo = value.get(0); - ThrOrderResponse thrOrderResponse = new ThrOrderResponse(); + IoCollectOrder thrOrderResponse = new IoCollectOrder(); thrOrderResponse.setBillNo(planInfo.getCGDBH()); -// thrOrderResponse.setBilldate(planInfo.getSCQYMC()); - thrOrderResponse.setCorpId(planInfo.getSCQYBM()); - thrOrderResponse.setCorpName(planInfo.getSCQYMC()); - thrOrderResponse.setThirdPartyDate(1); +// thrOrderResponse.setBilldate(planInfo.()); + thrOrderResponse.setBillTime(new Date()); + thrOrderResponse.setFromCorp(planInfo.getSCQYBM()); + thrOrderResponse.setFromCorpName(planInfo.getSCQYMC()); thrOrderResponse.setCreateTime(new Date()); thrOrderResponse.setUpdateTime(new Date()); - List detailList = new ArrayList<>(); + List detailList = new ArrayList<>(); value.forEach(entity -> { - ThrOrderDetailEntity detail = new ThrOrderDetailEntity(); - detail.setProductId(entity.getYPBM()); - detail.setProductName(entity.getYPMC()); + IoCollectOrderBiz detail = new IoCollectOrderBiz(); + detail.setThrCode(entity.getYPBM()); + detail.setCpmctymc(entity.getYPMC()); detail.setBatchNo(entity.getYPBM()); - detail.setSpec(entity.getGGMC()); - detail.setCount(String.valueOf(entity.getZHB())); + detail.setGgxh(entity.getGGMC()); + detail.setCount(entity.getGMSL()); detail.setOrderIdFk(thrOrderResponse.getBillNo()); - detail.setPrice(entity.getTPJG()); + detail.setMeasureUnit(entity.getBZDW()); detailList.add(detail); }); - thrOrderResponse.setDetailList(detailList); + thrOrderResponse.setBizList(detailList); thrOrderResponses.add(thrOrderResponse); }); } @@ -1472,38 +1472,38 @@ public class CtqyyClient extends CommonHttpClient { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); //补充其他查询条件 wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()), VYpzsIoInfo::getPHYSIC_CODE, udiwmsThrOrderRequest.getBillNo()); - wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBusType()), VYpzsIoInfo::getSORT_NAME, BusTypeConstant.valueOf(udiwmsThrOrderRequest.getBusType()).getName()); + wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBusType()), VYpzsIoInfo::getIO_SORT, udiwmsThrOrderRequest.getBusType()); Page page = vYpzsIoInfoMapper.selectPage(new Page(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper); List ioInfos = page.getRecords(); - List thrOrderResponses = new ArrayList<>(); + List thrOrderResponses = new ArrayList<>(); if (CollUtil.isNotEmpty(ioInfos)) { //数据处理以thr_order，thr_order_detail 主子返回 Map> groupedByPhysicCode = ioInfos.stream() .collect(Collectors.groupingBy(VYpzsIoInfo::getPHYSIC_CODE)); groupedByPhysicCode.forEach((key, value) -> { VYpzsIoInfo info = value.get(0); - ThrOrderResponse thrOrderResponse = new ThrOrderResponse(); - thrOrderResponse.setBillNo(info.getPHYSIC_CODE()); - thrOrderResponse.setBilldate(DateUtil.formatDate(info.getKEEP_BOOK_TIME(), "yyyy-MM-dd HH:mm:ss")); - thrOrderResponse.setCorpId(info.getCONSIGNOR()); - thrOrderResponse.setCorpName(info.getCONSIGNOR_NAME()); - thrOrderResponse.setThirdPartyDate(1); - thrOrderResponse.setCreateTime(new Date()); - thrOrderResponse.setUpdateTime(new Date()); - List detailList = new ArrayList<>(); + IoCollectOrder collectOrder = new IoCollectOrder(); + collectOrder.setBillNo(info.getPHYSIC_CODE()); + collectOrder.setBillTime(DateUtil.parseDate(info.getKEEP_BOOK_TIME())); + collectOrder.setFromCorp(info.getCONSIGNOR()); + collectOrder.setFromCorpName(info.getCONSIGNOR_NAME()); + collectOrder.setBusType(udiwmsThrOrderRequest.getBusType()); + collectOrder.setWorkPlaceCode(udiwmsThrOrderRequest.getWorkPlaceCode()); + collectOrder.setCreateTime(new Date()); + collectOrder.setUpdateTime(new Date()); + List detailList = new ArrayList<>(); value.forEach(entity -> { - ThrOrderDetailEntity detail = new ThrOrderDetailEntity(); - detail.setProductId(null); - detail.setProductName(null); + IoCollectOrderBiz detail = new IoCollectOrderBiz(); + detail.setThrCode(entity.getPHYSIC_CODE()); + detail.setCpmctymc(entity.getPHYSIC_NAME()); detail.setBatchNo(entity.getBATCH_NO()); - detail.setSpec(null); - detail.setCount(String.valueOf(entity.getQUANTITY())); - detail.setOrderIdFk(thrOrderResponse.getBillNo()); - detail.setPrice(entity.getRETAIL_PRICE()); + detail.setCount(entity.getQUANTITY()); + detail.setOrderIdFk(info.getPHYSIC_CODE()); + detail.setMeasureUnit(entity.getPACK_UNIT1()); detailList.add(detail); }); - thrOrderResponse.setDetailList(detailList); - thrOrderResponses.add(thrOrderResponse); + collectOrder.setBizList(detailList); + thrOrderResponses.add(collectOrder); }); } pageSimpleResponse.setTotal(page.getTotal()); diff --git a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java index 4ebafcf..8af5eca 100644 --- a/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java @@ -193,5 +193,7 @@ public class UdiwmsThrOrderRequest extends ListPageRequest { private String busType; + + private Long workPlaceCode; }