新增Mes检验结束后,回调通知功能
This commit is contained in:
@@ -14,6 +14,7 @@
|
||||
<ProjectReference Include="..\..\EquipMgr\Tnb.EquipMgr.Entities\Tnb.EquipMgr.Entities.csproj" />
|
||||
<ProjectReference Include="..\..\message\Tnb.Message.Interfaces\Tnb.Message.Interfaces.csproj" />
|
||||
<ProjectReference Include="..\..\ProductionMgr\Tnb.ProductionMgr.Interfaces\Tnb.ProductionMgr.Interfaces.csproj" />
|
||||
<ProjectReference Include="..\..\QcMgr\Tnb.QcMgr.Interfaces\Tnb.QcMgr.Interfaces.csproj" />
|
||||
<ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" />
|
||||
<ProjectReference Include="..\Tnb.WarehouseMgr.Interfaces\Tnb.WarehouseMgr.Interfaces.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
@@ -118,5 +118,10 @@ namespace Tnb.WarehouseMgr
|
||||
return await _db.Updateable<TEntity>().SetColumns(it => it.audit_status == (int)input.auditType).Where(it => input.ids.Contains(it.id)).ExecuteCommandHasChangeAsync();
|
||||
}
|
||||
|
||||
protected async Task<bool> UpdateChackStatus<TEntity>(MesCheckdCallbackUpinput input) where TEntity : BaseEntity<string>, InOutCheckStatusUpdateEntity, new()
|
||||
{
|
||||
return await _db.Updateable<TEntity>().SetColumns(it => it.check_conclusion == input.check_conclusion).Where(it => it.id == input.maintableid).ExecuteCommandHasChangeAsync();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,6 +18,9 @@ using NPOI.OpenXmlFormats.Dml.Diagram;
|
||||
using SqlSugar;
|
||||
using Tnb.BasicData.Entities;
|
||||
using Tnb.Common.Utils;
|
||||
using Tnb.QcMgr.Entities;
|
||||
using Tnb.QcMgr.Entities.Enums;
|
||||
using Tnb.QcMgr.Interfaces;
|
||||
using Tnb.WarehouseMgr.Entities;
|
||||
using Tnb.WarehouseMgr.Entities.Consts;
|
||||
using Tnb.WarehouseMgr.Entities.Dto;
|
||||
@@ -34,11 +37,13 @@ namespace Tnb.WarehouseMgr
|
||||
{
|
||||
private readonly ISqlSugarClient _db;
|
||||
private readonly IUserManager _userManager;
|
||||
public WmsPurchaseService(ISqlSugarRepository<WmsPurchaseH> repo, IUserManager userManager)
|
||||
private readonly IQcCheckPlanService _qcCheckPlanService;
|
||||
public WmsPurchaseService(ISqlSugarRepository<WmsPurchaseH> repo, IUserManager userManager, IQcCheckPlanService qcCheckPlanService)
|
||||
: base(repo, userManager)
|
||||
{
|
||||
_db = repo.AsSugarClient();
|
||||
_userManager = userManager;
|
||||
_qcCheckPlanService = qcCheckPlanService;
|
||||
}
|
||||
|
||||
private async Task<dynamic> xxx(VisualDevModelDataCrInput input)
|
||||
@@ -84,7 +89,11 @@ namespace Tnb.WarehouseMgr
|
||||
await _db.Insertable(instockDs).ExecuteCommandAsync();
|
||||
}
|
||||
//通知Mes接口
|
||||
|
||||
CreateTaskEntity ctEntity = new();
|
||||
ctEntity.maintableid = instock.id;
|
||||
ctEntity.materialids = instockDs.Select(x => x.material_id).ToList();
|
||||
ctEntity.triggerevent = EnumTriggerEvent.入厂检按物料编号;
|
||||
_ = _qcCheckPlanService.CreateWmsTask(ctEntity);
|
||||
await _db.Ado.CommitTranAsync();
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -119,5 +128,16 @@ namespace Tnb.WarehouseMgr
|
||||
{
|
||||
return await Audit<WmsPurchaseH>(input);
|
||||
}
|
||||
/// <summary>
|
||||
/// mes 检验完后通知wms(采购) 回调接口
|
||||
/// </summary>
|
||||
/// <param name="input">
|
||||
/// </param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<dynamic> MesCheckdPurchaseCallback(MesCheckdCallbackUpinput input)
|
||||
{
|
||||
return await UpdateChackStatus<WmsInstockH>(input);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,5 +72,17 @@ namespace Tnb.WarehouseMgr
|
||||
return await Audit<WmsSaleH>(input);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// mes 检验完后通知wms(销售) 回调接口
|
||||
/// </summary>
|
||||
/// <param name="input">
|
||||
/// </param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<dynamic> MesCheckdSaleCallback(MesCheckdCallbackUpinput input)
|
||||
{
|
||||
return await UpdateChackStatus<WmsOutstockH>(input);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user