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

169
QcMgr/Tnb.QcMgr/QcCheckItemService.cs
View File

@@ -34,14 +34,14 @@ namespace Tnb.QcMgr
private async Task Delete(string id)
{
var db = _repository.AsSugarClient();
var QcCheckItemsH = await db.Queryable<QcCheckItemsH>().Where(p => p.id == id).FirstAsync();
var QcCheckItemsRs = await db.Queryable<QcCheckItemsR>().Where(p => p.itemshid == id).ToListAsync();
var QcCheckItemsDs = await db.Queryable<QcCheckItemsD>().Where(p => QcCheckItemsRs.Select(p => p.itemsdid).ToList().Contains(p.id)).ToListAsync();
ISqlSugarClient db = _repository.AsSugarClient();
QcCheckItemsH QcCheckItemsH = await db.Queryable<QcCheckItemsH>().Where(p => p.id == id).FirstAsync();
List<QcCheckItemsR> QcCheckItemsRs = await db.Queryable<QcCheckItemsR>().Where(p => p.itemshid == id).ToListAsync();
List<QcCheckItemsD> QcCheckItemsDs = await db.Queryable<QcCheckItemsD>().Where(p => QcCheckItemsRs.Select(p => p.itemsdid).ToList().Contains(p.id)).ToListAsync();
await db.Ado.BeginTranAsync();
await db.Deleteable(QcCheckItemsH).ExecuteCommandAsync();
await db.Deleteable(QcCheckItemsRs).ExecuteCommandAsync();
await db.Deleteable(QcCheckItemsDs).ExecuteCommandAsync();
_ = await db.Deleteable(QcCheckItemsH).ExecuteCommandAsync();
_ = await db.Deleteable(QcCheckItemsRs).ExecuteCommandAsync();
_ = await db.Deleteable(QcCheckItemsDs).ExecuteCommandAsync();
await db.Ado.CommitTranAsync();
}
@@ -52,33 +52,37 @@ namespace Tnb.QcMgr
[HttpGet]
public async Task<dynamic> GetCheckItem()
{
var db = _repository.AsSugarClient();
List<CheckItemOut> CheckItemOuts = new List<CheckItemOut>();
ISqlSugarClient db = _repository.AsSugarClient();
List<CheckItemOut> CheckItemOuts = new();
var datas = await db.Queryable<QcCheckItem>().InnerJoin<QcCheckType>((a, b) => a.type == b.id).Select((a, b) => new
{
id = a.id,
name = a.name,
code = a.code,
type = a.type,
a.id,
a.name,
a.code,
a.type,
typename = b.name
}).ToListAsync();
foreach (var data in datas)
{
if (CheckItemOuts.Where(p => p.checktypeid == data.type).Any())
{
var CheckItemOut = CheckItemOuts.Where(p => p.checktypeid == data.type).First();
CheckItemOut CheckItemOut = CheckItemOuts.Where(p => p.checktypeid == data.type).First();
if (CheckItemOut.items == null)
{
CheckItemOut.items = new List<CheckItem>();
CheckItemOut.items.Add(new CheckItem { itemid = data.id, name = data.name!, code = data.code! });
CheckItemOut.items = new List<CheckItem>
{
new CheckItem { itemid = data.id, name = data.name!, code = data.code! }
};
}
else
{
CheckItemOut.items.Add(new CheckItem { itemid = data.id, name = data.name!, code = data.code! });
}
}
else
{
CheckItemOuts.Add(new CheckItemOut { checktypeid = data.type!, checktypename = data.typename!, items = new List<CheckItem>() });
var CheckItemOut = CheckItemOuts.Where(p => p.checktypeid == data.type).First();
CheckItemOut CheckItemOut = CheckItemOuts.Where(p => p.checktypeid == data.type).First();
CheckItemOut.items?.Add(new CheckItem() { itemid = data.id, name = data.name!, code = data.code! });
}
}
@@ -93,68 +97,92 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task<dynamic> GetCheckItems(CheckItemsInput CheckItemsInput)
{
var db = _repository.AsSugarClient();
var QcCheckItems = await db.Queryable<QcCheckItem>().ToListAsync();
var QcCheckTypes = await db.Queryable<QcCheckType>().ToListAsync();
var QcCheckItemsH = await db.Queryable<QcCheckItemsH>().Where(p => p.id == CheckItemsInput.id).FirstAsync();
List<QcCheckItemsR> QcCheckItemsRs = new List<QcCheckItemsR>();
List<QcCheckItemsD> QcCheckItemsDs = new List<QcCheckItemsD>();
ISqlSugarClient db = _repository.AsSugarClient();
List<QcCheckItem> QcCheckItems = await db.Queryable<QcCheckItem>().ToListAsync();
List<QcCheckType> QcCheckTypes = await db.Queryable<QcCheckType>().ToListAsync();
QcCheckItemsH QcCheckItemsH = await db.Queryable<QcCheckItemsH>().Where(p => p.id == CheckItemsInput.id).FirstAsync();
List<QcCheckItemsR> QcCheckItemsRs = new();
List<QcCheckItemsD> QcCheckItemsDs = new();
if (QcCheckItemsH != null)
{
QcCheckItemsRs = await db.Queryable<QcCheckItemsR>().Where(p => p.itemshid == QcCheckItemsH.id).ToListAsync();
if (QcCheckItemsRs != null)
{
QcCheckItemsDs = await db.Queryable<QcCheckItemsD>().Where(p => QcCheckItemsRs.Select(p => p.itemsdid).ToList().Contains(p.id)).ToListAsync();
}
}
else
{
throw Oops.Oh(ErrorCode.COM1005);
var CheckItemsOut = new CheckItemsOut();
CheckItemsOut.id = QcCheckItemsH.id;
CheckItemsOut.name = QcCheckItemsH.name!;
CheckItemsOut.status = QcCheckItemsH.status!;
CheckItemsOut.checktypes = new List<CheckTypeOut>();
}
CheckItemsOut CheckItemsOut = new()
{
id = QcCheckItemsH.id,
name = QcCheckItemsH.name!,
status = QcCheckItemsH.status!,
checktypes = new List<CheckTypeOut>()
};
if (QcCheckItemsRs != null && QcCheckItemsDs != null)
{
foreach (var QcCheckItemsR in QcCheckItemsRs)
foreach (QcCheckItemsR QcCheckItemsR in QcCheckItemsRs)
{
if (CheckItemsOut.checktypes.Where(p => p.checktypeid == QcCheckItemsR.typeid).ToList().Count == 0)
{
CheckTypeOut checkType = new CheckTypeOut();
checkType.checktypeid = QcCheckItemsR.typeid!;
checkType.checktypename = QcCheckTypes.Where(p => p.id == QcCheckItemsR.typeid).First().name!;
checkType.items = new List<ItemOut>();
CheckTypeOut checkType = new()
{
checktypeid = QcCheckItemsR.typeid!,
checktypename = QcCheckTypes.Where(p => p.id == QcCheckItemsR.typeid).First().name!,
items = new List<ItemOut>()
};
CheckItemsOut.checktypes.Add(checkType);
}
var item = QcCheckItemsDs.Where(p => p.id == QcCheckItemsR.itemsdid).FirstOrDefault();
QcCheckItemsD? item = QcCheckItemsDs.Where(p => p.id == QcCheckItemsR.itemsdid).FirstOrDefault();
if (item != null)
{
ItemOut Item = new ItemOut();
Item.itemid = QcCheckItemsR.itemid!;
Item.itemdid = item.id!;
Item.code = QcCheckItems.Where(p => p.id == QcCheckItemsR.itemid).First().code!;
Item.name = QcCheckItems.Where(p => p.id == QcCheckItemsR.itemid).First().name!;
Item.setData = new Data();
Item.setData.extype = item.extype!;
Item.setData.excontent = JSON.Deserialize<Excontent>(item.excontent!);
Item.setData.check = item.check!;
ItemOut Item = new()
{
itemid = QcCheckItemsR.itemid!,
itemdid = item.id!,
code = QcCheckItems.Where(p => p.id == QcCheckItemsR.itemid).First().code!,
name = QcCheckItems.Where(p => p.id == QcCheckItemsR.itemid).First().name!,
setData = new Data
{
extype = item.extype!,
excontent = JSON.Deserialize<Excontent>(item.excontent!),
check = item.check!
}
};
if (!string.IsNullOrEmpty(item.errorcause))
{
Item.setData.errorcause = item.errorcause!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
}
if (!string.IsNullOrEmpty(item.errorlevel))
{
Item.setData.errorlevel = item.errorlevel!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
}
Item.setData.remark = item.remark!;
Item.setData.attachment = item.attachment!;
Item.setData.customer = item.custom!;
if (!string.IsNullOrEmpty(item.isexec))
{
Item.setData.isexec = JSON.Deserialize<Isexec>(item.isexec!);
Item.setShow = new Show();
Item.setShow.extype = !string.IsNullOrEmpty(Item.setData.extype);
Item.setShow.excontent = !string.IsNullOrEmpty(item.excontent);
Item.setShow.check = !string.IsNullOrEmpty(Item.setData.check);
Item.setShow.errorcause = Item.setData.errorcause == null ? false : true;
Item.setShow.errorlevel = Item.setData.errorlevel == null ? false : true;
Item.setShow.remark = !string.IsNullOrEmpty(Item.setData.remark);
Item.setShow.attachment = !string.IsNullOrEmpty(Item.setData.attachment);
Item.setShow.customer = !string.IsNullOrEmpty(Item.setData.customer);
Item.setShow.isexec = Item.setData.isexec == null ? false : true;
}
Item.setShow = new Show
{
extype = !string.IsNullOrEmpty(Item.setData.extype),
excontent = !string.IsNullOrEmpty(item.excontent),
check = !string.IsNullOrEmpty(Item.setData.check),
errorcause = Item.setData.errorcause != null,
errorlevel = Item.setData.errorlevel != null,
remark = !string.IsNullOrEmpty(Item.setData.remark),
attachment = !string.IsNullOrEmpty(Item.setData.attachment),
customer = !string.IsNullOrEmpty(Item.setData.customer),
isexec = Item.setData.isexec != null
};
CheckItemsOut.checktypes.Where(p => p.checktypeid == QcCheckItemsR.typeid).First().items?.Add(Item);
}
}
@@ -171,27 +199,32 @@ namespace Tnb.QcMgr
[HttpPost]
public async Task SaveData(CheckItemsInput CheckItemsInput)
{
var db = _repository.AsSugarClient();
ISqlSugarClient db = _repository.AsSugarClient();
try
{
if (!string.IsNullOrEmpty(CheckItemsInput.id))
{
await Delete(CheckItemsInput.id);
QcCheckItemsH QcCheckItemsH = new QcCheckItemsH();
QcCheckItemsH.name = CheckItemsInput.name;
QcCheckItemsH.status = CheckItemsInput.status;
QcCheckItemsH.create_time = DateTime.Now;
QcCheckItemsH.create_id = _userManager.UserId;
List<QcCheckItemsR> QcCheckItemsRs = new List<QcCheckItemsR>();
List<QcCheckItemsD> QcCheckItemsDs = new List<QcCheckItemsD>();
}
QcCheckItemsH QcCheckItemsH = new()
{
name = CheckItemsInput.name,
status = CheckItemsInput.status,
create_time = DateTime.Now,
create_id = _userManager.UserId
};
List<QcCheckItemsR> QcCheckItemsRs = new();
List<QcCheckItemsD> QcCheckItemsDs = new();
if (CheckItemsInput.checktypes != null)
{
foreach (var checktype in CheckItemsInput.checktypes)
foreach (CheckTypeInput checktype in CheckItemsInput.checktypes)
{
if (checktype.items != null)
{
foreach (var item in checktype.items)
foreach (ItemInput item in checktype.items)
{
var QcCheckItemsD = new QcCheckItemsD()
QcCheckItemsD QcCheckItemsD = new()
{
extype = item.extype,
excontent = item.excontent,
@@ -204,7 +237,7 @@ namespace Tnb.QcMgr
custom = item.customer
};
QcCheckItemsDs.Add(QcCheckItemsD);
var QcCheckItemsR = new QcCheckItemsR()
QcCheckItemsR QcCheckItemsR = new()
{
itemshid = QcCheckItemsH.id,
typeid = checktype.id,
@@ -224,9 +257,9 @@ namespace Tnb.QcMgr
});
await db.Ado.BeginTranAsync();
await db.Insertable(QcCheckItemsH).ExecuteCommandAsync();
await db.Insertable(QcCheckItemsRs).ExecuteCommandAsync();
await db.Insertable(QcCheckItemsDs).ExecuteCommandAsync();
_ = await db.Insertable(QcCheckItemsH).ExecuteCommandAsync();
_ = await db.Insertable(QcCheckItemsRs).ExecuteCommandAsync();
_ = await db.Insertable(QcCheckItemsDs).ExecuteCommandAsync();
await db.Ado.CommitTranAsync();
}
catch (Exception)