java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

预约表格查询调整

training
kilo 2 years ago
parent
0eb2fb1457
commit
b04dba12b0
4 changed files with 122 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
  2. 7
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java
  3. 47
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
  4. 47
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

28
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java
Unescape View File

@ -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<DistributionStockArticleEntity> queryWrapper = Condition.getQueryWrapper(distributionStockArticle, DistributionStockArticleEntity.class);
LambdaQueryWrapper<DistributionStockArticleEntity> lambda = Wrappers.<DistributionStockArticleEntity>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<DistributionStockArticleEntity> pages = distributionStockArticleService.page(Condition.getPage(query), queryWrapper);
IPage<DistributionStockArticleVO> distributionStockArticleVOIPage = distributionStockArticleService.handlePackage(DistributionStockArticleWrapper.build().pageVO(pages));
return R.data(distributionStockArticleVOIPage);
}

7
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java
Unescape View File

@ -153,4 +153,11 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
* @return
*/
Integer selectPackageExistSelf(@Param("param")StockupDTO stockupDTO);
/**
*
* @param id
* @return
*/
List<DistributionStockupVO> getMarketDeliveryStockupInfo(@Param("deliveryListId")Long id);
}

47
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
Unescape View File

@ -586,5 +586,52 @@
ldsi.stockup_id = #{ id } and ldsi.stock_up_type = 3 AND ldsi.is_deleted = 0
</where>
</select>
<select id="getMarketDeliveryStockupInfo" resultType="com.logpm.distribution.vo.DistributionStockupVO">
SELECT
ldsu.id,
ldsu.tenant_id,
ldsu.create_user,
ldsu.create_time,
ldsu.update_user,
ldsu.update_time,
ldsu.status,
ldsu.is_deleted,
ldsu.create_dept,
ldsu.reserve1,
ldsu.reserve2,
ldsu.reserve3,
ldsu.reserve4,
ldsu.reserve5,
ldsu.stockup_date,
ldsu.stockup_user,
ldsu.stockup_status,
ldsu.stockup_area,
ldsu.assign_status,
ldsu.stockip_allocation,
ldsu.goods_area_id,
ldsu.forklift_id,
ldsu.loader_id,
ldsu.team_responsibility,
ldsu.fix_time,
ldsu.assign_time,
ldsu.type_service,
ldsu.stockup_user_id,
ldsu.forklift_name,
ldsu.loader_name,
ldsu.stockup_code,
ldsu.remarks,
ldsu.annulment,
ldsu.outbound_date
FROM
logpm_distribution_delivery_list AS lddl
INNER JOIN logpm_distribution_signfor AS lds ON lddl.id = lds.delivery_id
INNER JOIN logpm_distribution_stockup_info AS ldsi ON lds.reservation_id = ldsi.reservation_id
INNER JOIN logpm_distribution_stockup AS ldsu ON ldsu.id = ldsi.stockup_id
<where>
<if test="deliveryListId !=null and deliveryListId!=''">
and lddl.id = #{deliveryListId}
</if>
</where>
</select>
</mapper>

47
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
Unescape View File

@ -210,8 +210,51 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
distributionDeliveryListVO.setReservationList(customList);
//查询备货信息
DistributionStockupVO deliveryStockupInfo = distributionStockupMapper.getDeliveryStockupInfo(detail.getId());
distributionDeliveryListVO.setStockupInfo(deliveryStockupInfo);
// DistributionStockupVO deliveryStockupInfo = distributionStockupMapper.getDeliveryStockupInfo(detail.getId());
if (Func.equals(distributionDeliveryListVO.getType(),DistributionTypeConstant.shipie.getValue())){
List<DistributionStockupVO> distributionStockupVOList = distributionStockupMapper.getMarketDeliveryStockupInfo(detail.getId());
// Optional<DistributionStockupVO> max = distributionStockupVOList.stream().max(Comparator.comparing(DistributionStockupVO::getOutboundDate));
// Optional<DistributionStockupVO> 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<String> forkliftName = new HashSet<>();
HashSet<String> loaderName = new HashSet<>();
HashSet<String> stockUser = new HashSet<>();
HashSet<String> 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<DistributionDeliveryInfoVO> customList = distributionDeliveryInfoMapper.selectcustomListByOrderId(detail.getOrderId());

Write Preview
Loading…
Cancel
Save