1.备货详情库存品详情查询逻辑更新

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListClient.java

@@ -130,4 +130,7 @@ public interface IDistributionStockListClient {
 
 	@GetMapping(API_PREFIX+"/updeteSourceTypeById")
     void updeteSourceTypeById(@RequestParam String sourceType, @RequestParam Long stockListId);
+
+	@GetMapping(API_PREFIX+"/getListByMarketIdAndSku")
+	List<DistributionStockListEntity> getListByMarketIdAndSku(@RequestParam Long mallId, @RequestParam String sku, @RequestParam Long warehouseId);
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionStockListInfoClient.java

@@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 库存品明细 Feign接口类
  *
@@ -57,4 +59,6 @@ public interface IDistributionStockListInfoClient {
     @PostMapping(ADDSTOCKLISTINFOENTITY)
     boolean addStockListInfoEntity(@RequestBody DistributionStockListInfoEntity distributionStockListInfo);
 
+	@GetMapping(API_PREFIX + "/getAllOrderPackageCodes")
+    List<String> getAllOrderPackageCodes(@RequestParam String incomingBatch, @RequestParam String sku, @RequestParam Long mallId, @RequestParam Long warehouseId);
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupVO.java

@@ -66,6 +66,7 @@ public class DistributionStockupVO extends DistributionStockupEntity {
 	private String deliveryAddress;
 	private String deliveryPhone;
 	private String mallName;
+	private Long mallId;
 	private String stockArticleId;
 	private String orderCode; //订单自编号
 	private String descriptionGoods;

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java

@@ -75,4 +75,7 @@ public interface IWarehouseUpdownTypeClient {
 	R findAllGoodsByAllocationId(@RequestParam Long allocationId, @RequestParam Long warehouseId);
 	@GetMapping(TOP + "/findZeroAllocation")
 	List<JSONObject> findZeroAllocation(@RequestParam String orderCode, @RequestParam Long warehouseId);
+
+	@GetMapping(API_PREFIX+"/findStockListAllocations")
+	String findStockListAllocations(@RequestParam Long warehouseId, @RequestParam Long mallId, @RequestParam String sku);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListClient.java

@@ -199,4 +199,9 @@ public class DistributionStockListClient implements IDistributionStockListClient
 	public void updeteSourceTypeById(String sourceType, Long stockListId) {
 		distributionStockListService.updeteSourceTypeById(sourceType,stockListId);
 	}
+
+	@Override
+	public List<DistributionStockListEntity> getListByMarketIdAndSku(Long mallId, String sku, Long warehouseId) {
+		return distributionStockListService.getListByMarketIdAndSku(mallId,sku,warehouseId);
+	}
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionStockListInfoClient.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.distribution.feign;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.entity.DistributionStockListInfoEntity;
 import com.logpm.distribution.service.IDistributionStockListInfoService;
@@ -28,6 +29,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 /**
  * 库存品明细 Feign实现类
  *
@@ -57,4 +60,9 @@ public class DistributionStockListInfoClient implements IDistributionStockListIn
 		return distributionStockListInfoService.save(distributionStockListInfo);
 	}
 
+	@Override
+	public List<String> getAllOrderPackageCodes(String incomingBatch, String sku, Long mallId, Long warehouseId) {
+    	return distributionStockListInfoService.getAllOrderPackageCodes(incomingBatch,sku,mallId,warehouseId);
+	}
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.java

@@ -20,7 +20,6 @@ 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.entity.DistributionStockListInfoEntity;
-import com.logpm.distribution.excel.DistributionStockListInfoExcel;
 import com.logpm.distribution.vo.DistributionStockListInfoVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -57,4 +56,5 @@ public interface DistributionStockListInfoMapper extends BaseMapper<Distribution
 
     IPage<DistributionStockListInfoEntity> getStockListInfo(IPage<DistributionStockListInfoEntity> page,@Param("par") Map<String, Object> distributionStockListInfo);
 
+    List<String> getAllOrderPackageCodes(@Param("incomingBatch") String incomingBatch, @Param("sku") String sku, @Param("mallId") Long mallId, @Param("warehouseId") Long warehouseId);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml

@@ -105,4 +105,14 @@
         warehouse_id=#{par.warehouseId}
         AND is_deleted = 0 ) OR (stock_list_id =#{par.stockListId} AND is_deleted = 0)
     </select>
+
+    <select id="getAllOrderPackageCodes" resultType="String">
+        SELECT package_code FROM logpm_distribution_stock_list_info
+        WHERE incoming_batch=#{incomingBatch}
+        AND market_id =#{mallId}
+        AND cargo_number=#{sku}
+        AND warehouse_id=#{warehouseId}
+        AND is_deleted = 0
+    </select>
+
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java

@@ -154,4 +154,6 @@ public interface DistributionStockListMapper extends BaseMapper<DistributionStoc
 	List<DistributionMerchantStockListVO> selectMerchantNotHaveDataStockListInfo(@Param("stockListId")Long id);
 
 	IPage<DistributionStockListAllocationVO> listAllocationOrder(IPage<Object> page, @Param("param") DistributionStockListEntity distributionStockListEntity);
+
+	List<DistributionStockListEntity> getListByMarketIdAndSku(@Param("mallId")Long mallId, @Param("sku")String sku, @Param("warehouseId")Long warehouseId);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml

@@ -592,4 +592,14 @@
         UPDATE logpm_distribution_stock_list SET quantity_occupied = (quantity_occupied - #{num}) WHERE  id = #{stockListId}
     </update>
 
+    <select id="getListByMarketIdAndSku" resultType="com.logpm.distribution.entity.DistributionStockListEntity">
+        select ldsl.*
+        from logpm_distribution_stock_list ldsl
+        where ldsl.is_deleted = 0
+          and ldsl.source_type = 1
+          and ldsl.cargo_number = #{sku}
+          and ldsl.market_id = #{mallId}
+          and ldsl.warehouse_id = #{warehouseId}
+    </select>
+
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -866,7 +866,8 @@
         from  logpm_distribution_reservation_package ldrp
         LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldrp.parce_list_id
         where  ldrp.reservation_id = ldsi.reservation_id
-        )  goodsAllocation,ldr.stockup_status stockStatus,
+        )  goodsAllocation,
+        ldr.stockup_status stockStatus,
         ldr.reservation_num reservationNum,
         ldr.reservation_stock_list_num reservationStockListNum
         from logpm_distribution_reservation ldr
@@ -910,33 +911,31 @@
     </select>
 
     <select id="getInventoryOwn" resultType="com.logpm.distribution.vo.DistributionStockupVO">
-        select DISTINCT ldsii.sku ,ldsii.order_code orderCode,ldsii.description_goods descriptionGoods,ldsii.cargo_unit
-        cargoUnit,ldsii.id stockListId,ldrsi.reservation_id reservationId,
-        ldrsi.reservation_num reservationNum,lds.stockup_area stockupArea, lds.stockup_status
-        stockupStatus,lds.stockup_date stockupDate,ldrsi.id stocklist,
-        (
-        select count(ds.id)
-        from logpm_distribution_stock ds
-        WHERE ds.stock_list_id = ldsii.id and ds.reservation_id = ldsi.reservation_id
-        ) number,
-        (
-        select GROUP_CONCAT(DISTINCT tray_code)
-        from logpm_warehouse_tray_goods
-        WHERE association_id = ldsii.material_id and association_type = 4 and market_id =ldsii.market_id and
-        incoming_batch = ldsii.incoming_batch
-        ) pallet,
-        (
-        select GROUP_CONCAT(DISTINCT position_code)
-        from logpm_warehouse_updown_goods
-        where association_id = ldsii.material_id and association_type = 4 and market_id =ldsii.market_id and
-        incoming_batch = ldsii.incoming_batch
-        ) goodsAllocation,ldrsi.stock_status stockStatus,ldrsi.start_time_stocking startTimeStocking,ldrsi.end_time_stocking endTimeStocking
+        select DISTINCT ldr.consignee consignee,
+        ldr.mall_name mallName,
+        ldr.mall_id mallId,
+        ldsii.cargo_number AS sku,
+        ldsii.order_code orderCode,
+        ldsii.description_goods descriptionGoods,
+        ldsii.cargo_unit cargoUnit,
+        ldsii.id stockListId,
+        ldrsi.reservation_id reservationId,
+        ldrsi.reservation_num reservationNum,
+        lds.stockup_area stockupArea,
+        lds.stockup_status stockupStatus,
+        lds.stockup_date stockupDate,
+        ldr.warehouse_id warehouseId,
+        ldrsi.id stocklist,
+        ( SELECT count( ds.id ) FROM logpm_distribution_stock ds WHERE ds.stock_list_id = ldsii.id AND ds.reservation_id = ldsi.reservation_id ) number,
+        ldrsi.stock_status stockStatus,
+        ldrsi.start_time_stocking startTimeStocking,
+        ldrsi.end_time_stocking endTimeStocking
         from logpm_distribution_stockup_info ldsi
-        LEFT JOIN logpm_distribution_reservation_stocklist ldrsi on ldrsi.reservation_id = ldsi.reservation_id
-        LEFT JOIN logpm_distribution_stock_list ldsii on ldsii.id = ldrsi.stocklist_id
-        LEFT JOIN logpm_distribution_reservation_stockarticle ldrs on ldsi.reservation_id = ldrs.reservation_id
-        LEFT JOIN logpm_distribution_stockup lds on lds.id = ldsi.stockup_id
-        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldsii.parcel_list_id
+        LEFT JOIN logpm_distribution_reservation ldr ON ldsi.reservation_id = ldr.id
+        LEFT JOIN logpm_distribution_reservation_stocklist ldrsi ON ldrsi.reservation_id = ldsi.reservation_id
+        LEFT JOIN logpm_distribution_stock_list ldsii ON ldsii.id = ldrsi.stocklist_id
+        LEFT JOIN logpm_distribution_reservation_stockarticle ldrs ON ldsi.reservation_id = ldrs.reservation_id
+        LEFT JOIN logpm_distribution_stockup lds ON lds.id = ldsi.stockup_id
         <where>
             ldsi.stockup_id =#{id} and ldrsi.reservation_num > 0
         </where>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListInfoService.java

@@ -16,7 +16,6 @@
  */
 package com.logpm.distribution.service;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.entity.DistributionStockListInfoEntity;
 import com.logpm.distribution.excel.DistributionStockListInfoExcel;
@@ -58,4 +57,7 @@ public interface IDistributionStockListInfoService extends BaseService<Distribut
 	 * @return
 	 */
     IPage<DistributionStockListInfoEntity> getStockListInfo(Map<String, Object> distributionStockListInfo, IPage<DistributionStockListInfoEntity> page);
+
+    List<String> getAllOrderPackageCodes(String incomingBatch, String sku, Long mallId, Long warehouseId);
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java

@@ -203,6 +203,8 @@ public interface IDistributionStockListService extends BaseService<DistributionS
 	 */
 	OrderPackgeCodeDataVO showInvnetoryPackgeCode(Long id);
 
+	List<DistributionStockListEntity> getListByMarketIdAndSku(Long mallId, String sku, Long warehouseId);
+
 
 //	/**
 //	 * 查询库存品详情

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

@@ -84,4 +84,9 @@ public class DistributionStockListInfoServiceImpl extends BaseServiceImpl<Distri
 		return baseMapper.getStockListInfo(page, distributionStockListInfo);
 	}
 
+	@Override
+	public List<String> getAllOrderPackageCodes(String incomingBatch, String sku, Long mallId, Long warehouseId) {
+		return baseMapper.getAllOrderPackageCodes(incomingBatch,sku,mallId,warehouseId);
+	}
+
 }

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

@@ -828,6 +828,11 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 
 	}
 
+	@Override
+	public List<DistributionStockListEntity> getListByMarketIdAndSku(Long mallId, String sku, Long warehouseId) {
+		return baseMapper.getListByMarketIdAndSku(mallId,sku,warehouseId);
+	}
+
 	@Override
 	public OrderPackgeCodeDataVO showInventorySourcePackageCode(String incomingBatch, Long packageIds) throws Exception {
 		OrderPackgeCodeDataVO orderPackgeCodeDataVO = new OrderPackgeCodeDataVO();

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

@@ -1620,7 +1620,19 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			boolean b = inventoryChe.stream().anyMatch(i -> i.getReservationStockListNum() > 0);
 			if (b) {
 				//查询库存品
-				return baseMapper.getInventoryOwn(page, id);
+				IPage<DistributionStockupVO> inventoryOwn = baseMapper.getInventoryOwn(page, id);
+				List<DistributionStockupVO> records = inventoryOwn.getRecords();
+				for (DistributionStockupVO record : records) {
+					Long warehouseId = record.getWarehouseId();
+					Long mallId = record.getMallId();
+					String sku = record.getSku();
+					//查询库位信息
+					String allocations = warehouseUpdownTypeClient.findStockListAllocations(warehouseId,mallId,sku);
+					record.setGoodsAllocation(allocations);
+				}
+				inventoryOwn.setRecords(records);
+
+				return inventoryOwn;
 			} else {
 				return l;
 			}

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java

@@ -136,6 +136,11 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient {
 		return warehouseUpdownTypeService.findZeroAllocation(orderCode,warehouseId);
 	}
 
+	@Override
+	public String findStockListAllocations(Long warehouseId, Long mallId, String sku) {
+		return warehouseUpdownTypeService.findStockListAllocations(warehouseId,mallId,sku);
+	}
+
 
 	@Override
 	public R downZeroOrder(List<JSONObject> zeroOrders) {

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.java

@@ -126,6 +126,10 @@ public interface WarehouseUpdownGoodsMapper extends BaseMapper<WarehouseUpdownGo
 
     List<String> orderUpshelfDetailByAllocationId(@Param("orderCode") String orderCode, @Param("allocationId") Long allocationId, @Param("warehouseId") Long warehouseId);
 
+    List<String> getAllocationsByOrderPackages(@Param("orderPackageOrders") List<String> orderPackageOrders, @Param("warehouseId") Long warehouseId);
+
+	List<String> getAllocationsByWarehouseIdAndMarketIdAndSku(@Param("mallId") Long mallId, @Param("sku") String sku, @Param("warehouseId") Long warehouseId);
+
 
 //	/**
 //	 * 根据货位查询货物

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml

@@ -484,5 +484,26 @@
         and lwug.association_type = '3'
     </select>
 
+    <select id="getAllocationsByOrderPackages" resultType="String">
+        select lwga.qr_code
+        from logpm_warehouse_updown_goods lwug
+        left join logpm_warehouse_goods_allocation lwga on lwga.id = lwug.allocation_id
+        where lwug.warehouse_id = #{warehouseId}
+        <if test="orderPackageOrders != null and orderPackageOrders.size() > 0">
+            and association_value in
+            <foreach collection="orderPackageOrders" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="getAllocationsByWarehouseIdAndMarketIdAndSku" resultType="String">
+        select lwga.qr_code
+        from logpm_warehouse_updown_goods lwug
+                 left join logpm_warehouse_goods_allocation lwga on lwga.id = lwug.allocation_id
+        where lwug.warehouse_id = #{warehouseId}
+        and lwug.association_value = #{sku}
+        and lwug.market_id = #{mallId}
+    </select>
 
 </mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java

@@ -150,4 +150,8 @@ public interface IWarehouseUpdownGoodsService extends BaseService<WarehouseUpdow
 	List<StockOrderListVO> findStockOrderDetailList(Long allocationId, Long warehouseId);
 
     List<String> orderUpshelfDetailByAllocationId(String orderCode, Long allocationId, Long warehouseId);
+
+    List<String> getAllocationsByOrderPackages(List<String> orderPackageOrders, Long warehouseId);
+
+	List<String> getAllocationsByWarehouseIdAndMarketIdAndSku(Long mallId, String sku, Long warehouseId);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java

@@ -88,4 +88,6 @@ public interface IWarehouseUpdownTypeService extends BaseService<WarehouseUpdown
     R findAllocationData(Long allocationId, Long warehouseId);
 
     List<String> orderUpshelfDetailByAllocationId(String orderCode, Long allocationId, Long warehouseId);
+
+    String findStockListAllocations(Long warehouseId, Long mallId, String sku);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java

@@ -263,4 +263,14 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl<WarehouseUp
 		return baseMapper.orderUpshelfDetailByAllocationId(orderCode,allocationId,warehouseId);
 	}
 
+	@Override
+	public List<String> getAllocationsByOrderPackages(List<String> orderPackageOrders, Long warehouseId) {
+		return baseMapper.getAllocationsByOrderPackages(orderPackageOrders,warehouseId);
+	}
+
+	@Override
+	public List<String> getAllocationsByWarehouseIdAndMarketIdAndSku(Long mallId, String sku, Long warehouseId) {
+		return baseMapper.getAllocationsByWarehouseIdAndMarketIdAndSku(mallId,sku,warehouseId);
+	}
+
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

@@ -10,6 +10,7 @@ import com.logpm.distribution.entity.DistributionStockListEntity;
 import com.logpm.distribution.feign.IDistributionParcelListClient;
 import com.logpm.distribution.feign.IDistributionStockArticleClient;
 import com.logpm.distribution.feign.IDistributionStockListClient;
+import com.logpm.distribution.feign.IDistributionStockListInfoClient;
 import com.logpm.warehouse.bean.Resp;
 import com.logpm.warehouse.dto.*;
 import com.logpm.warehouse.entity.*;
@@ -51,6 +52,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 	private final IWarehouseUpdownGoodsService warehouseUpdownGoodsService;
 	private final IWarehouseUpdownGoodsLogService warehouseUpdownGoodsLogService;
 	private final IBasicdataWarehouseClient warehouseClient;
+	private final IDistributionStockListInfoClient distributionStockListInfoClient;
 
 	@Override
 	public boolean packageChangeStock(List<String> orderPackageCodes) {
@@ -157,6 +159,21 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		return ls;
 	}
 
+	@Override
+	public String findStockListAllocations(Long warehouseId, Long mallId, String sku) {
+		List<DistributionStockListEntity> stockListEntityList = distributionStockListClient.getListByMarketIdAndSku(mallId, sku, warehouseId);
+		Set<String> allocations = new HashSet<>();
+		for (DistributionStockListEntity stockListEntity : stockListEntityList) {
+			String incomingBatch = stockListEntity.getIncomingBatch();
+			List<String> orderPackageOrders = distributionStockListInfoClient.getAllOrderPackageCodes(incomingBatch,sku,mallId,warehouseId);
+			allocations.addAll(warehouseUpdownGoodsService.getAllocationsByOrderPackages(orderPackageOrders,warehouseId));
+		}
+
+		allocations.addAll(warehouseUpdownGoodsService.getAllocationsByWarehouseIdAndMarketIdAndSku(mallId,sku,warehouseId));
+
+		return String.join(",",allocations);
+	}
+
 	private void packageChangeStockByAllocaton(WarehouseUpdownGoodsEntity one) {
 
 		//当前登录人选择的仓库