From 792d4c84dbfd177a1904b8d4c3f0173e00f044c7 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 4 Dec 2024 15:31:05 +0800 Subject: [PATCH] =?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 --- .../common/constant/WorkNodeEnums.java | 1 + .../com/logpm/trunkline/dto/OpenOrderDTO.java | 4 +++ .../entity/WarehouseWaybillEntity.java | 6 ++-- .../vo/ExportWarehouseWaybillVO.java | 4 +++ .../warehouse/vo/FinanceWaybillExportVO.java | 4 +++ .../logpm/warehouse/vo/FinanceWaybillVO.java | 2 ++ .../AftersalesAbnormalRecordServiceImpl.java | 2 +- .../mapper/StatisticsOrderInfoMapper.xml | 4 ++- .../vo/StatisticsOrderInfoExportVO.java | 3 ++ .../vo/StatisticsPackageFeeInfoVO.java | 1 + .../controller/OpenOrderController.java | 6 ++++ .../service/impl/OpenOrderServiceImpl.java | 6 ++++ .../impl/TrunklineAdvanceServiceImpl.java | 16 +++++----- .../mapper/WarehouseWaybillMapper.xml | 32 +++++++++++++++++++ 14 files changed, 79 insertions(+), 12 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java index 20e21750d..c550660cb 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java @@ -44,6 +44,7 @@ public enum WorkNodeEnums implements Serializable { TRANSFER_WAREHOUSE_UNLOADING(105020, "卸车确认"), SIGN_DIRECT_SHIPPER(105030,"直发商家签收"), END_WAREHOUSE_UNLOADING(105040, "末端仓卸车确认"), + NO_STOCK_CAR(105050, "本车次少货"), SORTING_TRAYS(201010, "分拣打托"), UN_SORTING_TRAYS(201020, "包件解托"), diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java index 000e1edb0..7646632ef 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/OpenOrderDTO.java @@ -168,4 +168,8 @@ public class OpenOrderDTO implements Serializable { private String checkRemark; + private String completeDeparture; + + private String completeDestination; + } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java index 4629e54c1..3a3032b7d 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWaybillEntity.java @@ -560,8 +560,10 @@ public class WarehouseWaybillEntity extends TenantEntity { private String settlementStatus; + @ApiModelProperty(value = "完整发站") + private String completeDeparture; - - + @ApiModelProperty(value = "完整到站") + private String completeDestination; } diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java index 5fe090e1f..e44b1dc3e 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/ExportWarehouseWaybillVO.java @@ -67,8 +67,12 @@ public class ExportWarehouseWaybillVO implements Serializable { @ExcelProperty(value = "发站") private String departure; + @ExcelProperty(value = "完整发站") + private String completeDeparture; @ExcelProperty(value = "到站") private String destination; + @ExcelProperty(value = "完整到站") + private String completeDestination; @ExcelProperty(value = "货物名称") private String goodsName; 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 d0704b979..76dabf304 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 @@ -52,8 +52,12 @@ public class FinanceWaybillExportVO implements Serializable { @ExcelProperty(value = "到站") private String destination; + @ExcelProperty(value = "完整到站") + private String completeDestination; @ExcelProperty(value = "发站") private String departure; + @ExcelProperty(value = "完整发站") + private String completeDeparture; @ExcelProperty(value = "发站仓") private String departureWarehouseName; @ExcelProperty(value = "目的仓") diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java index d39186e6d..74970e679 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java @@ -22,7 +22,9 @@ public class FinanceWaybillVO implements Serializable { private String shipperMobile; private String shipperAddress; private String destination; + private String completeDestination; private String departure; + private String completeDeparture; private String departureWarehouseName; private String destinationWarehouseName; private String deliveryWay; diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java index 100e1f6e3..545bf30bb 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java @@ -193,7 +193,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl ls = new ArrayList<>(); diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml index 187ea9cd9..1dcfe9d0d 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml @@ -146,7 +146,8 @@ lww.consignee_mobile consigneeMobile, lww.consignee_address consigneeAddress, case when lsoi.sign_status=0 then '未签收' - when lsoi.sign_status=1 then '已签收' + when lsoi.sign_status=1 then '部分签收' + when lsoi.sign_status=2 then '已签收' else '未知' end signStatus, lsoi.sign_date signDate, lww.create_time openTime, @@ -457,6 +458,7 @@ select lstp.order_info_id orderInfoId, GROUP_CONCAT(DISTINCT lswp.product_name ORDER BY lswp.product_name) goodsName, + GROUP_CONCAT(DISTINCT lstp.freight_price ORDER BY lstp.product_name) goodsPrice, IFNULL(sum(lstp.num),0) totalNum, IFNULL(sum(lstp.weight),0) totalWeight, IFNULL(sum(lstp.volume),0) totalVolume, diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java index 0174a7bb7..2a89e1d7c 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsOrderInfoExportVO.java @@ -82,6 +82,9 @@ public class StatisticsOrderInfoExportVO implements Serializable { @ExcelProperty(value = "物料品类") private String goodsName; // 物料品类 + @ExcelProperty(value = "物料品类单价") + private String goodsPrice; // 物料品类 + @ExcelProperty(value = "订单数量") private Integer totalNum; // 订单数量 diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java index de0680f40..f7e1f4d7f 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java @@ -13,6 +13,7 @@ public class StatisticsPackageFeeInfoVO implements Serializable { private Long waybillId; private String goodsName;//物料品类 + private String goodsPrice;//物料品类单价 private Integer totalNum; private BigDecimal totalWeight; diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java index dd4d5805e..0cd087429 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java @@ -976,6 +976,12 @@ public class OpenOrderController { throw new CustomerException(405, "到站不能为空"); } + String completeDestination = openOrderDTO.getCompleteDestination(); + if (StringUtil.isBlank(completeDestination)) { + log.warn("#################openOrderParamVerify: 到站不能为空 completeDestination={} ", completeDestination); + throw new CustomerException(405, "到站不能为空"); + } + String orderCode = openOrderDTO.getOrderCode(); if (StringUtil.isBlank(orderCode)) { log.warn("#################openOrderParamVerify: 订单号不能为空 orderCode={} ", orderCode); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 4560aaf21..e453345f3 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -602,8 +602,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setDestination(openOrderDTO.getDestination()); waybillEntity.setDestinationCode(openOrderDTO.getDestinationCode()); + waybillEntity.setCompleteDestination(openOrderDTO.getCompleteDestination()); waybillEntity.setDeparture(openOrderDTO.getDeparture()); waybillEntity.setDepartureCode(openOrderDTO.getDepartureCode()); + waybillEntity.setCompleteDeparture(openOrderDTO.getCompleteDeparture()); waybillEntity.setGoodsName(openOrderDTO.getGoodsName()); waybillEntity.setTotalCount(openOrderDTO.getTotalCount()); waybillEntity.setTotalVolume(openOrderDTO.getTotalVolume()); @@ -903,6 +905,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setBrand(openOrderDTO.getBrand()); waybillEntity.setDeparture(openOrderDTO.getDeparture()); waybillEntity.setDepartureCode(openOrderDTO.getDepartureCode()); + waybillEntity.setCompleteDeparture(openOrderDTO.getCompleteDeparture()); waybillEntity.setDealerCode(openOrderDTO.getDealerCode()); waybillEntity.setDealerName(openOrderDTO.getDealerName()); waybillEntity.setPickupCompleteOrNot(openOrderDTO.getPickupCompleteOrNot()); @@ -952,6 +955,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setDestination(openOrderDTO.getDestination()); waybillEntity.setDestinationCode(openOrderDTO.getDestinationCode()); + waybillEntity.setCompleteDestination(openOrderDTO.getCompleteDestination()); waybillEntity.setGoodsName(openOrderDTO.getGoodsName()); waybillEntity.setGoodsCode(openOrderDTO.getGoodsCode()); waybillEntity.setTotalCount(openOrderDTO.getTotalCount()); @@ -5226,6 +5230,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { stringBuilder.append("发站：").append(departure).append("-->").append(newDeparture).append(";"); waybillEntity.setDeparture(newDeparture); waybillEntity.setDepartureCode(openOrderDTO.getDepartureCode()); + waybillEntity.setCompleteDeparture(openOrderDTO.getCompleteDeparture()); } Integer newPickupCompleteOrNot = openOrderDTO.getPickupCompleteOrNot(); @@ -5263,6 +5268,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { stringBuilder.append("到站：").append(destination).append("-->").append(newDestination).append(";"); waybillEntity.setDestination(newDestination); waybillEntity.setDestinationCode(openOrderDTO.getDestinationCode()); + waybillEntity.setCompleteDestination(openOrderDTO.getCompleteDestination()); } Long newDestinationWarehouseId = openOrderDTO.getDestinationWarehouseId(); String newDestinationWarehouseName = openOrderDTO.getDestinationWarehouseName(); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index 6faef99c6..a98582578 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -981,19 +981,19 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl and Locate(#{param.destination},lww.destination) > 0 + + and Locate(#{param.completeDestination},lww.complete_destination) > 0 + and Locate(#{param.departure},lww.departure) > 0 + + and Locate(#{param.completeDeparture},lww.complete_departure) > 0 + and lww.pay_type = #{param.payType} @@ -435,7 +443,9 @@ 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, @@ -553,9 +563,15 @@ and Locate(#{param.destination},lww.destination) > 0 + + and Locate(#{param.completeDestination},lww.complete_destination) > 0 + and Locate(#{param.departure},lww.departure) > 0 + + and Locate(#{param.completeDeparture},lww.complete_departure) > 0 + and lww.pay_type = #{param.payType} @@ -669,7 +685,9 @@ 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, case when lww.delivery_way='1' then '自提' @@ -826,9 +844,15 @@ and Locate(#{param.destination},lww.destination) > 0 + + and Locate(#{param.completeDestination},lww.complete_destination) > 0 + and Locate(#{param.departure},lww.departure) > 0 + + and Locate(#{param.completeDeparture},lww.complete_departure) > 0 + and lww.pay_type = #{param.payType} @@ -953,7 +977,9 @@ lww.consignee_mobile consigneeMobile, lww.consignee_address consigneeAddress, lww.destination destination, + lww.complete_destination completeDestination, lww.departure departure, + lww.complete_departure completeDeparture, lww.cost_piece costPiece, lww.cost_zhang costZhang, lww.cost_num costNum, @@ -1070,9 +1096,15 @@ and Locate(#{param.destination},lww.destination) > 0 + + and Locate(#{param.completeDestination},lww.complete_destination) > 0 + and Locate(#{param.departure},lww.departure) > 0 + + and Locate(#{param.completeDeparture},lww.complete_departure) > 0 + and lww.pay_type = #{param.payType}