From 2c7968217414f32b220d2c94c3cc13b96b4d145a Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 20 Sep 2024 18:28:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=95=86=E5=AE=B6?= =?UTF-8?q?=E9=A2=84=E5=85=A5=E5=BA=93=E6=95=B0=E9=87=8F=E7=9A=84=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/IBasicdataDriverArteryClient.java | 2 +- .../logpm/business/mapper/BusinessPreOrderMapper.xml | 12 ++++++------ .../mapper/DistributionLoadscanMapper.xml | 2 +- .../receiver/BusinessPreOrderDataQueueHandler.java | 2 +- .../logpm/trunkline/service/IInComingService.java | 1 - 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataDriverArteryClient.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataDriverArteryClient.java index afb93c778..4b4bd3fde 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataDriverArteryClient.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataDriverArteryClient.java @@ -62,7 +62,7 @@ public interface IBasicdataDriverArteryClient { List findDriverListByName(@RequestParam String driverName,@RequestParam String jobType); @GetMapping(API_PREFIX+"/getDriverArteryById") - BasicdataDriverArteryEntity getDriverArteryById(Long id); + BasicdataDriverArteryEntity getDriverArteryById(@RequestParam Long id); @GetMapping(API_PREFIX+"/findDriverListByNameAndWarehouseId") List findDriverListByNameAndWarehouseId(@RequestParam String driverName, @RequestParam String jobType, @RequestParam Long warehouseId); diff --git a/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml b/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml index ebb5382f5..22742a6e4 100644 --- a/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml +++ b/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml @@ -190,9 +190,9 @@ driver_name, task_time, COUNT(DISTINCT order_code) as orderCount, - COUNT(DISTINCT order_package_code) as orderPackageCodeCount, - sum(case when order_package_loading_status =20 then 1 else 0 end ) as loadCarCount, - sum(case when in_warehouse =1 then 1 else 0 end ) as inWarehouseCount + sum( quantity ) as orderPackageCodeCount, + sum( load_num ) as loadCarCount, + sum( unload_num ) as inWarehouseCount from logpm_business_pre_order @@ -218,9 +218,9 @@ driver_name, task_time, COUNT(DISTINCT order_code) as orderCount, - COUNT(DISTINCT order_package_code) as orderPackageCodeCount, - sum(case when order_package_loading_status =20 then 1 else 0 end ) as loadCarCount, - sum(case when in_warehouse =1 then 1 else 0 end ) as inWarehouseCount + sum(quantity) as orderPackageCodeCount, + sum(load_num ) as loadCarCount, + sum(unload_num ) as inWarehouseCount from logpm_business_pre_order is_deleted=0 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml index 052dedb44..624af3045 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml @@ -154,6 +154,6 @@ FROM logpm_distribution_loadscan WHERE - reservation_id = #{reservationId} AND parcel_list_id = #{parcelListId} + reservation_id = #{reservationId} AND package_id = #{parcelListId} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java index 9bc45782b..308d9d459 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java @@ -146,7 +146,7 @@ public class BusinessPreOrderDataQueueHandler { //设置装车数量 data.setLoadNum(distributionLoadscanEntity.getLoadedNub()); } - + data.setConditions(3); data.setDriverName(distributionDeliveryListEntity.getDriverName()); data.setVehicleName(distributionDeliveryListEntity.getVehicleName()); data.setDistrCarNumber(distributionDeliveryListEntity.getTrainNumber()); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IInComingService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IInComingService.java index 1af3368d7..671c48edd 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IInComingService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IInComingService.java @@ -11,7 +11,6 @@ public interface IInComingService { R incomingPackages(InComingDTO inComingDTO); - @Transactional(rollbackFor = Exception.class) R incomingPackageByTaryCode(InComingDTO inComingDTO); R findIncomingOrderList(InComingDTO inComingDTO);