自提详情包件列表增加仓库查询

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<IPage<DistributionBillOrderPackVO>> getBillOrderPack(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillStock, Query query) {
+	public R getBillOrderPack(@ApiIgnore @RequestParam Map<String, Object> distrilbutionBillStock, Query query) {
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		if (Func.isEmpty(myCurrentWarehouse)){
+			//业务数据需要进行仓库选择
+			return R.fail(403,"未授权!!!");
+		}
+
+		distrilbutionBillStock.put("warehouseId",myCurrentWarehouse.getId());
 		IPage<DistributionBillOrderPackVO> detail = distrilbutionBillStockService.getBillOrderPack(distrilbutionBillStock,Condition.getPage(query));
 		return R.data(detail);
 	}

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;
+
 }

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<DistrilbutionBi
 
 	IPage<DistributionBillOrderVO> getBillOrderDetail(IPage page,@Param("param") DistrilbutionBillStockEntity distrilbutionBillStock);
 
-	IPage<DistributionBillOrderPackVO> getBillOrderPack(IPage<Object> page,@Param("param") DistrilbutionBillStockEntity billStock);
+	IPage<DistributionBillOrderPackVO> getBillOrderPack(IPage<Object> page,@Param("param") DistrilbutionBillStockDTO billStock);
 
     List<DistributionStockupOrderListVO> selectDistrilbutionBillSelf(@Param("reservationId")Long reservationId,@Param("isZero") String isZero);
 

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'
         <where>
-            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}
         </where>
     </select>
     <select id="selectDistrilbutionBillSelf"  resultType="com.logpm.distribution.vo.DistributionStockupOrderListVO">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -7250,6 +7250,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			? DeliveryStatusConstant.yiwancheng.getValue()
 			: DeliveryStatusConstant.peisongzhong.getValue());
 
+
 	}
 
 	private boolean isAllSignforCompleted(Long deliveryId) {

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillStockServiceImpl.java

@@ -23,6 +23,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.distribution.dto.DistrilbutionBillStockDTO;
 import com.logpm.distribution.dto.app.StockupDTO;
 import com.logpm.distribution.entity.DistributionBillLadingScanEntity;
 import com.logpm.distribution.entity.DistrilbutionBillPackageEntity;
@@ -68,6 +71,8 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 
 	private final IDistributionBillLadingScanService distributionBillLadingScanService;
 
+
+
 	@Override
 	public IPage<DistrilbutionBillStockVO> selectDistrilbutionBillStockPage(IPage<DistrilbutionBillStockVO> page, DistrilbutionBillStockVO distrilbutionBillStock) {
 		return page.setRecords(baseMapper.selectDistrilbutionBillStockPage(page, distrilbutionBillStock));
@@ -109,7 +114,9 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 
 	@Override
 	public IPage<DistributionBillOrderPackVO> getBillOrderPack(Map<String, Object> distrilbutionBillStock, IPage<Object> page) {
-		DistrilbutionBillStockEntity billStock = JSON.parseObject(JSON.toJSONString(distrilbutionBillStock), DistrilbutionBillStockEntity.class);
+
+		DistrilbutionBillStockDTO billStock = JSON.parseObject(JSON.toJSONString(distrilbutionBillStock), DistrilbutionBillStockDTO.class);
+
 		IPage<DistributionBillOrderPackVO> billOrderPack = baseMapper.getBillOrderPack(page, billStock);
 		billOrderPack.getRecords().forEach(i -> {
 			if(ObjectUtils.isNotNull(i.getStockupCreateUser())){