Merge branch 'dev' into pre-production

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

@@ -641,10 +641,10 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	 *
 	 * @param stockupDTO
 	 */
-	@Async
 	@Override
 	public void stockupSelfOffShelf(StockupDTO stockupDTO) throws InterruptedException {
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		log.info(">>>> find bug {}",myCurrentWarehouse);
 		if (Objects.isNull(myCurrentWarehouse)) {
 			throw new CustomerException(403, "仓库信息不能为空");
 		}
@@ -656,6 +656,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 			distributionStockupSelfVO = distributionStockupMapper.stockupSelfOffShelf(stockupDTO);
 		} else {
 			//商 市
+			log.info(">>>> find bug {}",stockupDTO);
 			distributionStockupSelfVO = distributionStockupMapper.stockupOffShelf(stockupDTO);
 		}
 		//有