wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

执行代码清理，修复warning

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:59:12 +08:00
parent c6b8dfc861
commit 1dbb17f103
118 changed files with 5046 additions and 4111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
WarehouseMgr/Tnb.WarehouseMgr/WmsRouteMgrService.cs
View File

@@ -41,8 +41,8 @@ namespace Tnb.WarehouseMgr
{
if (input.data.ContainsKey(nameof(WmsRoad.startpoint_id)) && input.data.ContainsKey(nameof(WmsRoad.endpoint_id)))
{
var startPointId = input.data[nameof(WmsRoad.startpoint_id)].ToString();
var endPointId = input.data[nameof(WmsRoad.endpoint_id)].ToString();
string? startPointId = input.data[nameof(WmsRoad.startpoint_id)].ToString();
string? endPointId = input.data[nameof(WmsRoad.endpoint_id)].ToString();
if (string.Equals(startPointId, endPointId, StringComparison.OrdinalIgnoreCase))
{
throw new AppFriendlyException("起始点位不能等于终止点位", 500);
@@ -56,45 +56,59 @@ namespace Tnb.WarehouseMgr
private async Task<dynamic> DataImport(VisualDevImportDataInput input)
{
int row = 0;
var errorlist = new List<Dictionary<string, object>>();
VisualDevImportDataOutput result = new VisualDevImportDataOutput();
List<Dictionary<string, object>> errorlist = new();
VisualDevImportDataOutput result = new();
try
{
List<Dictionary<string, object>> dics = input.list;
List<WmsRoad> roads = new List<WmsRoad>();
List<string> pointCodes = new List<string>();
List<WmsRoad> roads = new();
List<string> pointCodes = new();
List<string> locCodes = new();
WmsRoad road = new WmsRoad();
WmsRoad road = new();
//遍历字典，找出需要查询数据库拿的相关字段
foreach (var d in dics)
foreach (Dictionary<string, object> d in dics)
{
if (d.Select(x => x.Value.ToString()).ToList().Find(v => v != "" && v != string.Empty && v != null) == null)
{
continue;
}
var sCode = d["startpoint_code"]?.ToString() ?? string.Empty;
var eCode = d["endpoint_code"]?.ToString() ?? string.Empty;
var dis = d["distance"]?.ToString() ?? string.Empty;
string sCode = d["startpoint_code"]?.ToString() ?? string.Empty;
string eCode = d["endpoint_code"]?.ToString() ?? string.Empty;
string dis = d["distance"]?.ToString() ?? string.Empty;
if (sCode == eCode)
{
throw new AppFriendlyException("起始点位不能等于终止点位", 500);
}
if (dis.IsEmpty())
{
throw new AppFriendlyException($"第{dics.IndexOf(d) + 1}个数据距离不可为空", 500);
}
pointCodes.Add(sCode);
pointCodes.Add(eCode);
d["create_time"] = DateTime.Now;
d.Remove("modify_time");
_ = d.Remove("modify_time");
road = d.Adapt<WmsRoad>();
roads.Add(road);
}
var points = await _db.Queryable<WmsPointH>().Where(it => pointCodes.FindAll(x => x.ToString().IsNotEmptyOrNull() && x.ToString() != "").Contains(it.point_code)).ToDictionaryAsync(x => x.point_code, x => x.id);
Dictionary<string, object> points = await _db.Queryable<WmsPointH>().Where(it => pointCodes.FindAll(x => x.ToString().IsNotEmptyOrNull() && x.ToString() != "").Contains(it.point_code)).ToDictionaryAsync(x => x.point_code, x => x.id);
if (!points.IsNullOrEmpty())
{
var orgId = _userManager.User.OrganizeId;
var userId = _userManager.UserId;
foreach (var r in roads)
string orgId = _userManager.User.OrganizeId;
string userId = _userManager.UserId;
foreach (WmsRoad r in roads)
{
if (!points.ContainsKey(r.startpoint_code)) throw new AppFriendlyException($"第{roads.IndexOf(r) + 1}个数据的起始点位编号有误", 500);
if (!points.ContainsKey(r.endpoint_code)) throw new AppFriendlyException($"第{roads.IndexOf(r) + 1}个数据的终止点位编号有误", 500);
if (!points.ContainsKey(r.startpoint_code))
{
throw new AppFriendlyException($"第{roads.IndexOf(r) + 1}个数据的起始点位编号有误", 500);
}
if (!points.ContainsKey(r.endpoint_code))
{
throw new AppFriendlyException($"第{roads.IndexOf(r) + 1}个数据的终止点位编号有误", 500);
}
r.id = SnowflakeIdHelper.NextId();
r.org_id = orgId;
r.startpoint_id = points[r.startpoint_code]?.ToString() ?? throw new AppFriendlyException($"第{roads.IndexOf(r) + 1}个数据的起始点位编号有误", 500);