From 12aabe2d6fe8bc206b28d6e0aff4849bd11593cd Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 11 Feb 2025 15:50:06 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BABUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionStockArticleMapper.java | 3 ++- .../mapper/DistributionStockArticleMapper.xml | 24 ++++++++++++++----- .../DistributionStockArticleServiceImpl.java | 20 ++-------------- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java index e90a4f8de..458108bc2 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.dto.DistributionStockArticleOweDTO; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionStockArticleEntity; +import com.logpm.distribution.excel.DistributionStockArticleExcel; import com.logpm.distribution.vo.*; import com.logpm.distribution.vo.app.queryOrderVO; import org.apache.ibatis.annotations.Param; @@ -54,7 +55,7 @@ public interface DistributionStockArticleMapper extends BaseMapper exportDistributionStockArticle(@Param("param") Map paramMap); + List exportDistributionStockArticle(@Param("param") Map paramMap); void addHandQuantity(@Param("id") Long id,@Param("num") int num); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml index 0d3ff94ad..1264c5d53 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml @@ -899,14 +899,15 @@ WHERE ldsa.id = #{stockArticleId} AND ldpl.is_transfer = 0 - select * from logpm_basicdata_brand_category where is_deleted = 0 - + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml index 50202445b..4e6bf7fcb 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataClientMapper.xml @@ -106,6 +106,8 @@ SELECT lbc.id, lbc.client_name, + lbc.create_time, + lbc.update_time, lbc. client_type, lbc.client_code, lbc. linkman, diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.xml index 8c1084a0e..0516c375e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTripartiteMallMapper.xml @@ -69,6 +69,8 @@ lbtm.tripartite_coding, lbtm.brand_name, lbc.client_name AS clientName, + lbc.create_time AS createTime, + lbc.update_time AS updateTime, lbc.type_service AS typeService FROM logpm_basicdata_tripartite_mall AS lbtm diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataBrandCategoryServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataBrandCategoryServiceImpl.java index 06790e83c..207ec87e8 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataBrandCategoryServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataBrandCategoryServiceImpl.java @@ -39,7 +39,7 @@ public class BasicdataBrandCategoryServiceImpl extends BaseServiceImpl selectBasicdataBrandCategoryPage(IPage page, BasicdataBrandCategoryVO basicdataBrandCategory) { - return page.setRecords(baseMapper.selectBasicdataBrandCategoryPage(page, basicdataBrandCategory)); + return baseMapper.selectBasicdataBrandCategoryPage(page, basicdataBrandCategory); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml index 5407946b4..5ae9e3cfe 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml @@ -779,7 +779,7 @@ logpm_distribution_signfor lds JOIN logpm_distribution_delivery_list lddl ON lddl.id = lds.delivery_id JOIN logpm_distribution_reservation ldr ON ldr.id = lds.reservation_id AND ldr.reservation_status != 40 - LEFT JOIN logpm_distribution_positioning AS ldp ON lds.reservation_id = lds.reservation_id AND ldp.is_deleted = 0 + LEFT JOIN logpm_distribution_positioning AS ldp ON ldp.reservation_id = lds.reservation_id AND ldp.is_deleted = 0 where lds.is_deleted = 0 and lds.id = #{id} From 11a30e1daef6d1a145385d1b0d545f43aaeeb7dc Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 14 Feb 2025 15:39:58 +0800 Subject: [PATCH 19/23] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=9A=84tokenredis=E5=AD=98=E5=82=A8=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/common/utils/DefaultUserTokenConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/DefaultUserTokenConfig.java b/blade-biz-common/src/main/java/org/springblade/common/utils/DefaultUserTokenConfig.java index d66a8dea0..9b0ce7841 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/utils/DefaultUserTokenConfig.java +++ b/blade-biz-common/src/main/java/org/springblade/common/utils/DefaultUserTokenConfig.java @@ -2,7 +2,7 @@ package org.springblade.common.utils; public class DefaultUserTokenConfig { /** - * 默认用户的token 超时时间 + * 默认用户的token 超时时间 */ - public static final Long EXPIRE_TIME = 7 *24 * 60 * 60 * 1000L; + public static final Long EXPIRE_TIME = 7 * 24 * 60 * 60L; } From fdb8ac1598885d7d509c1210b63b772c3b3d2156 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Fri, 14 Feb 2025 16:04:56 +0800 Subject: [PATCH 20/23] =?UTF-8?q?=E5=93=81=E7=B1=BB=E5=93=81=E7=89=8CBUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicdata/mapper/BasicdataBrandCategoryMapper.java | 2 +- .../basicdata/mapper/BasicdataBrandCategoryMapper.xml | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java index bc78bf873..8f26b01e1 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.java @@ -50,5 +50,5 @@ public interface BasicdataBrandCategoryMapper extends BaseMapper selectBasicdataBrandCategoryPage(IPage page, BasicdataBrandCategoryVO basicdataBrandCategory); + IPage selectBasicdataBrandCategoryPage(IPage page,@Param("param") BasicdataBrandCategoryVO basicdataBrandCategory); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml index fd4f395fa..842ca2ae3 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataBrandCategoryMapper.xml @@ -41,6 +41,15 @@ logpm_basicdata_brand_category AS lbbc LEFT JOIN logpm_basicdata_brand AS lbb ON lbbc.brand_id = lbb.id LEFT JOIN logpm_basicdata_category AS lbc ON lbbc.category_id = lbc.id + + lbbc.is_deleted = 0 + + AND lbb.id = #{param.brandName} + + + AND lbc.id = #{param.name} + + GROUP BY lbbc.id From 67a58faf499fafb97af8773583a594d91e9167a8 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 14 Feb 2025 23:48:48 +0800 Subject: [PATCH 21/23] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=BC=80=E5=8D=95?= =?UTF-8?q?=EF=BC=8C=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()); } From 58a6badee4350ace9693d05d0be31f51e8d1fef1 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 17 Feb 2025 14:42:54 +0800 Subject: [PATCH 22/23] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BABUG=E4=BF=AE=E5=A4=8D=E3=80=81=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=8F=90=E4=BA=A4=E5=AE=89=E8=A3=85=E7=8E=AF=E8=8A=82?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BF=9D=E5=AD=98BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aftersales/mapper/AftersalesAbnormalPackageMapper.xml | 2 ++ .../com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.xml | 2 +- .../service/impl/AftersalesWorkOrderServiceImpl.java | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml index 262bbf321..0e7d21d01 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.xml @@ -67,6 +67,8 @@ + group BY + ldpl.id