From 67a58faf499fafb97af8773583a594d91e9167a8 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 14 Feb 2025 23:48:48 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=BC=80=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/trunkline/dto/OpenOrderDTO.java | 1 + .../warehouse/entity/WarehouseWaybillEntity.java | 3 +++ .../com/logpm/report/mapper/ReportTimeMapper.xml | 12 +++++------- .../service/impl/OpenOrderServiceImpl.java | 16 ++++++++++------ 4 files changed, 19 insertions(+), 13 deletions(-) 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 7646632ef..fcd8a4c01 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 @@ -125,6 +125,7 @@ public class OpenOrderDTO implements Serializable { private String trunklineVehicleType;//提货车型 private String pickupVehicleType;//提货车型 + private Long pickupVehicleTypeId;//提货车型id private Integer checkStatus; 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 420e441b9..f233716b9 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 @@ -483,6 +483,9 @@ public class WarehouseWaybillEntity extends TenantEntity { @ApiModelProperty(value = "干线车型 ") private String trunklineVehicleType; + @ApiModelProperty(value = "提货车型id ") + private Long pickupVehicleTypeId; + @ApiModelProperty(value = "提货车型 ") private String pickupVehicleType; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml index 3b6150678..191ea85a5 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml @@ -1332,7 +1332,7 @@ lww.consignee consignee, lww.departure_warehouse_name departureWarehouseName, lww.destination_warehouse_name destinationWarehouseName, - IFNULL(lqd.delivery_type,lww.service_type) serviceType, + min(lqd.delivery_type) serviceType, GROUP_CONCAT(DISTINCT ltad.train_number) trainNumber, GROUP_CONCAT(DISTINCT ltcls.load_code) loadingLoadCode, GROUP_CONCAT(DISTINCT ltclsm.load_code) unloadLoadCode, @@ -1435,7 +1435,6 @@ lww.consignee, lww.departure_warehouse_name, lww.destination_warehouse_name, - lqd.delivery_type,lww.service_type, oat.day_time @@ -1459,10 +1458,10 @@ lww.consignee consignee, lww.departure_warehouse_name departureWarehouseName, lww.destination_warehouse_name destinationWarehouseName, - CASE WHEN IFNULL(lqd.delivery_type,lww.service_type)=1 THEN '商配' - WHEN IFNULL(lqd.delivery_type,lww.service_type)=2 THEN '市配' - WHEN IFNULL(lqd.delivery_type,lww.service_type)=3 THEN '自提' - WHEN IFNULL(lqd.delivery_type,lww.service_type)=4 THEN '三方中转' + CASE WHEN min(lqd.delivery_type)=1 THEN '商配' + WHEN min(lqd.delivery_type)=2 THEN '市配' + WHEN min(lqd.delivery_type)=3 THEN '自提' + WHEN min(lqd.delivery_type)=4 THEN '三方中转' ELSE '未知' END serviceType, GROUP_CONCAT(DISTINCT ltad.train_number) trainNumber, GROUP_CONCAT(DISTINCT ltcls.load_code) loadingLoadCode, @@ -1566,7 +1565,6 @@ lww.consignee, lww.departure_warehouse_name, lww.destination_warehouse_name, - lqd.delivery_type,lww.service_type, oat.day_time 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 9be9cff9b..64d985274 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 @@ -734,6 +734,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setTrunklineVehicleType(openOrderDTO.getTrunklineVehicleType()); waybillEntity.setTrunklineVehicleTypeId(openOrderDTO.getTrunklineVehicleTypeId()); waybillEntity.setPickupVehicleType(openOrderDTO.getPickupVehicleType()); + waybillEntity.setPickupVehicleTypeId(openOrderDTO.getPickupVehicleTypeId()); waybillEntity.setAbolishStatus(0); waybillEntity.setFreezeStatus(0); waybillEntity.setSignNum(0); @@ -998,6 +999,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setTrunklineVehicleType(openOrderDTO.getTrunklineVehicleType()); waybillEntity.setTrunklineVehicleTypeId(openOrderDTO.getTrunklineVehicleTypeId()); waybillEntity.setPickupVehicleType(openOrderDTO.getPickupVehicleType()); + waybillEntity.setPickupVehicleTypeId(openOrderDTO.getPickupVehicleTypeId()); waybillEntity.setDepartureWarehouseId(openOrderDTO.getDepartureWarehouseId()); waybillEntity.setDepartureWarehouseName(openOrderDTO.getDepartureWarehouseName()); waybillEntity.setDestinationWarehouseId(openOrderDTO.getDestinationWarehouseId()); @@ -4823,8 +4825,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { // stringBuilder.append("到站：").append(destination).append("-->").append(newDestination).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("干线车型"); - editOrderMsgVO.setOldValue(DictBizCache.getValue("price_vehicle_type", trunklineVehicleType)); - editOrderMsgVO.setNewValue(DictBizCache.getValue("price_vehicle_type", newTrunklineVehicleType)); + editOrderMsgVO.setOldValue(trunklineVehicleType); + editOrderMsgVO.setNewValue(newTrunklineVehicleType); msgList.add(editOrderMsgVO); } @@ -4834,8 +4836,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { // stringBuilder.append("到站：").append(destination).append("-->").append(newDestination).append(";"); EditOrderMsgVO editOrderMsgVO = new EditOrderMsgVO(); editOrderMsgVO.setItemName("提货车型"); - editOrderMsgVO.setOldValue(DictBizCache.getValue("price_vehicle_type", pickupVehicleType)); - editOrderMsgVO.setNewValue(DictBizCache.getValue("price_vehicle_type", newPickupVehicleType)); + editOrderMsgVO.setOldValue(pickupVehicleType); + editOrderMsgVO.setNewValue(newPickupVehicleType); msgList.add(editOrderMsgVO); } @@ -5442,15 +5444,17 @@ public class OpenOrderServiceImpl implements IOpenOrderService { String newTrunklineVehicleType = openOrderDTO.getTrunklineVehicleType(); String trunklineVehicleType = waybillEntity.getTrunklineVehicleType(); if (!ObjectUtil.equals(newTrunklineVehicleType, trunklineVehicleType)) { - stringBuilder.append("干线车型：").append(DictBizCache.getValue("price_vehicle_type", trunklineVehicleType)).append("-->").append(DictBizCache.getValue("price_vehicle_type", newTrunklineVehicleType)).append(";"); + stringBuilder.append("干线车型：").append(trunklineVehicleType).append("-->").append(newTrunklineVehicleType).append(";"); waybillEntity.setTrunklineVehicleType(newTrunklineVehicleType); + waybillEntity.setTrunklineVehicleTypeId(openOrderDTO.getTrunklineVehicleTypeId()); } String newPickupVehicleType = openOrderDTO.getPickupVehicleType(); String pickupVehicleType = waybillEntity.getPickupVehicleType(); if (!ObjectUtil.equals(newPickupVehicleType, pickupVehicleType)) { - stringBuilder.append("提货车型：").append(DictBizCache.getValue("price_vehicle_type", pickupVehicleType)).append("-->").append(DictBizCache.getValue("price_vehicle_type", newPickupVehicleType)).append(";"); + stringBuilder.append("提货车型：").append(pickupVehicleType).append("-->").append(newPickupVehicleType).append(";"); waybillEntity.setPickupVehicleType(newPickupVehicleType); + waybillEntity.setPickupVehicleTypeId(openOrderDTO.getPickupVehicleTypeId()); }