diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 4a77c71d3..fbb4f8168 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -16,8 +16,10 @@ */ package com.logpm.distribution.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; @@ -184,7 +186,11 @@ public class DistributionStockArticleController extends BladeController { Object o1 = distributionStockArticle.get("entDate"); String orderIds = (String) distributionStockArticle.get("orderIds"); String customerName = (String) distributionStockArticle.get("customerName"); + String reservationStatus = (String) distributionStockArticle.get("reservationStatus"); + String warehouseEntryTime = (String) distributionStockArticle.get("warehouseEntryTime"); String customerTelephone = (String) distributionStockArticle.get("customerTelephone"); + String completeSet = (String) distributionStockArticle.get("completeSet"); + String freezeStatus = (String) distributionStockArticle.get("freezeStatus"); Object d = distributionStockArticle.get("id"); distributionStockArticle.remove("id"); distributionStockArticle.remove("startDate"); @@ -194,10 +200,23 @@ public class DistributionStockArticleController extends BladeController { // distributionStockArticle.remove("currentPage"); // distributionStockArticle.remove("total"); QueryWrapper queryWrapper = Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class); + LambdaQueryWrapper lambda = Wrappers.query().lambda(); queryWrapper.ne("reservation_status","30"); queryWrapper.lambda().eq(DistributionStockArticleEntity::getWarehouseId,myCurrentWarehouse.getId()); if(Func.isNotEmpty(o)){ - queryWrapper.in("orderCode",String.valueOf(o).split(",")); + queryWrapper.in("order_code",String.valueOf(o).split(",")); + } + if(Func.isNotEmpty(reservationStatus)){ + queryWrapper.eq("reservation_status",reservationStatus); + } + if(Func.isNotEmpty(warehouseEntryTime)){ + queryWrapper.apply("datediff(warehouse_entry_time,{0} ) = 0",warehouseEntryTime); + } + if(Func.isNotEmpty(freezeStatus)){ + queryWrapper.eq("freeze_status",freezeStatus); + } + if(Func.isNotEmpty(completeSet)){ + queryWrapper.eq("complete_set",completeSet); } if(ObjectUtil.isNotEmpty(d)){ queryWrapper.in("id",String.valueOf(d).split(",")); @@ -208,9 +227,9 @@ public class DistributionStockArticleController extends BladeController { if(Func.isNotEmpty(orderIds)){ queryWrapper.notIn("id",Func.toLongList(orderIds)); } - if(Func.isNotEmpty(orderIds)){ - queryWrapper.notIn("id",Func.toLongList(orderIds)); - } +// if(Func.isNotEmpty(orderIds)){ +// queryWrapper.notIn("id",Func.toLongList(orderIds)); +// } if(Func.isNotEmpty(customerName)){ queryWrapper.like("customer_name",customerName); } @@ -239,7 +258,6 @@ public class DistributionStockArticleController extends BladeController { IPage pages = distributionStockArticleService.page(Condition.getPage(query), queryWrapper); IPage distributionStockArticleVOIPage = distributionStockArticleService.handlePackage(DistributionStockArticleWrapper.build().pageVO(pages)); return R.data(distributionStockArticleVOIPage); - } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java index 73ad0fee3..e15b26d4a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java @@ -153,4 +153,11 @@ public interface DistributionStockupMapper extends BaseMapper getMarketDeliveryStockupInfo(@Param("deliveryListId")Long id); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 30ac39a96..ad4baaa6b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -586,5 +586,52 @@ ldsi.stockup_id = #{ id } and ldsi.stock_up_type = 3 AND ldsi.is_deleted = 0 + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index 610367de1..74d598d76 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -210,8 +210,51 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionStockupVOList = distributionStockupMapper.getMarketDeliveryStockupInfo(detail.getId()); +// Optional max = distributionStockupVOList.stream().max(Comparator.comparing(DistributionStockupVO::getOutboundDate)); +// Optional min = distributionStockupVOList.stream().min(Comparator.comparing(DistributionStockupVO::getOutboundDate)); +// String s1 = distributionStockupVOList.stream().min(Comparator.comparing(DistributionStockupVO::getOutboundDate)).toString(); + Date outboundDate = distributionStockupVOList.stream().filter(o -> o.getOutboundDate() != null).max(Comparator.comparing(DistributionStockupVO::getOutboundDate)).get().getOutboundDate(); + //这里需要处理一下 + if (distributionStockupVOList.size()>1){ + HashSet forkliftName = new HashSet<>(); + HashSet loaderName = new HashSet<>(); + HashSet stockUser = new HashSet<>(); + HashSet goodsArea = new HashSet<>(); + distributionStockupVOList.forEach(s->{ + if (Func.isNotEmpty(s.getForkliftName())){ + forkliftName.add(s.getForkliftName()); + } + if (Func.isNotEmpty(s.getLoaderName())){ + loaderName.add(s.getLoaderName()); + } + if (Func.isNotEmpty(s.getStockupUser())){ + stockUser.add(s.getStockupUser()); + } + if (Func.isNotEmpty(s.getStockupArea())){ + goodsArea.add(s.getStockupArea()); + } + }); + DistributionStockupVO distributionStockupVO = new DistributionStockupVO(); + distributionStockupVO.setForkliftName(String.join(",",forkliftName)); + distributionStockupVO.setStockupArea(String.join(",",goodsArea)); + distributionStockupVO.setStockupUser(String.join(",",stockUser)); + distributionStockupVO.setLoaderName(String.join(",",loaderName)); + distributionStockupVO.setOutboundDate(outboundDate); + distributionStockupVO.setTeamResponsibility(distributionStockupVOList.get(0).getTeamResponsibility()); + distributionDeliveryListVO.setStockupInfo(distributionStockupVO); + + }else { + distributionDeliveryListVO.setStockupInfo(distributionStockupVOList.get(0)); + } + }else { + DistributionStockupVO deliveryStockupInfo = distributionStockupMapper.getDeliveryStockupInfo(detail.getId()); + distributionDeliveryListVO.setStockupInfo(deliveryStockupInfo); + + } + // } else if (detail.getSource() == 2) { // //查询订单信息 // List customList = distributionDeliveryInfoMapper.selectcustomListByOrderId(detail.getOrderId());