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 9889d0f..98151eb 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -1429,10 +1429,10 @@ public class CtqyyClient extends CommonHttpClient { @Override public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) { PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); - if(udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.CGJH001.getBusType())){ + if (udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.CGJH001.getBusType())) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); //补充其他查询条件 - wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBillNo()),VYpzsPlanInfo::getCGDBH,udiwmsThrOrderRequest.getBillNo()); + 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<>(); @@ -1440,11 +1440,11 @@ public class CtqyyClient extends CommonHttpClient { //数据处理以thr_order,thr_order_detail 主子返回 Map> groupedByBz = planInfos.stream() .collect(Collectors.groupingBy(VYpzsPlanInfo::getCGDBH)); - groupedByBz.forEach((key,value) ->{ + groupedByBz.forEach((key, value) -> { VYpzsPlanInfo planInfo = value.get(0); ThrOrderResponse thrOrderResponse = new ThrOrderResponse(); thrOrderResponse.setBillNo(planInfo.getCGDBH()); - thrOrderResponse.setBilldate(planInfo.getSCQYMC()); +// thrOrderResponse.setBilldate(planInfo.getSCQYMC()); thrOrderResponse.setCorpId(planInfo.getSCQYBM()); thrOrderResponse.setCorpName(planInfo.getSCQYMC()); thrOrderResponse.setThirdPartyDate(1); @@ -1468,13 +1468,13 @@ public class CtqyyClient extends CommonHttpClient { } pageSimpleResponse.setTotal(page.getTotal()); pageSimpleResponse.setList(thrOrderResponses); - }else if(udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.LYRK.getBusType()) + } else if (udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.LYRK.getBusType()) || udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.GMRK.getBusType()) - || udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.LYCK.getBusType())){ + || udiwmsThrOrderRequest.getBusType().equals(BusTypeConstant.LYCK.getBusType())) { 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.getBillNo()), VYpzsIoInfo::getPHYSIC_CODE, udiwmsThrOrderRequest.getBillNo()); + wrapper.eq(StrUtil.isNotBlank(udiwmsThrOrderRequest.getBusType()), VYpzsIoInfo::getSORT_NAME, BusTypeConstant.valueOf(udiwmsThrOrderRequest.getBusType()).getName()); Page page = vYpzsIoInfoMapper.selectPage(new Page(udiwmsThrOrderRequest.getPage(), udiwmsThrOrderRequest.getLimit()), wrapper); List ioInfos = page.getRecords(); List thrOrderResponses = new ArrayList<>(); @@ -1482,11 +1482,11 @@ public class CtqyyClient extends CommonHttpClient { //数据处理以thr_order,thr_order_detail 主子返回 Map> groupedByPhysicCode = ioInfos.stream() .collect(Collectors.groupingBy(VYpzsIoInfo::getPHYSIC_CODE)); - groupedByPhysicCode.forEach((key, value)->{ + 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.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); @@ -1608,7 +1608,7 @@ public class CtqyyClient extends CommonHttpClient { collectOrderBiz.setThrCode(entity.getPHYSIC_CODE()); collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME()); collectOrderBiz.setGgxh(entity.getPACK_SPEC()); - collectOrderBiz.setBatchNo(entity.getBATCH_NUMBER()); +// collectOrderBiz.setBatchNo(entity.getBATCH_NUMBER()); collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo()); collectOrderBiz.setCount(Integer.parseInt(entity.getLAY_PHYSIC_QUANTITY())); collectOrderBiz.setMeasureUnit(entity.getPHYSIC_UNIT());