zhenghaoyu
3 months ago
20 changed files with 701 additions and 6 deletions
@ -0,0 +1,12 @@
|
||||
local key = KEYS[1] |
||||
local value = ARGV[1] |
||||
local expireTime = ARGV[2] |
||||
|
||||
local exists = redis.call("EXISTS", key) |
||||
|
||||
if exists == 1 then |
||||
return 1 |
||||
end |
||||
|
||||
redis.call("SETEX", key, expireTime, value) |
||||
return 0 |
||||
@ -1,9 +1,16 @@
|
||||
package com.logpm.warehouse.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.logpm.warehouse.entity.WarehouseWayBillDetail; |
||||
import com.logpm.warehouse.entity.WarehouseWayBillDetailAbolish; |
||||
import org.apache.ibatis.annotations.Mapper; |
||||
import org.apache.ibatis.annotations.Param; |
||||
|
||||
import java.util.List; |
||||
|
||||
@Mapper |
||||
public interface WarehouseWayBillDetailAbolishMapper extends BaseMapper<WarehouseWayBillDetailAbolish> { |
||||
|
||||
List<WarehouseWayBillDetail> findByWaybillIds(@Param("ids") List<Long> ids); |
||||
|
||||
} |
||||
|
||||
@ -1,9 +1,15 @@
|
||||
package com.logpm.warehouse.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.logpm.warehouse.dto.WarehouseWaybillDTO; |
||||
import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity; |
||||
import com.logpm.warehouse.vo.WarehouseWaybillVO; |
||||
import org.apache.ibatis.annotations.Mapper; |
||||
import org.apache.ibatis.annotations.Param; |
||||
|
||||
@Mapper |
||||
public interface WarehouseWaybillAbolishMapper extends BaseMapper<WarehouseWaybillAbolishEntity> { |
||||
|
||||
IPage<WarehouseWaybillVO> pageAbolishWaybillList(IPage<Object> page, @Param("param") WarehouseWaybillDTO waybillDTO); |
||||
} |
||||
|
||||
@ -0,0 +1,226 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="com.logpm.warehouse.mapper.WarehouseWaybillAbolishMapper"> |
||||
|
||||
<select id="pageAbolishWaybillList" resultType="com.logpm.warehouse.vo.WarehouseWaybillVO"> |
||||
select lww.id id, |
||||
lww.brand brand, |
||||
lww.waybill_no waybillNo, |
||||
lww.order_no orderNo, |
||||
lww.consignee consignee, |
||||
lww.consignee_name consigneeName, |
||||
lww.consignee_mobile consigneeMobile, |
||||
lww.consignee_address consigneeAddress, |
||||
lww.shipper shipper, |
||||
lww.shipper_name shipperName, |
||||
lww.shipper_mobile shipperMobile, |
||||
lww.shipper_address shipperAddress, |
||||
lww.destination destination, |
||||
lww.complete_destination completeDestination, |
||||
lww.departure departure, |
||||
lww.complete_departure completeDeparture, |
||||
lww.departure_warehouse_name departureWarehouseName, |
||||
lww.destination_warehouse_name destinationWarehouseName, |
||||
lww.delivery_way deliveryWay, |
||||
lww.customer_train customerTrain, |
||||
IFNULL(lww.return_status,0) returnStatus, |
||||
lww.remark remark, |
||||
lww.pay_type payType, |
||||
lww.pay_way payWay, |
||||
lww.x_pay xPay, |
||||
lww.d_pay dPay, |
||||
lww.h_pay hPay, |
||||
lww.y_pay yPay, |
||||
lww.service_type serviceType, |
||||
lww.cancle_check_remark cancleCheckRemark, |
||||
lww.cancle_check_user_name cancleCheckUserName, |
||||
lww.cancle_check_time cancleCheckTime, |
||||
lww.waybill_status waybillStatus, |
||||
lww.agent agent, |
||||
lww.waybill_type waybillType, |
||||
lww.document_making_time documentMakingTime, |
||||
lww.create_time createTime, |
||||
lww.total_count totalCount, |
||||
lww.cost_piece costPiece, |
||||
lww.cost_zhang costZhang, |
||||
lww.cost_num costNum, |
||||
lww.total_freight totalFreight, |
||||
lww.delivery_fee deliveryFee, |
||||
lww.pickup_fee pickupFee, |
||||
lww.storage_fee storageFee, |
||||
lww.warehouse_management_fee warehouseManagementFee, |
||||
lww.sorting_fee sortingFee, |
||||
lww.handling_fee handlingFee, |
||||
lww.claiming_value claimingValue, |
||||
lww.rebate rebate, |
||||
lww.urgency urgency, |
||||
lww.receipt_num receiptNum, |
||||
lww.receipt receipt, |
||||
lww.transport_type transportType, |
||||
lww.third_operation_fee thirdOperationFee, |
||||
lww.pickup_complete_or_not pickupCompleteOrNot, |
||||
lww.trunkline_complete_or_not trunklineCompleteOrNot, |
||||
lww.freeze_status freezeStatus, |
||||
lww.freeze_user_name freezeUserName, |
||||
lww.freeze_time freezeTime, |
||||
lww.abolish_status abolishStatus, |
||||
lww.abolish_user_name abolishUserName, |
||||
lww.abolish_time abolishTime, |
||||
lww.sign_num signNum, |
||||
lww.sign_user_name signUserName, |
||||
lww.sign_time signTime, |
||||
lww.sign_check_user_name signCheckUserName, |
||||
lww.sign_check_time signCheckTime, |
||||
IFNULL(lww.check_status,0) checkStatus, |
||||
lww.check_reson checkReson, |
||||
lww.check_remark checkRemark, |
||||
lww.check_user_name checkUserName, |
||||
lww.check_time checkTime |
||||
from logpm_warehouse_waybill_abolish lww |
||||
where lww.is_deleted = 0 |
||||
and lww.abolish_status = 0 |
||||
<if test="param.warehouseIds != null and param.warehouseIds.size() > 0"> |
||||
and lww.departure_warehouse_id in |
||||
<foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")"> |
||||
#{item} |
||||
</foreach> |
||||
</if> |
||||
<if test="param.waybillNoList != null"> |
||||
and lww.waybill_no in |
||||
<foreach collection="param.waybillNoList" item="item" open="(" separator="," close=")"> |
||||
#{item} |
||||
</foreach> |
||||
</if> |
||||
<if test="param.waybillNo != null and param.waybillNo != ''"> |
||||
and Locate(#{param.waybillNo},lww.waybill_no) > 0 |
||||
</if> |
||||
<if test="param.orderNo != null and param.orderNo != ''"> |
||||
and Locate(#{param.orderNo},lww.order_no) > 0 |
||||
</if> |
||||
<if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''"> |
||||
and Locate(#{param.destinationWarehouseName},lww.destination_warehouse_name) > 0 |
||||
</if> |
||||
<if test="param.departureWarehouseName != null and param.departureWarehouseName != ''"> |
||||
and Locate(#{param.departureWarehouseName},lww.departure_warehouse_name) > 0 |
||||
</if> |
||||
<if test="param.customerTrain != null and param.customerTrain != ''"> |
||||
and Locate(#{param.customerTrain},lww.customer_train) > 0 |
||||
</if> |
||||
<if test="param.brand != null and param.brand != ''"> |
||||
and Locate(#{param.brand},lww.brand) > 0 |
||||
</if> |
||||
<if test="param.shipper != null and param.shipper != ''"> |
||||
and Locate(#{param.shipper},lww.shipper) > 0 |
||||
</if> |
||||
<if test="param.shipperName != null and param.shipperName != ''"> |
||||
and Locate(#{param.shipperName},lww.shipper_name) > 0 |
||||
</if> |
||||
<if test="param.shipperMobile != null and param.shipperMobile != ''"> |
||||
and Locate(#{param.shipperMobile},lww.shipper_mobile) > 0 |
||||
</if> |
||||
<if test="param.consignee != null and param.consignee != ''"> |
||||
and Locate(#{param.consignee},lww.consignee) > 0 |
||||
</if> |
||||
<if test="param.consigneeName != null and param.consigneeName != ''"> |
||||
and Locate(#{param.consigneeName},lww.consignee_name) > 0 |
||||
</if> |
||||
<if test="param.consigneeMobile != null and param.consigneeMobile != ''"> |
||||
and Locate(#{param.consigneeMobile},lww.consignee_mobile) > 0 |
||||
</if> |
||||
<if test="param.destination != null and param.destination != ''"> |
||||
and Locate(#{param.destination},lww.destination) > 0 |
||||
</if> |
||||
<if test="param.completeDestination != null and param.completeDestination != ''"> |
||||
and Locate(#{param.completeDestination},lww.complete_destination) > 0 |
||||
</if> |
||||
<if test="param.departure != null and param.departure != ''"> |
||||
and Locate(#{param.departure},lww.departure) > 0 |
||||
</if> |
||||
<if test="param.completeDeparture != null and param.completeDeparture != ''"> |
||||
and Locate(#{param.completeDeparture},lww.complete_departure) > 0 |
||||
</if> |
||||
<if test="param.payType != null"> |
||||
and lww.pay_type = #{param.payType} |
||||
</if> |
||||
<if test="param.payWay != null"> |
||||
and lww.pay_way = #{param.payWay} |
||||
</if> |
||||
<if test="param.deliveryWay != null"> |
||||
and lww.delivery_way = #{param.deliveryWay} |
||||
</if> |
||||
<if test="param.urgency != null"> |
||||
and lww.urgency = #{param.urgency} |
||||
</if> |
||||
<if test="param.transportType != null"> |
||||
and lww.transport_type = #{param.transportType} |
||||
</if> |
||||
<if test="param.transportType != null"> |
||||
and lww.transport_type = #{param.transportType} |
||||
</if> |
||||
<if test="param.waybillStatus != null"> |
||||
and lww.waybill_status = #{param.waybillStatus} |
||||
</if> |
||||
<if test="param.pickupCompleteOrNot != null"> |
||||
and lww.pickup_complete_or_not = #{param.pickupCompleteOrNot} |
||||
</if> |
||||
<if test="param.trunklineCompleteOrNot != null"> |
||||
and lww.trunkline_complete_or_not = #{param.trunklineCompleteOrNot} |
||||
</if> |
||||
<if test="param.documentMakingTimeStartDate != null"> |
||||
and lww.document_making_time >= #{param.documentMakingTimeStartDate} |
||||
</if> |
||||
<if test="param.documentMakingTimeEndDate != null"> |
||||
and lww.document_making_time <= #{param.documentMakingTimeEndDate} |
||||
</if> |
||||
<if test="param.createTimeStartDate != null"> |
||||
and lww.create_time >= #{param.createTimeStartDate} |
||||
</if> |
||||
<if test="param.createTimeEndDate != null"> |
||||
and lww.create_time <= #{param.createTimeEndDate} |
||||
</if> |
||||
<if test="param.agent != null and param.agent != ''"> |
||||
and Locate(#{param.agent},lww.agent) > 0 |
||||
</if> |
||||
<if test="param.goodsName != null and param.goodsName != ''"> |
||||
and Locate(#{param.goodsName},lww.goods_name) > 0 |
||||
</if> |
||||
<if test="param.freezeStatus != null"> |
||||
and lww.freeze_status = #{param.freezeStatus} |
||||
</if> |
||||
<if test="param.abolishStatus != null"> |
||||
and lww.abolish_status = #{param.abolishStatus} |
||||
</if> |
||||
<if test="param.remark != null and param.remark != ''"> |
||||
and Locate(#{param.remark},lww.remark) > 0 |
||||
</if> |
||||
<if test="param.consigneeAddress != null and param.consigneeAddress != ''"> |
||||
and Locate(#{param.consigneeAddress},lww.consignee_address) > 0 |
||||
</if> |
||||
<if test="param.totalCount != null"> |
||||
and lww.total_count = #{param.totalCount} |
||||
</if> |
||||
<if test="param.totalWeight != null"> |
||||
and lww.total_weight = #{param.totalWeight} |
||||
</if> |
||||
<if test="param.totalVolume != null"> |
||||
and lww.total_volume = #{param.totalVolume} |
||||
</if> |
||||
<if test="param.abolishTimeStartDate != null"> |
||||
and lww.abolish_time >= #{param.abolishTimeStartDate} |
||||
</if> |
||||
<if test="param.abolishTimeEndDate != null"> |
||||
and lww.abolish_time <= #{param.abolishTimeEndDate} |
||||
</if> |
||||
<if test="param.freezeTimeStartDate != null"> |
||||
and lww.freeze_time >= #{param.freezeTimeStartDate} |
||||
</if> |
||||
<if test="param.freezeTimeEndDate != null"> |
||||
and lww.freeze_time <= #{param.freezeTimeEndDate} |
||||
</if> |
||||
<if test="param.checkStatus != null"> |
||||
and IFNULL(lww.check_status,0) = #{param.checkStatus} |
||||
</if> |
||||
order by lww.create_time desc |
||||
</select> |
||||
|
||||
</mapper> |
||||
@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="com.logpm.warehouse.mapper.WarehouseWayBillDetailAbolishMapper"> |
||||
|
||||
<select id="findByWaybillIds" resultType="com.logpm.warehouse.entity.WarehouseWayBillDetail"> |
||||
select * |
||||
from logpm_warehouse_waybill_detail_abolish |
||||
where waybill_id in |
||||
<foreach collection="list" item="item" separator="," open="(" close=")"> |
||||
#{item} |
||||
</foreach> |
||||
and is_deleted = 0 |
||||
</select> |
||||
|
||||
</mapper> |
||||
@ -1,8 +1,12 @@
|
||||
package com.logpm.warehouse.service; |
||||
|
||||
import com.logpm.warehouse.entity.WarehouseWayBillDetail; |
||||
import com.logpm.warehouse.entity.WarehouseWayBillDetailAbolish; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
|
||||
import java.util.List; |
||||
|
||||
public interface IWarehouseWayBillDetailAbolishService extends BaseService<WarehouseWayBillDetailAbolish> { |
||||
|
||||
List<WarehouseWayBillDetail> findByWaybillIds(List<Long> ids); |
||||
} |
||||
|
||||
@ -1,7 +1,13 @@
|
||||
package com.logpm.warehouse.service; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.logpm.warehouse.dto.WarehouseWaybillDTO; |
||||
import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity; |
||||
import com.logpm.warehouse.vo.WarehouseWaybillVO; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
|
||||
public interface IWarehouseWaybillAbolishService extends BaseService<WarehouseWaybillAbolishEntity> { |
||||
|
||||
IPage<WarehouseWaybillVO> pageAbolishWaybillList(WarehouseWaybillDTO waybillDTO); |
||||
|
||||
} |
||||
|
||||
@ -1,15 +1,85 @@
|
||||
package com.logpm.warehouse.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
||||
import com.logpm.warehouse.dto.WarehouseWaybillDTO; |
||||
import com.logpm.warehouse.entity.WarehouseWayBillDetail; |
||||
import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity; |
||||
import com.logpm.warehouse.mapper.WarehouseWaybillAbolishMapper; |
||||
import com.logpm.warehouse.service.IWarehouseWayBillDetailAbolishService; |
||||
import com.logpm.warehouse.service.IWarehouseWaybillAbolishService; |
||||
import com.logpm.warehouse.vo.WarehouseWaybillVO; |
||||
import lombok.AllArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springblade.common.utils.CommonUtil; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springblade.core.tool.utils.StringUtil; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.math.BigDecimal; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
import java.util.Objects; |
||||
import java.util.stream.Collectors; |
||||
|
||||
@Service |
||||
@AllArgsConstructor |
||||
@Slf4j |
||||
public class WarehouseWaybillAbolishServiceImpl extends BaseServiceImpl<WarehouseWaybillAbolishMapper, WarehouseWaybillAbolishEntity> implements IWarehouseWaybillAbolishService { |
||||
|
||||
private final IWarehouseWayBillDetailAbolishService warehouseWayBillDetailAbolishService; |
||||
|
||||
@Override |
||||
public IPage<WarehouseWaybillVO> pageAbolishWaybillList(WarehouseWaybillDTO waybillDTO) { |
||||
|
||||
IPage<Object> page = new Page<>(); |
||||
page.setCurrent(waybillDTO.getPageNum()); |
||||
page.setSize(waybillDTO.getPageSize()); |
||||
|
||||
waybillDTO.setDocumentMakingTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getDocumentMakingTimeStartStr())); |
||||
waybillDTO.setDocumentMakingTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getDocumentMakingTimeEndStr())); |
||||
waybillDTO.setCreateTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getCreateTimeStartStr())); |
||||
waybillDTO.setCreateTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getCreateTimeEndStr())); |
||||
waybillDTO.setAbolishTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getAbolishTimeStartStr())); |
||||
waybillDTO.setAbolishTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getAbolishTimeEndStr())); |
||||
waybillDTO.setFreezeTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getFreezeTimeStartStr())); |
||||
waybillDTO.setFreezeTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getFreezeTimeEndStr())); |
||||
|
||||
IPage<WarehouseWaybillVO> pageList = baseMapper.pageAbolishWaybillList(page, waybillDTO); |
||||
|
||||
|
||||
List<WarehouseWaybillVO> records = pageList.getRecords(); |
||||
|
||||
if (!records.isEmpty()) { |
||||
//把records中的id取出作为一个集合
|
||||
List<Long> ids = records.stream().map(WarehouseWaybillVO::getId).collect(Collectors.toList()); |
||||
List<WarehouseWayBillDetail> wayBillDetailList = warehouseWayBillDetailAbolishService.findByWaybillIds(ids); |
||||
//把wayBillDetailList通过waibillId分组
|
||||
Map<Long, List<WarehouseWayBillDetail>> map = wayBillDetailList.stream().collect(Collectors.groupingBy(WarehouseWayBillDetail::getWaybillId)); |
||||
for (WarehouseWaybillVO record : records) { |
||||
Long waybillId = record.getId(); |
||||
if (!Objects.isNull(map.get(waybillId))){ |
||||
List<WarehouseWayBillDetail> warehouseWayBillDetails = map.get(waybillId); |
||||
// 将集合 warehouseWayBillDetails 中的productName 按照， 进行拼接
|
||||
String productNames = warehouseWayBillDetails.stream().filter(s -> StringUtil.isNotBlank(s.getProductName())).map(WarehouseWayBillDetail::getProductName).collect(Collectors.joining(",")); |
||||
record.setGoodsName(productNames); |
||||
String productNum = warehouseWayBillDetails.stream().filter(s -> !Objects.isNull(s.getNum())).map(s -> s.getNum().toString()).collect(Collectors.joining(",")); |
||||
record.setProductNum(productNum); |
||||
String productPrice = warehouseWayBillDetails.stream().filter(s -> !Objects.isNull(s.getPrice())).map(s -> s.getPrice().toString()).collect(Collectors.joining(",")); |
||||
record.setProductPrice(productPrice); |
||||
// 对集合中的weight 进行求和
|
||||
BigDecimal sumWeight = warehouseWayBillDetails.stream().filter(s -> !Objects.isNull(s.getWeight())).map(WarehouseWayBillDetail::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add); |
||||
record.setTotalWeight(sumWeight); |
||||
BigDecimal productVolume = warehouseWayBillDetails.stream().filter(s -> !Objects.isNull(s.getVolume())).map(WarehouseWayBillDetail::getVolume).reduce(BigDecimal.ZERO, BigDecimal::add); |
||||
record.setTotalVolume(productVolume); |
||||
record.setDetailList(warehouseWayBillDetails); |
||||
} |
||||
|
||||
} |
||||
pageList.setRecords(records); |
||||
} |
||||
|
||||
return pageList; |
||||
|
||||
} |
||||
} |
||||
|
||||
Loading…
Reference in new issue