执行代码清理,修复warning
This commit is contained in:
@@ -41,21 +41,21 @@ namespace Tnb.QcMgr
|
||||
}
|
||||
private async Task Delete(string id)
|
||||
{
|
||||
var db = _repository.AsSugarClient();
|
||||
var QcCheckPlanH = await db.Queryable<QcCheckPlanH>().Where(p => p.id == id).FirstAsync();
|
||||
var QcCheckPlanDs = await db.Queryable<QcCheckPlanD>().Where(p => p.mainid == id).ToListAsync();
|
||||
var QcCheckPlanAdds = await db.Queryable<QcCheckPlanAdd>().Where(p => p.mainid == id).ToListAsync();
|
||||
var QcCheckPlanMaterials = await db.Queryable<QcCheckPlanMaterial>().Where(p => p.planid == id).ToListAsync();
|
||||
var QcCheckPlanProcesss = await db.Queryable<QcCheckPlanProcess>().Where(p => p.planid == id).ToListAsync();
|
||||
var QcCheckPlanWorks = await db.Queryable<QcCheckPlanWork>().Where(p => p.planid == id).ToListAsync();
|
||||
ISqlSugarClient db = _repository.AsSugarClient();
|
||||
QcCheckPlanH QcCheckPlanH = await db.Queryable<QcCheckPlanH>().Where(p => p.id == id).FirstAsync();
|
||||
List<QcCheckPlanD> QcCheckPlanDs = await db.Queryable<QcCheckPlanD>().Where(p => p.mainid == id).ToListAsync();
|
||||
List<QcCheckPlanAdd> QcCheckPlanAdds = await db.Queryable<QcCheckPlanAdd>().Where(p => p.mainid == id).ToListAsync();
|
||||
List<QcCheckPlanMaterial> QcCheckPlanMaterials = await db.Queryable<QcCheckPlanMaterial>().Where(p => p.planid == id).ToListAsync();
|
||||
List<QcCheckPlanProcess> QcCheckPlanProcesss = await db.Queryable<QcCheckPlanProcess>().Where(p => p.planid == id).ToListAsync();
|
||||
List<QcCheckPlanWork> QcCheckPlanWorks = await db.Queryable<QcCheckPlanWork>().Where(p => p.planid == id).ToListAsync();
|
||||
await _timeTaskService.DeleteByName("生成质检任务" + QcCheckPlanH.id);
|
||||
await db.Ado.BeginTranAsync();
|
||||
await db.Deleteable(QcCheckPlanH).ExecuteCommandAsync();
|
||||
await db.Deleteable(QcCheckPlanDs).ExecuteCommandAsync();
|
||||
await db.Deleteable(QcCheckPlanAdds).ExecuteCommandAsync();
|
||||
await db.Deleteable(QcCheckPlanMaterials).ExecuteCommandAsync();
|
||||
await db.Deleteable(QcCheckPlanProcesss).ExecuteCommandAsync();
|
||||
await db.Deleteable(QcCheckPlanWorks).ExecuteCommandAsync();
|
||||
_ = await db.Deleteable(QcCheckPlanH).ExecuteCommandAsync();
|
||||
_ = await db.Deleteable(QcCheckPlanDs).ExecuteCommandAsync();
|
||||
_ = await db.Deleteable(QcCheckPlanAdds).ExecuteCommandAsync();
|
||||
_ = await db.Deleteable(QcCheckPlanMaterials).ExecuteCommandAsync();
|
||||
_ = await db.Deleteable(QcCheckPlanProcesss).ExecuteCommandAsync();
|
||||
_ = await db.Deleteable(QcCheckPlanWorks).ExecuteCommandAsync();
|
||||
await db.Ado.CommitTranAsync();
|
||||
}
|
||||
/// <summary>
|
||||
@@ -66,15 +66,17 @@ namespace Tnb.QcMgr
|
||||
[HttpPost]
|
||||
public async Task<dynamic> GetCheckItems(string id)
|
||||
{
|
||||
var db = _repository.AsSugarClient();
|
||||
var QcCheckItems = await db.Queryable<QcCheckItem>().ToListAsync();
|
||||
var QcCheckTypes = await db.Queryable<QcCheckType>().ToListAsync();
|
||||
var QcCheckPlanAdd = await db.Queryable<QcCheckPlanAdd>().Where(p => p.mainid == id).FirstAsync();
|
||||
var QcCheckPlanDs = await db.Queryable<QcCheckPlanD>().Where(p => p.mainid == id).ToListAsync();
|
||||
var CheckPlansOut = new CheckPlansOut();
|
||||
CheckPlansOut.id = id;
|
||||
CheckPlansOut.hasadd = false;
|
||||
CheckPlansOut.hasitem = false;
|
||||
ISqlSugarClient db = _repository.AsSugarClient();
|
||||
List<QcCheckItem> QcCheckItems = await db.Queryable<QcCheckItem>().ToListAsync();
|
||||
List<QcCheckType> QcCheckTypes = await db.Queryable<QcCheckType>().ToListAsync();
|
||||
QcCheckPlanAdd QcCheckPlanAdd = await db.Queryable<QcCheckPlanAdd>().Where(p => p.mainid == id).FirstAsync();
|
||||
List<QcCheckPlanD> QcCheckPlanDs = await db.Queryable<QcCheckPlanD>().Where(p => p.mainid == id).ToListAsync();
|
||||
CheckPlansOut CheckPlansOut = new()
|
||||
{
|
||||
id = id,
|
||||
hasadd = false,
|
||||
hasitem = false
|
||||
};
|
||||
if (QcCheckPlanAdd != null)
|
||||
{
|
||||
CheckPlansOut.hasadd = true;
|
||||
@@ -87,54 +89,61 @@ namespace Tnb.QcMgr
|
||||
{
|
||||
CheckPlansOut.hasitem = true;
|
||||
CheckPlansOut.checktypes = new List<CheckPlanTypeOut>();
|
||||
foreach (var QcCheckPlanD in QcCheckPlanDs)
|
||||
foreach (QcCheckPlanD QcCheckPlanD in QcCheckPlanDs)
|
||||
{
|
||||
if (CheckPlansOut.checktypes.Where(p => p.checktypeid == QcCheckPlanD.typeid).ToList().Count == 0)
|
||||
{
|
||||
CheckPlanTypeOut checkType = new CheckPlanTypeOut();
|
||||
checkType.checktypeid = QcCheckPlanD.typeid!;
|
||||
checkType.checktypename = QcCheckTypes.Where(p => p.id == QcCheckPlanD.typeid).First().name!;
|
||||
checkType.items = new List<PlanItemOut>();
|
||||
CheckPlanTypeOut checkType = new()
|
||||
{
|
||||
checktypeid = QcCheckPlanD.typeid!,
|
||||
checktypename = QcCheckTypes.Where(p => p.id == QcCheckPlanD.typeid).First().name!,
|
||||
items = new List<PlanItemOut>()
|
||||
};
|
||||
CheckPlansOut.checktypes.Add(checkType);
|
||||
}
|
||||
PlanItemOut Item = new PlanItemOut();
|
||||
Item.itemid = QcCheckPlanD.itemid!;
|
||||
Item.itemdid = QcCheckPlanD.id!;
|
||||
Item.code = QcCheckItems.Where(p => p.id == QcCheckPlanD.itemid).First().code!;
|
||||
Item.name = QcCheckItems.Where(p => p.id == QcCheckPlanD.itemid).First().name!;
|
||||
Item.setData = new PlanItemData();
|
||||
Item.setData.extype = QcCheckPlanD.extype!;
|
||||
Item.setData.excontent = JSON.Deserialize<Excontent>(QcCheckPlanD.excontent!);
|
||||
Item.setData.check = QcCheckPlanD.check!;
|
||||
PlanItemOut Item = new()
|
||||
{
|
||||
itemid = QcCheckPlanD.itemid!,
|
||||
itemdid = QcCheckPlanD.id!,
|
||||
code = QcCheckItems.Where(p => p.id == QcCheckPlanD.itemid).First().code!,
|
||||
name = QcCheckItems.Where(p => p.id == QcCheckPlanD.itemid).First().name!,
|
||||
setData = new PlanItemData
|
||||
{
|
||||
extype = QcCheckPlanD.extype!,
|
||||
excontent = JSON.Deserialize<Excontent>(QcCheckPlanD.excontent!),
|
||||
check = QcCheckPlanD.check!
|
||||
}
|
||||
};
|
||||
if (!string.IsNullOrEmpty(QcCheckPlanD.errorcause))
|
||||
{
|
||||
Item.setData.errorcause = QcCheckPlanD.errorcause!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(QcCheckPlanD.errorlevel))
|
||||
{
|
||||
Item.setData.errorlevel = QcCheckPlanD.errorlevel!.Replace("[", "").Replace("]", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
|
||||
}
|
||||
|
||||
Item.setData.remark = QcCheckPlanD.remark!;
|
||||
Item.setData.attachment = QcCheckPlanD.attachment!;
|
||||
Item.setData.customer = QcCheckPlanD.custom!;
|
||||
if (!string.IsNullOrEmpty(QcCheckPlanD.isexec))
|
||||
{
|
||||
Item.setData.isexec = JSON.Deserialize<IsexecP>(QcCheckPlanD.isexec!);
|
||||
Item.setShow = new PlanItemShow();
|
||||
Item.setShow.extype = !string.IsNullOrEmpty(Item.setData.extype);
|
||||
Item.setShow.excontent = !string.IsNullOrEmpty(QcCheckPlanD.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);
|
||||
if (Item.setData.isexec == null)
|
||||
{
|
||||
Item.setShow.isexec = false;
|
||||
}
|
||||
else
|
||||
|
||||
Item.setShow = new PlanItemShow
|
||||
{
|
||||
if (!Item.setData.isexec.attachment && !Item.setData.isexec.remark)
|
||||
Item.setShow.isexec = false;
|
||||
else
|
||||
Item.setShow.isexec = true;
|
||||
}
|
||||
extype = !string.IsNullOrEmpty(Item.setData.extype),
|
||||
excontent = !string.IsNullOrEmpty(QcCheckPlanD.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)
|
||||
};
|
||||
Item.setShow.isexec = Item.setData.isexec != null && (Item.setData.isexec.attachment || Item.setData.isexec.remark);
|
||||
|
||||
CheckPlansOut.checktypes.Where(p => p.checktypeid == QcCheckPlanD.typeid).First()?.items?.Add(Item);
|
||||
}
|
||||
@@ -150,18 +159,20 @@ namespace Tnb.QcMgr
|
||||
[HttpPost]
|
||||
public async Task<dynamic> GetTriggerPlans()
|
||||
{
|
||||
var db = _repository.AsSugarClient();
|
||||
var QcTriggerPlans = await db.Queryable<QcTriggerPlan>().ToListAsync();
|
||||
var QcTriggerEvents = await db.Queryable<QcTriggerEvent>().ToListAsync();
|
||||
List<TriggerPlan> TriggerPlans = new List<TriggerPlan>();
|
||||
foreach (var triggerPlan in QcTriggerPlans)
|
||||
ISqlSugarClient db = _repository.AsSugarClient();
|
||||
List<QcTriggerPlan> QcTriggerPlans = await db.Queryable<QcTriggerPlan>().ToListAsync();
|
||||
List<QcTriggerEvent> QcTriggerEvents = await db.Queryable<QcTriggerEvent>().ToListAsync();
|
||||
List<TriggerPlan> TriggerPlans = new();
|
||||
foreach (QcTriggerPlan triggerPlan in QcTriggerPlans)
|
||||
{
|
||||
TriggerPlan TriggerPlan = new TriggerPlan();
|
||||
TriggerPlan.id = triggerPlan.id;
|
||||
TriggerPlan.name = triggerPlan.name!;
|
||||
TriggerPlan.code = triggerPlan.code!;
|
||||
TriggerPlan.type = triggerPlan.type!;
|
||||
TriggerPlan.cycle = triggerPlan.cycle!;
|
||||
TriggerPlan TriggerPlan = new()
|
||||
{
|
||||
id = triggerPlan.id,
|
||||
name = triggerPlan.name!,
|
||||
code = triggerPlan.code!,
|
||||
type = triggerPlan.type!,
|
||||
cycle = triggerPlan.cycle!
|
||||
};
|
||||
if (!string.IsNullOrEmpty(triggerPlan.trievent))
|
||||
{
|
||||
TriggerPlan.trieventid = triggerPlan.trievent!.Replace("[", "").Replace("]", "").Replace("\r\n", "").Replace("\"", "").Replace(" ", "").Split(',', StringSplitOptions.RemoveEmptyEntries);
|
||||
@@ -180,69 +191,81 @@ namespace Tnb.QcMgr
|
||||
[HttpPost]
|
||||
public async Task SaveData(CheckPlanInput CheckPlanInput)
|
||||
{
|
||||
var db = _repository.AsSugarClient();
|
||||
ISqlSugarClient db = _repository.AsSugarClient();
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrEmpty(CheckPlanInput.mainid))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
await _timeTaskService.DeleteByName("生成质检任务" + CheckPlanInput.mainid);
|
||||
await db.Deleteable<QcCheckPlanD>(p => p.mainid == CheckPlanInput.mainid).ExecuteCommandAsync();
|
||||
await db.Deleteable<QcCheckPlanAdd>(p => p.mainid == CheckPlanInput.mainid).ExecuteCommandAsync();
|
||||
QcCheckPlanAdd QcCheckPlanAdd = new QcCheckPlanAdd();
|
||||
QcCheckPlanAdd.mainid = CheckPlanInput.mainid;
|
||||
QcCheckPlanAdd.triggertype = CheckPlanInput.triggertype;
|
||||
QcCheckPlanAdd.content = CheckPlanInput.content;
|
||||
QcCheckPlanAdd.number = CheckPlanInput.number;
|
||||
List<QcCheckPlanD> QcCheckPlanDs = new List<QcCheckPlanD>();
|
||||
_ = await db.Deleteable<QcCheckPlanD>(p => p.mainid == CheckPlanInput.mainid).ExecuteCommandAsync();
|
||||
_ = await db.Deleteable<QcCheckPlanAdd>(p => p.mainid == CheckPlanInput.mainid).ExecuteCommandAsync();
|
||||
QcCheckPlanAdd QcCheckPlanAdd = new()
|
||||
{
|
||||
mainid = CheckPlanInput.mainid,
|
||||
triggertype = CheckPlanInput.triggertype,
|
||||
content = CheckPlanInput.content,
|
||||
number = CheckPlanInput.number
|
||||
};
|
||||
List<QcCheckPlanD> QcCheckPlanDs = new();
|
||||
if (CheckPlanInput.checktypes != null)
|
||||
{
|
||||
foreach (var checktype in CheckPlanInput.checktypes)
|
||||
foreach (CheckPlanTypeInput checktype in CheckPlanInput.checktypes)
|
||||
{
|
||||
if (checktype.items != null)
|
||||
{
|
||||
foreach (var item in checktype.items)
|
||||
foreach (PlanItemInput item in checktype.items)
|
||||
{
|
||||
QcCheckPlanD QcCheckPlanD = new QcCheckPlanD();
|
||||
QcCheckPlanD.mainid = CheckPlanInput.mainid;
|
||||
QcCheckPlanD.typeid = checktype.id;
|
||||
QcCheckPlanD.itemid = item.itemid;
|
||||
QcCheckPlanD.extype = item.extype;
|
||||
QcCheckPlanD.excontent = item.excontent;
|
||||
QcCheckPlanD.check = item.check;
|
||||
QcCheckPlanD.errorcause = item.errorcause?.Replace("\"", "").Trim();
|
||||
QcCheckPlanD.errorlevel = item.errorlevel?.Replace("\"", "").Trim();
|
||||
QcCheckPlanD.remark = item.remark;
|
||||
QcCheckPlanD.attachment = item.attachment;
|
||||
QcCheckPlanD.isexec = item.isexec;
|
||||
QcCheckPlanD.custom = item.customer;
|
||||
QcCheckPlanD.create_id = _userManager.UserId;
|
||||
QcCheckPlanD.create_time = DateTime.Now;
|
||||
QcCheckPlanD QcCheckPlanD = new()
|
||||
{
|
||||
mainid = CheckPlanInput.mainid,
|
||||
typeid = checktype.id,
|
||||
itemid = item.itemid,
|
||||
extype = item.extype,
|
||||
excontent = item.excontent,
|
||||
check = item.check,
|
||||
errorcause = item.errorcause?.Replace("\"", "").Trim(),
|
||||
errorlevel = item.errorlevel?.Replace("\"", "").Trim(),
|
||||
remark = item.remark,
|
||||
attachment = item.attachment,
|
||||
isexec = item.isexec,
|
||||
custom = item.customer,
|
||||
create_id = _userManager.UserId,
|
||||
create_time = DateTime.Now
|
||||
};
|
||||
QcCheckPlanDs.Add(QcCheckPlanD);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
await db.Ado.BeginTranAsync();
|
||||
await db.Insertable(QcCheckPlanDs).ExecuteCommandAsync();
|
||||
await db.Insertable(QcCheckPlanAdd).ExecuteCommandAsync();
|
||||
_ = await db.Insertable(QcCheckPlanDs).ExecuteCommandAsync();
|
||||
_ = await db.Insertable(QcCheckPlanAdd).ExecuteCommandAsync();
|
||||
await db.Ado.CommitTranAsync();
|
||||
if (QcCheckPlanAdd.triggertype == ((int)EnumTriggerType.周期触发).ToString() || QcCheckPlanAdd.triggertype == ((int)EnumTriggerType.一次性).ToString())
|
||||
{
|
||||
var comtentModel = new ContentModel();
|
||||
comtentModel.cron = QcCheckPlanAdd.content!.Replace("\"", "");
|
||||
comtentModel.interfaceId = "";
|
||||
comtentModel.interfaceName = "";
|
||||
comtentModel.parameter = new List<InterfaceParameter>();
|
||||
ContentModel comtentModel = new()
|
||||
{
|
||||
cron = QcCheckPlanAdd.content!.Replace("\"", ""),
|
||||
interfaceId = "",
|
||||
interfaceName = "",
|
||||
parameter = new List<InterfaceParameter>()
|
||||
};
|
||||
comtentModel.parameter!.Add(new InterfaceParameter() { field = "id", value = QcCheckPlanAdd.mainid, defaultValue = "" });
|
||||
if (QcCheckPlanAdd.triggertype == ((int)EnumTriggerType.一次性).ToString())
|
||||
{
|
||||
comtentModel.parameter!.Add(new InterfaceParameter() { field = "doonce", value = true.ToString(), defaultValue = "" });
|
||||
}
|
||||
|
||||
comtentModel.localHostTaskId = "QcTaskTimeWorker/CreateTask";
|
||||
comtentModel.startTime = DateTimeOffset.Now.ToUnixTimeMilliseconds();
|
||||
comtentModel.TenantId = _userManager?.TenantId!;
|
||||
comtentModel.TenantDbName = _userManager?.TenantDbName!;
|
||||
comtentModel.ConnectionConfig = _userManager?.ConnectionConfig!;
|
||||
comtentModel.Token = _userManager?.ToKen!;
|
||||
TimeTaskCrInput timeTaskCrInput = new TimeTaskCrInput()
|
||||
TimeTaskCrInput timeTaskCrInput = new()
|
||||
{
|
||||
enCode = DateTime.Now.ToString("yyyyMMddHHmmss"),
|
||||
fullName = "生成质检任务" + QcCheckPlanAdd.mainid,
|
||||
@@ -271,7 +294,7 @@ namespace Tnb.QcMgr
|
||||
[HttpPost]
|
||||
public async Task CreateTask(TriggerPlanEntity entity)
|
||||
{
|
||||
var Query = _repository.AsSugarClient().Queryable<QcCheckPlanH, QcCheckPlanAdd, QcCheckPlanMaterial, QcCheckPlanProcess, QcCheckPlanWork>
|
||||
ISugarQueryable<QcCheckPlanH, QcCheckPlanAdd, QcCheckPlanMaterial, QcCheckPlanProcess, QcCheckPlanWork> Query = _repository.AsSugarClient().Queryable<QcCheckPlanH, QcCheckPlanAdd, QcCheckPlanMaterial, QcCheckPlanProcess, QcCheckPlanWork>
|
||||
((a, b, c, d, e) => new object[] {
|
||||
JoinType.Inner,a.id== b.mainid,
|
||||
JoinType.Left,a.id == c.planid,
|
||||
@@ -279,9 +302,9 @@ namespace Tnb.QcMgr
|
||||
JoinType.Left,a.id == e.planid,
|
||||
});
|
||||
GetQuery(Query, entity);
|
||||
var list = await Query.ToListAsync();
|
||||
List<string> removes = new List<string>();
|
||||
foreach (var data in list)
|
||||
List<QcCheckPlanH> list = await Query.ToListAsync();
|
||||
List<string> removes = new();
|
||||
foreach (QcCheckPlanH data in list)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(entity.materialid))
|
||||
{
|
||||
@@ -322,25 +345,27 @@ namespace Tnb.QcMgr
|
||||
// .WhereIF(!string.IsNullOrEmpty(entity.workid), (a, b, c, d, e) => e.workid == entity.workid).ToListAsync();
|
||||
Filter(list, entity);
|
||||
if (list.Count > 0)
|
||||
{
|
||||
await SaveTask(list, entity);
|
||||
}
|
||||
}
|
||||
private void GetQuery(ISugarQueryable<QcCheckPlanH, QcCheckPlanAdd, QcCheckPlanMaterial, QcCheckPlanProcess, QcCheckPlanWork> Query, TriggerPlanEntity entity)
|
||||
{
|
||||
var DictionaryData = _repository.AsSugarClient().Queryable<DictionaryDataEntity, DictionaryTypeEntity>
|
||||
List<DictionaryDataEntity> DictionaryData = _repository.AsSugarClient().Queryable<DictionaryDataEntity, DictionaryTypeEntity>
|
||||
((a, b) => new object[] { JoinType.Left, a.DictionaryTypeId == b.Id, })
|
||||
.Where((a, b) => b.FullName == "质检类型选择").ToList();
|
||||
var TriggerEvent = new QcTriggerEvent();
|
||||
var enumTriggerEvent = entity.triggerevent;
|
||||
var remark = RemarkAttribute.GetRemark(enumTriggerEvent);
|
||||
var type = DictionaryData.Where(p => p.FullName == remark.CheckType).First().Id;
|
||||
QcTriggerEvent TriggerEvent = new();
|
||||
EnumTriggerEvent? enumTriggerEvent = entity.triggerevent;
|
||||
RemarkAttribute remark = RemarkAttribute.GetRemark(enumTriggerEvent);
|
||||
string type = DictionaryData.Where(p => p.FullName == remark.CheckType).First().Id;
|
||||
TriggerEvent = _repository.AsSugarClient().Queryable<QcTriggerEvent>().Where(p => p.type == type && p.name == remark.CheckContent).First();
|
||||
Query = Query.Where((a, b, c, d, e) => b.triggertype == "3" && b.content!.Contains(TriggerEvent.id));
|
||||
}
|
||||
private void Filter(List<QcCheckPlanH> QcCheckPlanHs, TriggerPlanEntity entity)
|
||||
{
|
||||
var removePlanHs = new List<QcCheckPlanH>();
|
||||
var enumTriggerEvent = entity.triggerevent;
|
||||
foreach (var plan in QcCheckPlanHs)
|
||||
List<QcCheckPlanH> removePlanHs = new();
|
||||
EnumTriggerEvent? enumTriggerEvent = entity.triggerevent;
|
||||
foreach (QcCheckPlanH plan in QcCheckPlanHs)
|
||||
{
|
||||
if (enumTriggerEvent == EnumTriggerEvent.首件检换模具)
|
||||
{
|
||||
@@ -378,9 +403,11 @@ namespace Tnb.QcMgr
|
||||
}
|
||||
if (enumTriggerEvent == EnumTriggerEvent.生产检定量)
|
||||
{
|
||||
var number = _repository.AsSugarClient().Queryable<QcCheckPlanAdd>().Where(p => p.mainid == plan.id).First().number;
|
||||
if ((entity.newpronum + entity.oldpronum / number) <= (entity.oldpronum / number))
|
||||
int? number = _repository.AsSugarClient().Queryable<QcCheckPlanAdd>().Where(p => p.mainid == plan.id).First().number;
|
||||
if ((entity.newpronum + (entity.oldpronum / number)) <= (entity.oldpronum / number))
|
||||
{
|
||||
removePlanHs.Add(plan);
|
||||
}
|
||||
}
|
||||
if (enumTriggerEvent == EnumTriggerEvent.生产检定码)
|
||||
{
|
||||
@@ -388,9 +415,11 @@ namespace Tnb.QcMgr
|
||||
}
|
||||
if (enumTriggerEvent == EnumTriggerEvent.生产检产出频次)
|
||||
{
|
||||
var number = _repository.AsSugarClient().Queryable<QcCheckPlanAdd>().Where(p => p.mainid == plan.id).First().number;
|
||||
int? number = _repository.AsSugarClient().Queryable<QcCheckPlanAdd>().Where(p => p.mainid == plan.id).First().number;
|
||||
if ((entity.pronum % number) != 0)
|
||||
{
|
||||
removePlanHs.Add(plan);
|
||||
}
|
||||
}
|
||||
if (enumTriggerEvent == EnumTriggerEvent.生产检固定次数)
|
||||
{
|
||||
@@ -401,49 +430,53 @@ namespace Tnb.QcMgr
|
||||
|
||||
}
|
||||
}
|
||||
removePlanHs.ForEach(p => { QcCheckPlanHs.Remove(p); });
|
||||
removePlanHs.ForEach(p => { _ = QcCheckPlanHs.Remove(p); });
|
||||
}
|
||||
private async Task SaveTask(List<QcCheckPlanH> planhs, TriggerPlanEntity entity)
|
||||
{
|
||||
var DictionaryData = _repository.AsSugarClient().Queryable<DictionaryDataEntity, DictionaryTypeEntity>
|
||||
DictionaryDataEntity DictionaryData = _repository.AsSugarClient().Queryable<DictionaryDataEntity, DictionaryTypeEntity>
|
||||
((a, b) => new object[] { JoinType.Left, a.DictionaryTypeId == b.Id, })
|
||||
.Where((a, b) => b.FullName == "质检状态" && a.FullName == "待执行").First();
|
||||
var plands = await _repository.AsSugarClient().Queryable<QcCheckPlanD>().Where(p => planhs.Select(p => p.id).ToList().Contains(p.mainid!)).ToListAsync();
|
||||
foreach (var planh in planhs)
|
||||
List<QcCheckPlanD> plands = await _repository.AsSugarClient().Queryable<QcCheckPlanD>().Where(p => planhs.Select(p => p.id).ToList().Contains(p.mainid!)).ToListAsync();
|
||||
foreach (QcCheckPlanH planh in planhs)
|
||||
{
|
||||
var time = DateTime.Now;
|
||||
QcCheckExecH qcCheckExecH = new QcCheckExecH();
|
||||
qcCheckExecH.id = SnowflakeIdHelper.NextId();
|
||||
qcCheckExecH.checktype = planh.checktype;
|
||||
qcCheckExecH.status = DictionaryData.Id;
|
||||
qcCheckExecH.tasktime = time.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
qcCheckExecH.materialid = entity.materialid;
|
||||
qcCheckExecH.processid = entity.processid;
|
||||
qcCheckExecH.workid = entity.workid;
|
||||
qcCheckExecH.create_id = _userManager.UserId;
|
||||
qcCheckExecH.create_time = time;
|
||||
var ExecDs = new List<QcCheckExecD>();
|
||||
foreach (var pland in plands.Where(p => p.mainid == planh.id).ToList())
|
||||
DateTime time = DateTime.Now;
|
||||
QcCheckExecH qcCheckExecH = new()
|
||||
{
|
||||
QcCheckExecD QcCheckExecD = new QcCheckExecD();
|
||||
QcCheckExecD.mainid = qcCheckExecH.id;
|
||||
QcCheckExecD.extype = pland.extype;
|
||||
QcCheckExecD.excontent = pland.excontent;
|
||||
QcCheckExecD.check = pland.check;
|
||||
QcCheckExecD.errorcause = pland.errorcause;
|
||||
QcCheckExecD.errorlevel = pland.errorlevel;
|
||||
QcCheckExecD.remark = pland.remark;
|
||||
QcCheckExecD.attachment = pland.attachment;
|
||||
QcCheckExecD.isexec = pland.isexec;
|
||||
QcCheckExecD.custom = pland.custom;
|
||||
QcCheckExecD.typeid = pland.typeid;
|
||||
QcCheckExecD.itemid = pland.itemid;
|
||||
QcCheckExecD.create_id = _userManager.UserId;
|
||||
QcCheckExecD.create_time = time;
|
||||
id = SnowflakeIdHelper.NextId(),
|
||||
checktype = planh.checktype,
|
||||
status = DictionaryData.Id,
|
||||
tasktime = time.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||
materialid = entity.materialid,
|
||||
processid = entity.processid,
|
||||
workid = entity.workid,
|
||||
create_id = _userManager.UserId,
|
||||
create_time = time
|
||||
};
|
||||
List<QcCheckExecD> ExecDs = new();
|
||||
foreach (QcCheckPlanD? pland in plands.Where(p => p.mainid == planh.id).ToList())
|
||||
{
|
||||
QcCheckExecD QcCheckExecD = new()
|
||||
{
|
||||
mainid = qcCheckExecH.id,
|
||||
extype = pland.extype,
|
||||
excontent = pland.excontent,
|
||||
check = pland.check,
|
||||
errorcause = pland.errorcause,
|
||||
errorlevel = pland.errorlevel,
|
||||
remark = pland.remark,
|
||||
attachment = pland.attachment,
|
||||
isexec = pland.isexec,
|
||||
custom = pland.custom,
|
||||
typeid = pland.typeid,
|
||||
itemid = pland.itemid,
|
||||
create_id = _userManager.UserId,
|
||||
create_time = time
|
||||
};
|
||||
ExecDs.Add(QcCheckExecD);
|
||||
}
|
||||
await _repository.AsSugarClient().Insertable(qcCheckExecH).ExecuteCommandAsync();
|
||||
await _repository.AsSugarClient().Insertable(ExecDs).ExecuteCommandAsync();
|
||||
_ = await _repository.AsSugarClient().Insertable(qcCheckExecH).ExecuteCommandAsync();
|
||||
_ = await _repository.AsSugarClient().Insertable(ExecDs).ExecuteCommandAsync();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user