diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillStockController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillStockController.java index 0089cc04f..abfb36e60 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillStockController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistrilbutionBillStockController.java @@ -19,6 +19,8 @@ package com.logpm.distribution.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.basicdata.entity.BasicdataWarehouseEntity; +import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.distribution.entity.DistrilbutionBillStockEntity; import com.logpm.distribution.excel.DistributionBillOrderExcel; import com.logpm.distribution.excel.DistributionBillOrderPackExcel; @@ -62,6 +64,10 @@ public class DistrilbutionBillStockController extends BladeController { private final IDistrilbutionBillStockService distrilbutionBillStockService; + private final IBasicdataWarehouseClient warehouseClient; + + + /** * 提货单订单信息关联 详情 */ @@ -105,7 +111,14 @@ public class DistrilbutionBillStockController extends BladeController { @GetMapping("/billOrderPack") @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入distrilbutionBillLading") - public R> getBillOrderPack(@ApiIgnore @RequestParam Map distrilbutionBillStock, Query query) { + public R getBillOrderPack(@ApiIgnore @RequestParam Map distrilbutionBillStock, Query query) { + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + if (Func.isEmpty(myCurrentWarehouse)){ + //业务数据需要进行仓库选择 + return R.fail(403,"未授权!!!"); + } + + distrilbutionBillStock.put("warehouseId",myCurrentWarehouse.getId()); IPage detail = distrilbutionBillStockService.getBillOrderPack(distrilbutionBillStock,Condition.getPage(query)); return R.data(detail); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillStockDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillStockDTO.java index caf8be82c..4e1b3a2e6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillStockDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistrilbutionBillStockDTO.java @@ -31,4 +31,7 @@ import lombok.EqualsAndHashCode; public class DistrilbutionBillStockDTO extends DistrilbutionBillStockEntity { private static final long serialVersionUID = 1L; + + private Long warehouseId; + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java index 884a4377a..62487d08b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillStockMapper.java @@ -19,6 +19,7 @@ package com.logpm.distribution.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.distribution.dto.DistrilbutionBillStockDTO; import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.entity.DistrilbutionBillStockEntity; import com.logpm.distribution.excel.DistributionBillOrderExcel; @@ -58,7 +59,7 @@ public interface DistrilbutionBillStockMapper extends BaseMapper getBillOrderDetail(IPage page,@Param("param") DistrilbutionBillStockEntity distrilbutionBillStock); - IPage getBillOrderPack(IPage page,@Param("param") DistrilbutionBillStockEntity billStock); + IPage getBillOrderPack(IPage page,@Param("param") DistrilbutionBillStockDTO billStock); List selectDistrilbutionBillSelf(@Param("reservationId")Long reservationId,@Param("isZero") String isZero); 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 426fb1720..b606ef263 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 @@ -208,11 +208,11 @@ LEFT JOIN logpm_distrilbution_bill_package ldbp on ldbl.id = ldbp.bill_lading_id LEFT JOIN logpm_distribution_parcel_list ldpl ON ldbp.parce_list_id = ldpl.id LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id - LEFT JOIN logpm_distribution_bill_lading_scan ldbls on ldbls.packet_bar_code = ldpl.order_package_code + LEFT JOIN logpm_distribution_bill_lading_scan ldbls on ldbls.packet_bar_code = ldpl.order_package_code AND ldbl.warehouse_id = ldbls.warehouse_id LEFT JOIN logpm_warehouse_tray_goods lwtg ON lwtg.association_id = ldpl.id AND lwtg.association_type = '3' LEFT JOIN logpm_warehouse_updown_goods lwug ON lwug.association_id = ldpl.id AND lwug.association_type = '3' - ldbp.bill_lading_id = #{param.billLadingId} and ldbp.packet_bar_status in (1,3) and ldbp.bill_type = '1' + ldbp.bill_lading_id = #{param.billLadingId} and ldbp.packet_bar_status in (1,3) and ldbp.bill_type = '1' AND ldbl.warehouse_id = #{param.warehouseId}