diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java index 1099e7f8c..ca6f1e088 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionSignforAppController.java @@ -277,7 +277,9 @@ public class DistributionSignforAppController { public R prices(@Valid @RequestBody DistributionSignforDTO distributionSignfor) { if(ObjectUtil.isNotEmpty(distributionSignfor.getReservationId())){ Map> one = distributionSignforService.prices(distributionSignfor); - DistributionSignforEntity one1 = distributionSignforService.getOne(Wrappers.query().lambda().eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId())); + DistributionSignforEntity one1 = distributionSignforService.getOne(Wrappers.query().lambda() + .eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId()) + ); Map map = new HashMap<>(); map.put("deliverySignPictures",one); //司机签收图片 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml index 007aa5098..d3839e21f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.xml @@ -151,15 +151,17 @@ LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id and lwug.association_type = '3' where ldpl.stock_article_id = ldbs.stock_article_id) goodsAllocation, ldsa.service_number serviceNumber,ldsa.waybill_number waybillNumber,ldsa.train_number trainNumber,ldsa.send_warehouse_name sendWarehouseName + GROUP_CONCAT(DISTINCT ldbls.scan_user) AS scanUser ,MAX(ldbls.create_time) AS signingTime from logpm_distrilbution_bill_lading AS ldbl LEFT JOIN logpm_distrilbution_bill_stock ldbs ON ldbs.bill_lading_id = ldbl.id LEFT JOIN logpm_distribution_stock_article ldsa on ldbs.stock_article_id = ldsa.id LEFT JOIN logpm_distribution_stock lds on lds.stock_article = ldbs.stock_article_id + LEFT JOIN logpm_distribution_bill_lading_scan AS ldbls ON ldbl.id = ldbls.bill_lading_id ldbs.is_deleted = 0 and ldbs.bill_lading_id = #{param.billLadingId} and ldbs.order_status in (1,3) - + GROUP BY ldbl.id,ldsa.id