Merge branch 'dev' into pre-production

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

@@ -465,6 +465,17 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 	public IPage<DistributionStockListAllocationVO> listAllocation(IPage<Object> page, Map<String, Object> distributionStockList) {
 		DistributionStockListEntity distributionStockListEntity = JSONObject.parseObject(JSONObject.toJSONString(distributionStockList), DistributionStockListEntity.class);
 		IPage<DistributionStockListAllocationVO> pageList = null;
+		Long marketId = distributionStockListEntity.getMarketId();
+		Long materialId = distributionStockListEntity.getMaterialId();
+		String incomingBatch = distributionStockListEntity.getIncomingBatch();
+		Long warehouseId = distributionStockListEntity.getWarehouseId();
+
+		QueryWrapper<DistributionStockListEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("market_id",marketId)
+			.eq("material_id",materialId)
+			.eq("incomingBatch",incomingBatch)
+			.eq("warehouse_id",warehouseId);
+		distributionStockListEntity = getOne(queryWrapper);
 
 		if(Objects.isNull(distributionStockListEntity)){
 			log.warn("##################listAllocation: 库存品信息不存在");