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

质量

Browse Source
This commit is contained in:
周科达
2024-08-22 14:08:16 +08:00
parent 4ce0a58715
commit 27e67dadf3
29 changed files with 758 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
QcMgr/Tnb.QcMgr/QcCheckPlanService.cs
View File

@@ -6,6 +6,7 @@ using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.JsonSerialization;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using JNPF.TaskScheduler;
using JNPF.TaskScheduler.Entitys.Dto.TaskScheduler;
using JNPF.TaskScheduler.Entitys.Model;
@@ -16,6 +17,8 @@ using Tnb.QcMgr.Entities;
using Tnb.QcMgr.Entities.Entity;
using Tnb.QcMgr.Entities.Enums;
using Tnb.QcMgr.Interfaces;
using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.BasicData;
namespace Tnb.QcMgr
{
@@ -31,11 +34,24 @@ namespace Tnb.QcMgr
private readonly ISqlSugarRepository<QcCheckPlanH> _repository;
private readonly IUserManager _userManager;
private readonly TimeTaskService _timeTaskService;
private readonly IBillRullService _billRullService;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public QcCheckPlanService(ISqlSugarRepository<QcCheckPlanH> repository, IUserManager userManager, TimeTaskService timeTaskService)
private static Dictionary<string, string> _dicBillCodes = new Dictionary<string, string>()
{
[WmsWareHouseConst.SHOUJIAN_ID] = CodeTemplateConst.SHOUJIAN_CODE,
[WmsWareHouseConst.XUNJIAN_ID] = CodeTemplateConst.XUNJIAN_CODE,
[WmsWareHouseConst.MOJIAN_ID] = CodeTemplateConst.MOJIAN_CODE,
[WmsWareHouseConst.LINGBUJIANZUIZHONGJIANYAN_ID] = CodeTemplateConst.LINGBUJIANZUIZHONGJIANYAN_CODE,
[WmsWareHouseConst.CHENGPINJIANYAN_ID] = CodeTemplateConst.CHENGPINJIANYAN_CODE,
};
public QcCheckPlanService(ISqlSugarRepository<QcCheckPlanH> repository,
IBillRullService billRullService,
IUserManager userManager, TimeTaskService timeTaskService)
{
_repository = repository;
_userManager = userManager;
_billRullService = billRullService;
_timeTaskService = timeTaskService;
OverideFuncs.DeleteAsync = Delete;
}
@@ -512,13 +528,17 @@ namespace Tnb.QcMgr
removePlanHs.Add(plan);
}
}
if (enumTriggerEvent == EnumTriggerEvent.零部件最终检验事件)
if (enumTriggerEvent == EnumTriggerEvent.零部件最终检验)
{
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.开工首件检)
{
}
if (enumTriggerEvent == EnumTriggerEvent.生产检定码)
{
@@ -552,9 +572,11 @@ namespace Tnb.QcMgr
foreach (QcCheckPlanH planh in planhs)
{
DateTime time = DateTime.Now;
string billCode = await _billRullService.GetBillNumber(_dicBillCodes[planh.checktype]);
QcCheckExecH qcCheckExecH = new()
{
id = SnowflakeIdHelper.NextId(),
bill_code = billCode,
checktype = planh.checktype,
status = DictionaryData.Id,
tasktime = time.ToString("yyyy-MM-dd HH:mm:ss"),
@@ -562,8 +584,17 @@ namespace Tnb.QcMgr
processid = entity.processid,
workid = entity.workid,
create_id = _userManager.UserId,
create_time = time
create_time = time,
mo_task_code = entity.mo_task_code,
carry_code = entity.carry_code,
report_id = entity.report_id,
check_type = entity.check_type,
batch = entity.batch
};
if (entity.triggerevent == EnumTriggerEvent.零部件最终检验)
{
qcCheckExecH.checknum = entity.newpronum.ToString();
}
List<QcCheckExecD> ExecDs = new();
foreach (QcCheckPlanD? pland in plands.Where(p => p.mainid == planh.id).ToList())
{