Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -327,11 +327,11 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 		if(!Objects.isNull(parcelListEntity)){
 			String orderCode = parcelListEntity.getOrderCode();
 			parcelListEntity.setOrderPackageStatus("20");
-			parcelListEntity.setOrderPackageGroundingStatus("10");
+//			parcelListEntity.setOrderPackageGroundingStatus("10");
 
 			distributionParcelListClient.update(parcelListEntity);
 			distributionStockArticleClient.updateOrderInfo(orderCode,warehouseId);
-			warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCode,warehouseId,"系统在库下架解托");
+//			warehouseUpdownTypeClient.downPackageOrDelTray(orderPackageCode,warehouseId,"系统在库下架解托");
 		}
 	}