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

Merge branch 'dev' into pre-production

visual
zhaoqiaobo 6 months ago
parent
7b9e53f3e6 ff5a00f44a
commit
57a47f57aa
16 changed files with 165 additions and 73 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. 2
      blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IOrderInfoClient.java
  2. 12
      blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java
  3. 12
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java
  4. 13
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java
  5. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
  6. 15
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCancleCheckListener.java
  7. 50
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml
  8. 26
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
  9. 2
      blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java
  10. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java
  11. 2
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
  12. 5
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
  13. 47
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
  14. 6
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWaybillDTO.java
  15. 33
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml
  16. 9
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

2
blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IOrderInfoClient.java
Unescape View File

@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
@FeignClient(
value = ModuleNameConstant.APPLICATION_BASICDATA_NAME
value = ModuleNameConstant.APPLICATION_STATISTICSDATA_NAME
)
public interface IOrderInfoClient {

12
blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java
Unescape View File

@ -142,4 +142,16 @@ public class TrunklineCarsLoadScanEntity extends TenantEntity {
@ApiModelProperty(name = "卸车托盘编码",notes = "")
private String unloadTrayCode;
/** 顾客名字 */
@ApiModelProperty(name = "顾客名字",notes = "")
private String customerName;
/** 顾客电话 */
@ApiModelProperty(name = "顾客电话",notes = "")
private String customerTelephone;
/** 顾客地址 */
@ApiModelProperty(name = "顾客地址",notes = "")
private String customerAddress;
}

12
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java
Unescape View File

@ -187,17 +187,17 @@ public class FinanceWaybillExportVO implements Serializable {
@ExcelProperty(value = "回扣")
private BigDecimal rebate;
@ExcelProperty(value = "品类数量")
private BigDecimal goodsTypeNum;
private String goodsTypeNum;
@ExcelProperty(value = "品类开单运费")
private BigDecimal goodsTypePrice;
private String goodsTypePrice;
@ExcelProperty(value = "品类系统配送单价")
private BigDecimal goodsTypeDeliveryPrice;
private String goodsTypeDeliveryPrice;
@ExcelProperty(value = "品类系统提货单价")
private BigDecimal goodsTypePickupPrice;
private String goodsTypePickupPrice;
@ExcelProperty(value = "品类系统运费单价")
private BigDecimal goodsTypeFreightPrice;
private String goodsTypeFreightPrice;
@ExcelProperty(value = "品类数")
private BigDecimal goodsTypeCount;
private Integer goodsTypeCount;

13
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java
Unescape View File

@ -47,6 +47,7 @@ public class FinanceWaybillVO implements Serializable {
private String cancleCheckUserName;
private Date cancleCheckTime;
private String waybillStatus;
private String waybillType;
private Date openTime;
private String goodsName;
private Integer totalCount;
@ -75,12 +76,12 @@ public class FinanceWaybillVO implements Serializable {
private BigDecimal claimingValue;
private BigDecimal thirdOperationFee;
private BigDecimal rebate;
private BigDecimal goodsTypeNum;
private BigDecimal goodsTypePrice;
private BigDecimal goodsTypeDeliveryPrice;
private BigDecimal goodsTypePickupPrice;
private BigDecimal goodsTypeFreightPrice;
private BigDecimal goodsTypeCount;
private String goodsTypeNum;
private String goodsTypePrice;
private String goodsTypeDeliveryPrice;
private String goodsTypePickupPrice;
private String goodsTypeFreightPrice;
private Integer goodsTypeCount;

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

@ -96,7 +96,7 @@
</select>
<select id="selectOrderSigningNumByReservationIdAndDeliveryIdAndOrderId" resultType="java.lang.Integer">
SELECT IF(sum( received_quantity) is null ,0,sum( received_quantity) ) AS signingNumber FROM logpm_distribution_loadscan WHERE is_deleted = 0 AND reservation_id = #{reservationId} AND delivery_id = #{deliveryId} AND order_id = #{orderId} AND scan_status != 1
SELECT IFNULL(sum(received_quantity),0) AS signingNumber FROM logpm_distribution_loadscan WHERE is_deleted = 0 AND reservation_id = #{reservationId} AND delivery_id = #{deliveryId} AND order_id = #{orderId} AND scan_status != 1
</select>
<select id="selectPackageSigningTime" resultType="java.lang.String">
SELECT signing_time FROM logpm_distribution_loadscan WHERE package_id = #{packageId} AND signfor_state = 2 AND scan_state != 1

15
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCancleCheckListener.java
Unescape View File

@ -1,5 +1,6 @@
package com.logpm.statistics.listener.mq;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.logpm.statistics.entity.StatisticsOrderInfoEntity;
@ -46,12 +47,14 @@ public class WaybillCancleCheckListener {
//把orderInfoEntityList中所有元素的id放入一个集合
List<Long> orderInfoIdsList = orderInfoEntityList.stream().map(StatisticsOrderInfoEntity::getId).collect(Collectors.toList());
//删除订单
statisticsOrderInfoService.deleteListByOrderInfoIds(orderInfoIdsList);
//删除包件
trunklinePackageService.deleteListByOrderInfoIds(orderInfoIdsList);
warehousePackageService.deleteListByOrderInfoIds(orderInfoIdsList);
distributionPackageService.deleteListByOrderInfoIds(orderInfoIdsList);
if(CollUtil.isNotEmpty(orderInfoIdsList)){
//删除订单
statisticsOrderInfoService.deleteListByOrderInfoIds(orderInfoIdsList);
//删除包件
trunklinePackageService.deleteListByOrderInfoIds(orderInfoIdsList);
warehousePackageService.deleteListByOrderInfoIds(orderInfoIdsList);
distributionPackageService.deleteListByOrderInfoIds(orderInfoIdsList);
}
log.info("#########cancleCheckWaybillIncomingData: 运单取消审核处理收入结算数据 结束 waybillId={}",waybillId);
}

50
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml
Unescape View File

@ -64,8 +64,8 @@
<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_code) > 0
<if test="param.orderCode != null and param.orderCode != '' ">
and Locate(#{param.orderCode},lww.order_code) > 0
</if>
<if test="param.shipper != null and param.shipper != '' ">
and Locate(#{param.shipper},lww.shipper) > 0
@ -194,8 +194,8 @@
<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_code) > 0
<if test="param.orderCode != null and param.orderCode != '' ">
and Locate(#{param.orderCode},lww.order_code) > 0
</if>
<if test="param.shipper != null and param.shipper != '' ">
and Locate(#{param.shipper},lww.shipper) > 0
@ -405,24 +405,24 @@
IFNULL(sum(lstp.num),0) totalNum,
IFNULL(sum(lstp.weight),0) totalWeight,
IFNULL(sum(lstp.volume),0) totalVolume,
IFNULL(sum(lstp.system_freight_price*lstp.num),0) systemFreightPrice,
IFNULL(sum(lstp.freight_price*lstp.num),0) freightPrice,
IFNULL(sum(lstp.system_pickup_price*lstp.num),0) systemPickupPrice,
IFNULL(sum(lstp.pickup_price*lstp.num),0) pickupPrice,
IFNULL(sum(lswp.warehuse_service_fee*lstp.num),0) warehouseServiceFee,
IFNULL(sum(lswp.warehouse_fee*lstp.num),0) warehouseFee,
IFNULL(sum(lswp.warehouse_manage_fee*lstp.num),0) warehouseManageFee,
IFNULL(sum(lswp.warehouse_sorting_fee*lstp.num),0) warehouseSortingFee,
IFNULL(sum(lswp.warehouse_operating_fee*lstp.num),0) warehouseOperatingFee,
IFNULL(sum(lsdp.system_delivery_fee*lstp.num),0) systemDeliveryFee,
IFNULL(sum(lsdp.delivery_service_fee*lstp.num),0) deliveryServiceFee,
IFNULL(sum(lsdp.delivery_fee*lstp.num),0) deliveryFee,
IFNULL(sum(lsdp.delivery_loading_fee*lstp.num),0) deliveryLoadingFee,
IFNULL(sum(lsdp.delivery_sorting_fee*lstp.num),0) deliverySortingFee,
IFNULL(sum(lsdp.delivery_upfloor_fee*lstp.num),0) deliveryUpfloorFee,
IFNULL(sum(lsdp.delivery_move_fee*lstp.num),0) deliveryMoveFee,
IFNULL(sum(lsdp.delivery_other_fee*lstp.num),0) deliveryOtherFee,
IFNULL(sum(lsdp.delivery_crossing_fee*lstp.num),0) deliveryCrossingFee
IFNULL(sum(lstp.system_freight_price),0) systemFreightPrice,
IFNULL(sum(lstp.freight_price),0) freightPrice,
IFNULL(sum(lstp.system_pickup_price),0) systemPickupPrice,
IFNULL(sum(lstp.pickup_price),0) pickupPrice,
IFNULL(sum(lswp.warehouse_service_fee),0) warehouseServiceFee,
IFNULL(sum(lswp.warehouse_fee),0) warehouseFee,
IFNULL(sum(lswp.warehouse_manage_fee),0) warehouseManageFee,
IFNULL(sum(lswp.warehouse_sorting_fee),0) warehouseSortingFee,
IFNULL(sum(lswp.warehouse_operating_fee),0) warehouseOperatingFee,
IFNULL(sum(lsdp.system_delivery_fee),0) systemDeliveryFee,
IFNULL(sum(lsdp.delivery_service_fee),0) deliveryServiceFee,
IFNULL(sum(lsdp.delivery_fee),0) deliveryFee,
IFNULL(sum(lsdp.delivery_loading_fee),0) deliveryLoadingFee,
IFNULL(sum(lsdp.delivery_sorting_fee),0) deliverySortingFee,
IFNULL(sum(lsdp.delivery_upfloor_fee),0) deliveryUpfloorFee,
IFNULL(sum(lsdp.delivery_move_fee),0) deliveryMoveFee,
IFNULL(sum(lsdp.delivery_other_fee),0) deliveryOtherFee,
IFNULL(sum(lsdp.delivery_crossing_fee),0) deliveryCrossingFee
from logpm_statistics_trunkline_package lstp
left join logpm_statistics_warehouse_package lswp on lswp.order_info_id = lstp.order_info_id and lswp.order_package_code = lstp.order_package_code and lswp.product_id = lstp.product_id
left join logpm_statistics_distribution_package lsdp on lsdp.order_info_id = lswp.order_info_id and lsdp.order_package_code = lswp.order_package_code and lswp.product_id = lsdp.product_id
@ -438,11 +438,13 @@
IFNULL(sum(lstp.num),0) totalNum,
IFNULL(sum(lstp.weight),0) totalWeight,
IFNULL(sum(lstp.volume),0) totalVolume,
IFNULL(sum(lstp.system_freight_price),0)+IFNULL(sum(lstp.system_pickup_price),0)+IFNULL(sum(lswp.warehouse_service_fee),0)+IFNULL(sum(lsdp.delivery_service_fee),0) sysTotalFee,
IFNULL(sum(lstp.freight_price),0)+IFNULL(sum(lstp.pickup_price),0)+IFNULL(sum(lswp.warehouse_service_fee),0)+IFNULL(sum(lsdp.delivery_service_fee),0) totalFee,
IFNULL(sum(lstp.system_freight_price),0) systemFreightPrice,
IFNULL(sum(lstp.freight_price),0) freightPrice,
IFNULL(sum(lstp.system_pickup_price),0) systemPickupPrice,
IFNULL(sum(lstp.pickup_price),0) pickupPrice,
IFNULL(sum(lswp.warehuse_service_fee),0) warehouseServiceFee,
IFNULL(sum(lswp.warehouse_service_fee),0) warehouseServiceFee,
IFNULL(sum(lswp.warehouse_fee),0) warehouseFee,
IFNULL(sum(lswp.warehouse_manage_fee),0) warehouseManageFee,
IFNULL(sum(lswp.warehouse_sorting_fee),0) warehouseSortingFee,
@ -479,7 +481,7 @@
</select>
<select id="findCreateRencilitionOrderStatus" resultType="int">
select max(lsoi.create_reconciliation_order_status)
select IFNULL(max(lsoi.create_reconciliation_order_status),0)
from logpm_statistics_order_info lsoi
where 1=1
and lsoi.waybill_id = #{waybillId}

26
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
Unescape View File

@ -82,17 +82,18 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
List<StatisticsOrderInfoVO> records = statisticsOrderInfoVOIPage.getRecords();
//把records中所有的orderInfoId放入一个集合
List<Long> orderInfoIdList = records.stream().map(StatisticsOrderInfoVO::getOrderInfoId).collect(Collectors.toList());
List<StatisticsPackageFeeInfoVO> orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupById(orderInfoIdList);
//把orderPackageInfoList转化成以orderInfoId为key的Map
Map<Long, StatisticsPackageFeeInfoVO> orderPackageInfoMap = orderPackageInfoList.stream()
.collect(Collectors.toMap(StatisticsPackageFeeInfoVO::getOrderInfoId, statisticsPackageFeeInfoVO -> statisticsPackageFeeInfoVO));
records.forEach(statisticsOrderInfoVO -> {
Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId();
StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(orderInfoId);
BeanUtil.copy(statisticsPackageFeeInfoVO, statisticsOrderInfoVO);
});
if(CollUtil.isNotEmpty(orderInfoIdList)){
List<StatisticsPackageFeeInfoVO> orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupById(orderInfoIdList);
//把orderPackageInfoList转化成以orderInfoId为key的Map
Map<Long, StatisticsPackageFeeInfoVO> orderPackageInfoMap = orderPackageInfoList.stream()
.collect(Collectors.toMap(StatisticsPackageFeeInfoVO::getOrderInfoId, statisticsPackageFeeInfoVO -> statisticsPackageFeeInfoVO));
records.forEach(statisticsOrderInfoVO -> {
Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId();
StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(orderInfoId);
BeanUtil.copy(statisticsPackageFeeInfoVO, statisticsOrderInfoVO);
});
}
statisticsOrderInfoVOIPage.setRecords(records);
return statisticsOrderInfoVOIPage;
@ -624,8 +625,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
});
return Collections.emptyList();
return records;
}
private void calculateReconcilitionOrder(StatisticsReconciliationOrderInfoEntity reconciliationOrderInfo) {

2
blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java
Unescape View File

@ -17,6 +17,8 @@ public class StatisticsPackageFeeInfoVO implements Serializable {
private BigDecimal totalWeight;
private BigDecimal totalVolume;
private BigDecimal sysTotalFee;
private BigDecimal totalFee;
private BigDecimal systemFreightPrice;
private BigDecimal freightPrice;

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java
Unescape View File

@ -1436,7 +1436,7 @@ public class OpenOrderController {
@ResponseBody
@PostMapping("/cancleCheckWaybill")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "审核运单", notes = "传入openOrderDTO")
@ApiOperation(value = "取消审核运单", notes = "传入openOrderDTO")
public R cancleCheckWaybill(@RequestBody OpenOrderDTO openOrderDTO) {
String method = "############cancleCheckWaybill: ";
log.info(method + "请求参数{}", openOrderDTO);

2
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml
Unescape View File

@ -499,7 +499,7 @@
<select id="findTransferLoadScanWaybillList" resultType="com.logpm.trunkline.vo.LoadScanWaybillVO">
select waybill_no waybillNo,
sum(unload_num) num
sum(num) num
from logpm_trunkline_cars_load_scan
where load_id = #{loadId}
and warehouse_id = #{nodeId}

5
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
Unescape View File

@ -2842,8 +2842,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
return R.fail(405,"运单已作废");
}
Long checkUserId = warehouseWaybillEntity.getCheckUserId();
if(!Objects.isNull(checkUserId)){
Integer checkStatus = warehouseWaybillEntity.getCheckStatus();
if(checkStatus.equals(1)){
log.warn("##############checkWaybill: 运单已经审核 waybillId={}",waybillId);
return R.fail(405, "运单已经审核");
}
@ -3683,7 +3683,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
return R.fail(405,"运单已有预存单确认");
}
WarehouseWaybillEntity updateWaybillEntity = new WarehouseWaybillEntity();
updateWaybillEntity.setId(waybillId);
updateWaybillEntity.setCheckStatus(0);

47
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
Unescape View File

@ -2909,6 +2909,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
distributionParcelListClient.updateOrderPackageCodeById(otherPackageId, "60");
distributionStockArticleClient.submitHandleNumByOrderId(1, articleId);
carsLoadScanEntity.setCustomerName(stockArticleEntity.getCustomerName());
carsLoadScanEntity.setCustomerTelephone(stockArticleEntity.getCustomerTelephone());
carsLoadScanEntity.setCustomerAddress(stockArticleEntity.getCustomerAddress());
remark = "有数据,不在当前仓,异常装车";
audio = "包件未入库";
if(StringUtils.isNotBlank(orderPackageCode)){
@ -3003,8 +3007,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
if (StringUtil.isBlank(trayCode) && StringUtil.isBlank(orderPackageCode)) {
updownTypeClient.downPackageOrDelTray(orderPackageCode, warehouseId, "干线装车下架解托");
}
carsLoadScanEntity.setCustomerName(stockArticleEntity.getCustomerName());
carsLoadScanEntity.setCustomerTelephone(stockArticleEntity.getCustomerTelephone());
carsLoadScanEntity.setCustomerAddress(stockArticleEntity.getCustomerAddress());
}
carsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
trunklineCarsLoadScanService.save(carsLoadScanEntity);
loadScanId = carsLoadScanEntity.getId();
@ -3230,6 +3239,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadScanEntity.setFinalNodeId(finalNodeId);
carsLoadScanEntity.setFinalNodeName(finalNodeName);
carsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
carsLoadScanEntity.setCustomerName(stockArticleEntity.getCustomerName());
carsLoadScanEntity.setCustomerTelephone(stockArticleEntity.getCustomerTelephone());
carsLoadScanEntity.setCustomerAddress(stockArticleEntity.getCustomerAddress());
trunklineCarsLoadScanService.save(carsLoadScanEntity);
loadScanId = carsLoadScanEntity.getId();
List<TrunklineScanZeroDetailEntity> zeroDetailList = new ArrayList<>();
@ -6308,10 +6320,18 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
finalNodeName = finalNodeWarehouse.getName();
}
List<DistributionParcelListEntity> entityListByOrderCode = distributionParcelListClient.findEntityListByOrderCodeAndStatus(orderCode, warehouseId, "20", waybillNo);
//把entityListByOrderCode中所有stockArticleId放入一个Set集合
Set<Long> stockArticleIdSet = entityListByOrderCode.stream().map(DistributionParcelListEntity::getStockArticleId).collect(Collectors.toSet());
List<DistributionStockArticleEntity> stockArticleEntityList = distributionStockArticleClient.findListByIds(stockArticleIdSet);
//把stockArticleEntityList中所有元素转化成以id为key的Map
Map<Long, DistributionStockArticleEntity> stockArticleMap = stockArticleEntityList.stream().collect(Collectors.toMap(DistributionStockArticleEntity::getId, e1 -> e1));
int size = entityListByOrderCode.size();
if (planNum.equals(size + realNum)) {
for (DistributionParcelListEntity parcelListEntity : entityListByOrderCode) {
String orderPackageCode = parcelListEntity.getOrderPackageCode();
Long stockArticleId = parcelListEntity.getStockArticleId();
DistributionStockArticleEntity stockArticle = stockArticleMap.get(stockArticleId);
TrunklineCarsLoadScanEntity carsLoadScanEntity = new TrunklineCarsLoadScanEntity();
carsLoadScanEntity.setLoadId(loadId);
carsLoadScanEntity.setWarehouseId(warehouseId);
@ -6334,6 +6354,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
carsLoadScanEntity.setUnloadCheck(0);
carsLoadScanEntity.setIsSupple(0);
carsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
if(!Objects.isNull(stockArticle)){
carsLoadScanEntity.setCustomerName(stockArticle.getCustomerName());
carsLoadScanEntity.setCustomerTelephone(stockArticle.getCustomerTelephone());
carsLoadScanEntity.setCustomerAddress(stockArticle.getCustomerAddress());
}
addCarsLoadScanList.add(carsLoadScanEntity);
Date date = new Date();
@ -7424,6 +7449,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
.collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getLoadId));
Set<Long> loadIdSet = groupedByLoadId.keySet();
List<TrunklineCarsLoadEntity> trunklineCarsLoadEntities = baseMapper.selectBatchIds(loadIdSet);
//把trunklineCarsLoadEntities转化成以id为key的Map
Map<Long, TrunklineCarsLoadEntity> map = trunklineCarsLoadEntities.stream().collect(Collectors.toMap(TrunklineCarsLoadEntity::getId, Function.identity()));
List<DistributionParcelListEntity> updateParceListList = new ArrayList<>();
List<DistributionStockArticleEntity> updateStockArticleList = new ArrayList<>();
@ -7454,6 +7483,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
DistributionStockArticleEntity distributionStockArticle = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode, fromWarehouseId);
List<TrunklineCarsLoadScanEntity> loadScanEntityList2 = groupedByOrderCode.get(orderCode);
if(CollUtil.isNotEmpty(loadScanEntityList2)){
TrunklineCarsLoadScanEntity carsLoadScanEntity = loadScanEntityList2.get(0);
Long loadId1 = carsLoadScanEntity.getLoadId();
//把loadScanEntityList2的num进行累加
Integer num = loadScanEntityList2.stream().map(TrunklineCarsLoadScanEntity::getNum).reduce(0, Integer::sum);
//把loadScanEntityList2中所有元素的scanCode放入一个List
@ -7483,9 +7516,17 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
updateStockArticle.setHandQuantity(distributionStockArticle.getHandQuantity()+num);
updateStockArticleList.add(updateStockArticle);
String content = "包件在 " + warehouseName + "取消装车,配载计划目的仓 " + fromWarehouseEntityName;
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), scanCodeList, warehouseId, warehouseName, WorkNodeEnums.CANCEL_INITIAL_WAREHOUSE_LOADING.getCode(), content);
TrunklineCarsLoadEntity carsLoadEntity = map.get(loadId1);
if(!Objects.isNull(carsLoadEntity)){
String loadType = carsLoadEntity.getLoadType();
if(!StringUtils.equals(loadType, "4")){
String content = "包件在 " + warehouseName + "取消装车,配载计划目的仓 " + fromWarehouseEntityName;
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), scanCodeList, warehouseId, warehouseName, WorkNodeEnums.CANCEL_INITIAL_WAREHOUSE_LOADING.getCode(), content);
}
}else{
String content = "包件在 " + warehouseName + "取消装车,配载计划目的仓 " + fromWarehouseEntityName;
packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), scanCodeList, warehouseId, warehouseName, WorkNodeEnums.CANCEL_INITIAL_WAREHOUSE_LOADING.getCode(), content);
}
}
});

