From 74a9679160c158f1831de41bb5ecc25e73978f42 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 16 Oct 2024 11:57:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=EF=BC=9A=E4=BC=98=E5=8C=96=E5=95=86?= =?UTF-8?q?=E5=B8=82=E9=85=8D=E7=9A=84=E5=A4=87=E8=B4=A7=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/distribution/mapper/DistributionStockupMapper.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 50c5c49a6..da999d5be 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -264,7 +264,6 @@ logpm_distribution_stockup lds LEFT JOIN logpm_distribution_stockup_info ldsi ON ldsi.stockup_id = lds.id LEFT JOIN logpm_distribution_reservation ldr ON ldsi.reservation_id = ldr.id - LEFT JOIN logpm_distribution_reservation_package ldrp ON ldrp.reservation_id = ldsi.reservation_id lds.is_deleted = 0 AND ldsi.stock_status != 4 From 82d0d2ac16d4a3b2ceb870bc5a4e23b0b52b1db3 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 16 Oct 2024 13:44:17 +0800 Subject: [PATCH 2/4] =?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/trunkline/dto/LoadCarsDTO.java | 2 ++ .../controller/CarsLoadController.java | 21 +++++++++++++++++-- .../mapper/TrunklineCarsLoadMapper.xml | 18 ++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java index 209185100..0bf40421e 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java @@ -189,4 +189,6 @@ public class LoadCarsDTO implements Serializable { private List addUrlList = new ArrayList<>(); private List removeUrlList = new ArrayList<>(); + private Long endWarehouseId; + } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java index 94ed7dea5..8655b7178 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java @@ -53,9 +53,17 @@ public class CarsLoadController { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + List warehouseIds = new ArrayList<>(); if(!Objects.isNull(myCurrentWarehouse)){ - loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); + Long warehouseId = myCurrentWarehouse.getId(); + warehouseIds.add(warehouseId); + }else{ + List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); + myWatchWarehouse.forEach(warehouseEntity -> { + warehouseIds.add(warehouseEntity.getId()); + }); } + loadCarsDTO.setWarehouseIds(warehouseIds); IPage pages = carsLoadService.loadCarsPageList(loadCarsDTO); @@ -80,9 +88,18 @@ public class CarsLoadController { //当前登录人选择的仓库 BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + List warehouseIds = new ArrayList<>(); if(!Objects.isNull(myCurrentWarehouse)){ - loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId()); + Long warehouseId = myCurrentWarehouse.getId(); + warehouseIds.add(warehouseId); + }else{ + List myWatchWarehouse = warehouseClient.getMyWatchWarehouse(); + myWatchWarehouse.forEach(warehouseEntity -> { + warehouseIds.add(warehouseEntity.getId()); + }); } + loadCarsDTO.setWarehouseIds(warehouseIds); + IPage pages = carsLoadService.arriveCarsPageList(loadCarsDTO); return R.data(pages); }catch (CustomerException e){ diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml index 062663827..2e6db992c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml @@ -42,9 +42,18 @@ where ltcl.is_deleted = 0 and ltcl.load_type != '4' and ltcl.load_status != '100' + + and ltcl.start_warehouse_id in + + #{item} + + and ltcl.start_warehouse_id = #{param.warehouseId} + + and Locate(#{param.endWarehouseId},ltcl.end_warehouse_ids) > 0 + and ltcl.cars_no = #{param.loadCarsNo} @@ -132,9 +141,18 @@ where ltcl.is_deleted = 0 and ltcl.load_status != '100' and ltcl.load_type != '4' + + and ltcl.start_warehouse_id in + + #{item} + + and ltcl.end_warehouse_ids like concat('%',#{param.warehouseId},'%') + + and Locate(#{param.endWarehouseId},ltcl.end_warehouse_ids) > 0 + and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0) From 63b3722ad4f68db70b716830c7cde22c90d541ad Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Wed, 16 Oct 2024 14:20:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BD=AC=E5=BA=93=E5=AD=98=E5=93=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=B1=95=E7=A4=BA=E7=BB=B4=E6=8A=A4=E3=80=81?= =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=89=AB=E6=8F=8FBUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionParcelListServiceImpl.java | 3 ++- .../impl/DistributionSignforServiceImpl.java | 26 ++++++++++--------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index a444b41dd..5fe46467f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -601,6 +601,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl Date: Wed, 16 Oct 2024 14:39:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=BD=AC=E5=BA=93=E5=AD=98=E5=93=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=B1=95=E7=A4=BA=E7=BB=B4=E6=8A=A4=E3=80=81?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=8F=90=E7=A4=BA=E8=AF=AD=E9=9F=B3=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionStockListMapper.xml | 28 +++++++++++-------- .../DistributionParcelListServiceImpl.java | 5 +++- .../service/impl/TaskQuestServiceImpl.java | 7 +++++ 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 5a63c32cb..8807419b5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -399,21 +399,27 @@