From 78be909c83c750b2e5a97dbf865592f9b849b933 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Thu, 19 Dec 2024 11:19:01 +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 --- .../com/logpm/warehouse/feign/IWarehouseWaybillClient.java | 2 +- .../logpm/trunkline/service/impl/OpenOrderServiceImpl.java | 2 +- .../com/logpm/warehouse/feign/WarehouseWaybillClient.java | 4 ++-- .../com/logpm/warehouse/mapper/WarehouseWaybillMapper.java | 2 +- .../com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml | 4 ++-- .../com/logpm/warehouse/service/IWarehouseWaybillService.java | 2 +- .../warehouse/service/impl/WarehouseWaybillServiceImpl.java | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java index 05ff00d60..13304e135 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseWaybillClient.java @@ -104,5 +104,5 @@ public interface IWarehouseWaybillClient { List findWaybillVOByWaybillNoSet(@RequestBody Set allWaybillNoSet); @GetMapping(API_PREFIX+"/updateWaybillCondigneeId") - void updateWaybillCondigneeId(@RequestParam Long waybillId, @RequestParam Long newConsigneeId); + void updateWaybillCondigneeIdToNull(@RequestParam Long waybillId); } 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 82fdd4a9d..4e3ee3e4e 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 @@ -5459,7 +5459,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService { waybillEntity.setConsigneeId(newConsigneeId); if(Objects.isNull(newConsigneeId)){ waybillEntity.setServiceType(1); - warehouseWaybillClient.updateWaybillCondigneeId(waybillId,newConsigneeId); + warehouseWaybillClient.updateWaybillCondigneeIdToNull(waybillId); }else{ BasicdataClientEntity basicdataClient = basicdataClientClient.findEntityById(newConsigneeId); if(!Objects.isNull(basicdataClient)){ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillClient.java index 877c1b258..44523274c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseWaybillClient.java @@ -131,7 +131,7 @@ public class WarehouseWaybillClient implements IWarehouseWaybillClient { } @Override - public void updateWaybillCondigneeId(Long waybillId, Long newConsigneeId) { - warehouseWaybillService.updateWaybillCondigneeId(waybillId,newConsigneeId); + public void updateWaybillCondigneeIdToNull(Long waybillId) { + warehouseWaybillService.updateWaybillCondigneeIdToNull(waybillId); } } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java index 82bffca47..5dfa2a9e5 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java @@ -80,5 +80,5 @@ public interface WarehouseWaybillMapper extends BaseMapper findWaybillVOByWaybillNoSet(@Param("waybillNos") Set allWaybillNoSet); - void updateWaybillCondigneeId(@Param("waybillId") Long waybillId, @Param("newConsigneeId") Long newConsigneeId); + void updateWaybillCondigneeIdToNull(@Param("waybillId") Long waybillId); } 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 9bb5e91a9..e5c3d418c 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 @@ -1276,8 +1276,8 @@ group by lww.id - - update logpm_warehouse_waybill set consignee_id = #{newConsigneeId} where id = #{waybillId} + + update logpm_warehouse_waybill set consignee_id = null where id = #{waybillId} diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java index 34a8c5304..a9ee08635 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java @@ -92,5 +92,5 @@ public interface IWarehouseWaybillService extends BaseService findWaybillVOByWaybillNoSet(Set allWaybillNoSet); - void updateWaybillCondigneeId(Long waybillId, Long newConsigneeId); + void updateWaybillCondigneeIdToNull(Long waybillId); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index abfa0fb19..4e43be3d7 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -1226,7 +1226,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl