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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
周科达
2023-07-21 16:47:42 +08:00
parent 4c2cef5fe6 00d525a6e4
commit d6e7514abc
13 changed files with 229 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs
View File

@@ -44,6 +44,9 @@ using Newtonsoft.Json;
using Tnb.BasicData.Entities.Dto;
using NPOI.SS.Formula.Functions;
using Tnb.PerMgr.Entities;
using Tnb.QcMgr.Interfaces;
using Tnb.QcMgr.Entities.Dto;
using Tnb.QcMgr.Entities.Enums;
// using Tnb.PerMgr.Entities;
@@ -67,7 +70,7 @@ namespace Tnb.ProductionMgr
private static Dictionary<string, object> _dicProcess = new Dictionary<string, object>();
private readonly ISqlSugarClient _db;
private readonly IBillRullService _billRuleService;
private readonly IQcCheckPlanService _qcCheckPlanService;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public PrdMoTaskService(
@@ -76,7 +79,8 @@ namespace Tnb.ProductionMgr
IDictionaryDataService dictionaryDataService,
IRunService runService,
IBillRullService billRullService,
IVisualDevService visualDevService
IVisualDevService visualDevService,
IQcCheckPlanService qcCheckPlanService
)
{
_repository = repository;
@@ -88,7 +92,7 @@ namespace Tnb.ProductionMgr
OverideFuncs.DeleteAsync = Delete;
OverideFuncs.GetListAsync = GetList;
_billRuleService = billRullService;
_qcCheckPlanService=qcCheckPlanService;
}
#region Get
@@ -1299,7 +1303,19 @@ namespace Tnb.ProductionMgr
row = await db.Insertable(report).ExecuteCommandAsync();
#region 质检模块
//质检模块
TriggerPlanEntity entity = new TriggerPlanEntity();
entity.materialid = prdMoTask.material_id;
entity.processid = prdMoTask.process_id;
entity.workid = prdMoTask.workstation_id;
var reported = prdMoTask.reported_work_qty == null ? 0 : prdMoTask.reported_work_qty;
var scrap = prdMoTask.scrap_qty == null ? 0 : prdMoTask.scrap_qty;
entity.oldpronum = reported+ scrap;
entity.newpronum = input.reported_qty;
entity.triggerevent = EnumTriggerEvent.生产检定量;
await _qcCheckPlanService.CreateTask(entity);
#endregion
if (prdMoTask.reported_work_qty == null)
{
await db.Updateable<PrdMoTask>()
@@ -1482,6 +1498,20 @@ namespace Tnb.ProductionMgr
var scrapQty = db.Queryable<PrdMoTaskDefect>().Where(it => it.mo_task_id == input.mo_task_id)?.Sum(d => d.defective_item_qty);
if (scrapQty.HasValue && scrapQty.Value > 0)//更新生产任务表报废数量
{
#region 质检模块
//质检模块
var prdMoTask = await db.Queryable<PrdMoTask>().SingleAsync(x => x.id == input.mo_task_id);
TriggerPlanEntity entity = new TriggerPlanEntity();
entity.materialid = prdMoTask.material_id;
entity.processid = prdMoTask.process_id;
entity.workid = prdMoTask.workstation_id;
var reported = prdMoTask.reported_work_qty == null ? 0 : prdMoTask.reported_work_qty;
var scrap = prdMoTask.scrap_qty == null ? 0 : prdMoTask.scrap_qty;
entity.oldpronum = reported + scrap;
entity.newpronum = input.scrap_qty;
entity.triggerevent = EnumTriggerEvent.生产检定量;
await _qcCheckPlanService.CreateTask(entity);
#endregion
await db.Updateable<PrdMoTask>().SetColumns(it => new PrdMoTask { scrap_qty = scrapQty.Value }).Where(it => it.id == input.mo_task_id).ExecuteCommandAsync();
}
var defectRecord = await db.Queryable<PrdMoTaskDefectRecord>().FirstAsync(it => it.mo_task_id == input.mo_task_id);

1
ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj
View File

@@ -13,6 +13,7 @@
<ProjectReference Include="..\..\EquipMgr\Tnb.EquipMgr.Interfaces\Tnb.EquipMgr.Interfaces.csproj" />
<ProjectReference Include="..\..\message\Tnb.Message\Tnb.Message.csproj" />
<ProjectReference Include="..\..\PerMgr\Tnb.PerMgr.Entities\Tnb.PerMgr.Entities.csproj" />
<ProjectReference Include="..\..\QcMgr\Tnb.QcMgr.Interfaces\Tnb.QcMgr.Interfaces.csproj" />
<ProjectReference Include="..\..\taskschedule\Tnb.TaskScheduler\Tnb.TaskScheduler.csproj" />
<ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" />
<ProjectReference Include="..\..\WarehouseMgr\Tnb.WarehouseMgr.Entities\Tnb.WarehouseMgr.Entities.csproj" />