6
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWaybillDTO.java
Unescape View File

@ -67,4 +67,10 @@ public class WarehouseWaybillDTO extends WarehouseWaybillEntity {
private Date freezeTimeStartDate;
private Date freezeTimeEndDate;
private String checkTimeStartStr;
private String checkTimeEndStr;
private Date checkTimeStartDate;
private Date checkTimeEndDate;
}

33
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml
Unescape View File

@ -366,6 +366,7 @@
lww.cancle_check_user_name cancleCheckUserName,
lww.cancle_check_time cancleCheckTime,
lww.waybill_status waybillStatus,
lww.waybill_type waybillType,
lww.document_making_time openTime,
lww.goods_name goodsName,
lww.total_count totalCount,
@ -470,8 +471,8 @@
<if test="param.urgency != null">
and lww.urgency = #{param.urgency}
</if>
<if test="param.transportType != null">
and lww.transport_type = #{param.transportType}
<if test="param.serviceType != null">
and lww.service_type = #{param.serviceType}
</if>
<if test="param.transportType != null">
and lww.transport_type = #{param.transportType}
@ -479,6 +480,10 @@
<if test="param.waybillStatus != null">
and lww.waybill_status = #{param.waybillStatus}
</if>
<if test="param.checkStatus != null">
and IFNULL(lww.check_status,0) = #{param.checkStatus}
</if>
<if test="param.pickupCompleteOrNot != null">
and lww.pickup_complete_or_not = #{param.pickupCompleteOrNot}
</if>
@ -497,6 +502,12 @@
<if test="param.createTimeEndDate != null">
and lww.create_time &lt;= #{param.createTimeEndDate}
</if>
<if test="param.checkTimeStartDate != null">
and lww.check_time &gt;= #{param.checkTimeStartDate}
</if>
<if test="param.checkTimeEndDate != null">
and lww.check_time &lt;= #{param.checkTimeEndDate}
</if>
<if test="param.agent != null and param.agent != ''">
and lww.Locate(#{param.agent},agent) > 0
</if>
@ -536,7 +547,7 @@
<if test="param.freezeTimeEndDate != null">
and lww.freeze_time &lt;= #{param.freezeTimeEndDate}
</if>
GROUP BY lww.id
order by lww.create_time desc
</select>
@ -725,8 +736,8 @@
<if test="param.urgency != null">
and lww.urgency = #{param.urgency}
</if>
<if test="param.transportType != null">
and lww.transport_type = #{param.transportType}
<if test="param.serviceType != null">
and lww.service_type = #{param.serviceType}
</if>
<if test="param.transportType != null">
and lww.transport_type = #{param.transportType}
@ -734,6 +745,10 @@
<if test="param.waybillStatus != null">
and lww.waybill_status = #{param.waybillStatus}
</if>
<if test="param.checkStatus != null">
and IFNULL(lww.check_status,0) = #{param.checkStatus}
</if>
<if test="param.pickupCompleteOrNot != null">
and lww.pickup_complete_or_not = #{param.pickupCompleteOrNot}
</if>
@ -752,6 +767,12 @@
<if test="param.createTimeEndDate != null">
and lww.create_time &lt;= #{param.createTimeEndDate}
</if>
<if test="param.checkTimeStartDate != null">
and lww.check_time &gt;= #{param.checkTimeStartDate}
</if>
<if test="param.checkTimeEndDate != null">
and lww.check_time &lt;= #{param.checkTimeEndDate}
</if>
<if test="param.agent != null and param.agent != ''">
and lww.Locate(#{param.agent},agent) > 0
</if>
@ -791,7 +812,7 @@
<if test="param.freezeTimeEndDate != null">
and lww.freeze_time &lt;= #{param.freezeTimeEndDate}
</if>
GROUP BY lww.id
order by lww.create_time desc
</select>

9
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
Unescape View File

@ -833,6 +833,9 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
waybillDTO.setFreezeTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getFreezeTimeStartStr()));
waybillDTO.setFreezeTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getFreezeTimeEndStr()));
waybillDTO.setCheckTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getCheckTimeStartStr()));
waybillDTO.setCheckTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getCheckTimeEndStr()));
IPage<FinanceWaybillVO> pageList = baseMapper.pageFinanceWaybillList(page, waybillDTO);
// List<FinanceWaybillVO> records = pageList.getRecords();
//
@ -1116,9 +1119,11 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
waybillDTO.setFreezeTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getFreezeTimeStartStr()));
waybillDTO.setFreezeTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getFreezeTimeEndStr()));
List<FinanceWaybillExportVO> list = baseMapper.financeWaybillListExport(waybillDTO);
waybillDTO.setCheckTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getCheckTimeStartStr()));
waybillDTO.setCheckTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getCheckTimeEndStr()));
List<FinanceWaybillExportVO> list = baseMapper.financeWaybillListExport(waybillDTO);
return Collections.emptyList();
return list;
}
}

Write Preview
Loading…
Cancel
Save