|
|
@@ -102,8 +102,8 @@ def soil_bulk_density(arr): #arr为计算过的数组
|
|
|
# soilContent.append('')
|
|
|
# soilContentTarget.append('')
|
|
|
# 如果pH＞7,则洗失量数据不能为空；
|
|
|
- if (not pd.isna(row['pH']) and row['pH'] > 7 and pd.isna(row['洗失量(吸管法需填)%']) and (pd.isna(row['0.2-0.02mm颗粒含量%']) or pd.isna(row['0.02-0.002mm颗粒含量%']))):
|
|
|
- xSLErr.append('洗失量：ph>7但洗失量未检测。')
|
|
|
+ if (not pd.isna(row['pH']) and row['pH'] > 7 and pd.isna(row['洗失量(吸管法需填)%']) and (not pd.isna(row['0.2-0.02mm颗粒含量%']) or not pd.isna(row['0.02-0.002mm颗粒含量%']))):
|
|
|
+ xSLErr.append('洗失量：机械组成不为空，ph>7但洗失量未检测。')
|
|
|
xSLTarget.append('洗失量。')
|
|
|
else:
|
|
|
xSLErr.append('')
|
