From b952b341dbe3614cce6a42fbfdb337e808c48f5f Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 12 Dec 2024 10:30:00 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml index 9e727642a..00f30fc05 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml @@ -669,7 +669,7 @@ and lww.pay_status = #{param.payStatus} - and lww.freeze_time = #{param.settlementStatus} + and lww.settlement_status = #{param.settlementStatus} GROUP BY lww.id order by lww.create_time desc From 4733f2b78ce3967f0c810c3cbeb856979dfc16b4 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 12 Dec 2024 11:28:42 +0800 Subject: [PATCH 2/6] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/vo/FinanceWaybillExportVO.java | 17 +++++++++++++++ .../impl/TrunklineCarsLoadServiceImpl.java | 21 +++++++++++++++++-- .../mapper/WarehouseWaybillMapper.xml | 19 +++++++++++++++++ 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java index 76dabf304..19bb689eb 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java @@ -2,6 +2,7 @@ package com.logpm.warehouse.vo; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; @@ -190,6 +191,22 @@ public class FinanceWaybillExportVO implements Serializable { private BigDecimal thirdOperationFee; @ExcelProperty(value = "回扣") private BigDecimal rebate; + @ExcelProperty(value = "收款状态") + private String payStatus; + @ExcelProperty(value = "结算状态") + private String settlementStatus; + @ExcelProperty(value = "签收数量") + private Integer signNum; + @ExcelProperty(value = "签收时间") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date signTime; + @ExcelProperty(value = "配送时间") + @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date deliveryTime; + @ExcelProperty(value = "签收人") + private String signUserName; + @ExcelProperty(value = "配送司机") + private String deliveryDriverName; @ExcelProperty(value = "品类数量") private String goodsTypeNum; @ExcelProperty(value = "品类开单运费") diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 6cf5164d3..768a94ea9 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -9022,6 +9022,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadingZeroFlag = new AtomicReference<>(0); + List> ls = new ArrayList<>(); //查询有哪些在当前仓做计划的订单 List carsOrderEntityList = trunklineCarsOrderService.findListByLoadIdAndNodeId(loadId, warehouseId); //把carsOrderEntityList通过type分组成两个新的集合 @@ -9029,6 +9030,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl zeroOrderList = carsOrderEntityList.stream().filter(e -> e.getType().equals(2)).collect(Collectors.toList()); //零担批量装车 zeroOrderList.stream().forEach(e -> { + Map map = new HashMap<>(); //零担订单 Integer realNum = e.getRealNum(); String orderCode = e.getOrderCode(); @@ -9045,6 +9047,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl map = new HashMap<>(); + map.put("waybillNo", waybillNo); + map.put("orderCode", orderCode); + map.put("planNum", planNum); + map.put("realNum", realNum); + map.put("handQuantity", size); + ls.add(map); } }); @@ -9192,9 +9209,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl and lww.freeze_time <= #{param.freezeTimeEndDate} + + and lww.pay_status = #{param.payStatus} + + + and lww.settlement_status = #{param.settlementStatus} + GROUP BY lww.id order by lww.create_time desc From fe37a11d15d2418a633eb3d33e25ec306243285b Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 12 Dec 2024 11:46:59 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat(all):=20=E8=BD=A6=E8=BE=86=E8=BD=A6?= =?UTF-8?q?=E6=AC=A1=E6=88=90=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改车辆车次成本数据异常问题 --- .../impl/QualityDeliverServiceImpl.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java index 50dd76a90..2744c05ed 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java @@ -110,20 +110,19 @@ public class QualityDeliverServiceImpl extends BaseServiceImpl Date: Thu, 12 Dec 2024 11:56:44 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat(all):=20=E8=BD=A6=E8=BE=86=E8=BD=A6?= =?UTF-8?q?=E6=AC=A1=E6=88=90=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改车辆车次成本数据异常问题 --- .../distribution/service/impl/QualityDeliverServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java index 2744c05ed..6a14243c2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java @@ -112,6 +112,7 @@ public class QualityDeliverServiceImpl extends BaseServiceImpl Date: Thu, 12 Dec 2024 11:59:07 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat(all):=20=E8=BD=A6=E8=BE=86=E8=BD=A6?= =?UTF-8?q?=E6=AC=A1=E6=88=90=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改车辆车次成本数据异常问题 --- .../service/impl/QualityDeliverServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java index 6a14243c2..e5313a703 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/QualityDeliverServiceImpl.java @@ -84,10 +84,10 @@ public class QualityDeliverServiceImpl extends BaseServiceImpl> collect = new HashMap<>(); for (QualityDeliverEntity entity : entities) { - if (!collect.containsKey(entity.getSignCarNumber() + entity.getSignTrainNumber())) { - collect.put(entity.getSignCarNumber() + entity.getSignTrainNumber(), CollUtil.newArrayList(entity)); + if (!collect.containsKey(entity.getSignCarNumber() + entity.getPlanTrainNumber())) { + collect.put(entity.getSignCarNumber() + entity.getPlanTrainNumber(), CollUtil.newArrayList(entity)); } else { - collect.get(entity.getSignCarNumber() + entity.getSignTrainNumber()).add(entity); + collect.get(entity.getSignCarNumber() + entity.getPlanTrainNumber()).add(entity); } } @@ -115,7 +115,7 @@ public class QualityDeliverServiceImpl extends BaseServiceImpl Date: Thu, 12 Dec 2024 12:00:47 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionAsyncServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 9d7c75ada..ae62944d8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -2171,7 +2171,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { DistributionDeliveryDetailsEntity one = distributionDeliveryDetailsService.getOne(Wrappers.query().lambda() .eq(DistributionDeliveryDetailsEntity::getBillLadingId, reservationId) .eq(DistributionDeliveryDetailsEntity::getStockListId, stockupDTO.getStockListId()) - .apply("inventory_status in (1,2)") + .apply("inventory_status in (1,3)") ); if (ObjectUtils.isNull(one)) { log.info("自提库存品数据为空！！"); @@ -2767,13 +2767,13 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { DistributionReservationEntity reservationEntity = new DistributionReservationEntity(); boolean fa = false; if (distributionStockupEntity.getStockupStatus().equals(StockupStatusConstant.beihuozhong.getValue())) { + distributionStockup.setId(stockupDTO.getStockupId()); if (i > 0) { // 有数量 fa = true; } else if (i == 0) { //修改完成状态 //修改备货状态 - distributionStockup.setId(stockupDTO.getStockupId()); distributionStockup.setStockupStatus(StockupStatusConstant.yibeihuo.getValue()); reservationEntity.setId(stockupDTO.getReservationId());