Merge branch 'dev' into pre-production

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

@@ -1570,8 +1570,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			}
 
 			//查询入库件数
-			updateStockArticleByextracted(warehouseId, stockArticleEntity);
-
+//			updateStockArticleByextracted(warehouseId, stockArticleEntity);
+			updateOrderInfo(stockArticleEntity.getOrderCode(),warehouseId);
 			log.info(">>>>> T updateOrdersInfo end");
 		}
 

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

@@ -1679,6 +1679,9 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 //			distributionStockArticleClient.updateOrderInfo(orderCode, warehouseId);
 //		}
 		List<String> orders = new ArrayList<>(orderSet);
+		if(orders.isEmpty()){
+			return Resp.scanSuccess("下架成功", "成功下架" + num + "件");
+		}
 
 		OrderPackageDTO orderPackageDTO1 = new OrderPackageDTO();
 		orderPackageDTO1.setWarehouseId(warehouseId);