1.修复接口查询的报错问题
2.增加库存模块的单据查询
This commit is contained in:
@@ -136,7 +136,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
{ "InventoryClass", "" },
|
||||
};
|
||||
|
||||
return await BaseLoad(cAccId, "Vendor", dict, input);
|
||||
return await BaseLoad(cAccId, "InventoryClass", dict, input);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -347,36 +347,61 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
{
|
||||
if ($"{o.Value}".EndsWith("%") || $"{o.Value}".StartsWith("%"))
|
||||
{
|
||||
conModels.Add(new ConditionalModel
|
||||
if (colList.Any(a=>string.Equals(a.Key, o.Key,StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase)))
|
||||
{
|
||||
FieldName = $"{o.Key}",
|
||||
ConditionalType = ConditionalType.Like,
|
||||
FieldValue = $"{o.Value}"
|
||||
});
|
||||
var col = colList.First(a =>
|
||||
string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) ||
|
||||
string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
conModels.Add(new ConditionalModel
|
||||
{
|
||||
FieldName = $"{col.Value}",
|
||||
ConditionalType = ConditionalType.Like,
|
||||
FieldValue = $"{o.Value}"
|
||||
});
|
||||
}
|
||||
}
|
||||
else if (o.Key.EndsWith("__2"))
|
||||
{
|
||||
conModels.Add(new ConditionalModel
|
||||
if (colList.Any(a => string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase)))
|
||||
{
|
||||
FieldName = $"{o.Key.Replace("__2", "")}",
|
||||
ConditionalType = ConditionalType.LessThanOrEqual,
|
||||
FieldValue = $"{o.Value}"
|
||||
});
|
||||
var col = colList.First(a =>
|
||||
string.Equals(a.Key, o.Key.Replace("__2", ""), StringComparison.OrdinalIgnoreCase) ||
|
||||
string.Equals(a.Value, o.Key.Replace("__2", ""), StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
conModels.Add(new ConditionalModel
|
||||
{
|
||||
FieldName = $"{col.Value}",
|
||||
ConditionalType = ConditionalType.LessThanOrEqual,
|
||||
FieldValue = $"{o.Value}"
|
||||
});
|
||||
}
|
||||
}
|
||||
else if (input.ContainsKey($"{o.Key}__2"))
|
||||
{
|
||||
conModels.Add(new ConditionalModel
|
||||
if (colList.Any(a => string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase)))
|
||||
{
|
||||
FieldName = $"{o.Key}",
|
||||
ConditionalType = ConditionalType.GreaterThanOrEqual,
|
||||
FieldValue = $"{o.Value}"
|
||||
});
|
||||
var col = colList.First(a =>
|
||||
string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) ||
|
||||
string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
conModels.Add(new ConditionalModel
|
||||
{
|
||||
FieldName = $"{col.Value}",
|
||||
ConditionalType = ConditionalType.GreaterThanOrEqual,
|
||||
FieldValue = $"{o.Value}"
|
||||
});
|
||||
}
|
||||
}
|
||||
else if (colList.Keys.Contains(o.Key) || colList.Values.Contains(o.Key))
|
||||
else if (colList.Any(a => string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) || string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase)))
|
||||
{
|
||||
var col = colList.First(a =>
|
||||
string.Equals(a.Key, o.Key, StringComparison.OrdinalIgnoreCase) ||
|
||||
string.Equals(a.Value, o.Key, StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
conModels.Add(new ConditionalModel
|
||||
{
|
||||
FieldName = o.Key,
|
||||
FieldName = col.Value,
|
||||
ConditionalType = ConditionalType.Equal,
|
||||
FieldValue = $"{o.Value}"
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user