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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
贺立波
2023-11-10 14:53:41 +08:00
parent 113f67b168 fff6e527d3
commit 7a94129e35
6 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs
View File

@@ -28,6 +28,13 @@ namespace Tnb.ProductionMgr.Interfaces
/// <returns></returns>
Task<PrdMoTask> GetPrdMoTaskInfoByStationId(Dictionary<string, string> dic);
/// <summary>
/// 根据工位获取进行中待开工暂停的任务单信息
/// </summary>
/// <param name="dic"></param>
/// <returns></returns>
Task<List<PrdMoTask>> GetPrdMoTaskListByStationId(Dictionary<string, string> dic);
/// <summary>
/// 外包装根据工位id获取喷码数据
/// </summary>

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

@@ -2739,6 +2739,33 @@ namespace Tnb.ProductionMgr
return prdMoTask;
}
/// <summary>
/// 根据工位获取进行中待开工暂停的任务单信息
/// </summary>
/// <param name="dic"></param>
/// <returns></returns>
[HttpPost]
public async Task<List<PrdMoTask>> GetPrdMoTaskListByStationId(Dictionary<string, string> dic)
{
string station_id = dic.ContainsKey("station_id") ? dic["station_id"] : "";
if (string.IsNullOrEmpty(station_id))
{
throw Oops.Bah("工位错误");
}
List<PrdMoTask> list = await _db.Queryable<PrdMoTask>().Where(x => x.workstation_id == station_id && x.parent_id != null && (x.mo_task_status == DictConst.InProgressEnCode || x.mo_task_status == DictConst.ToBeStartedEnCode || x.mo_task_status == DictConst.MoStatusPauseCode )).ToListAsync();
if (list != null && list.Count>0)
{
foreach (var prdMoTask in list)
{
BasMaterial basMaterial = await _db.Queryable<BasMaterial>().SingleAsync(x => x.id == prdMoTask.material_id);
prdMoTask.material_name = basMaterial.name;
}
}
return list;
}
/// <summary>
/// 外包装根据工位id获取喷码数据
/// </summary>

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumAuditType.cs
View File

@@ -11,4 +11,4 @@ namespace Tnb.WarehouseMgr.Entities.Enums
反审核 = 0,
审核 = 1,
}
}
}

17
WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs
View File

@@ -11,6 +11,9 @@ using JNPF.FriendlyException;
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;
@@ -30,11 +33,13 @@ namespace Tnb.WarehouseMgr
private readonly ISqlSugarClient _db;
private readonly IUserManager _userManager;
private static Dictionary<string, object> s_materialMap = new();
private readonly IQcCheckPlanService _qcCheckPlanService;
public WmsPurchaseAndSaleCommonService(ISqlSugarRepository<WmsPurchaseH> repo, IUserManager userManager)
public WmsPurchaseAndSaleCommonService(ISqlSugarRepository<WmsPurchaseH> repo, IUserManager userManager, IQcCheckPlanService qcCheckPlanService)
{
_db = repo.AsSugarClient();
_userManager = userManager;
_qcCheckPlanService = qcCheckPlanService;
}
protected async Task<List<TSubEntity>> PurchaseAndSaleUpdate(PurchaseAndReceiveUpInput input)
@@ -120,6 +125,16 @@ 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 Task SyncMesData(string maintableId,List<string> materialIds,EnumTriggerEvent triggerEvent)
{
CreateTaskEntity ctEntity = new();
ctEntity.maintableid = maintableId;
ctEntity.materialids = materialIds;
ctEntity.triggerevent = triggerEvent;
return _qcCheckPlanService.CreateWmsTask(ctEntity);
}
protected async Task<bool> UpdateChackStatus<TEntity>(MesCheckdCallbackUpinput input) where TEntity : BaseEntity<string>, InOutCheckStatusUpdateEntity, new()
{
var stock = await _db.Queryable<TEntity>().SingleAsync(it => it.id == input.maintableid);

10
WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
View File

@@ -37,13 +37,11 @@ namespace Tnb.WarehouseMgr
{
private readonly ISqlSugarClient _db;
private readonly IUserManager _userManager;
private readonly IQcCheckPlanService _qcCheckPlanService;
public WmsPurchaseService(ISqlSugarRepository<WmsPurchaseH> repo, IUserManager userManager, IQcCheckPlanService qcCheckPlanService)
: base(repo, userManager)
: base(repo, userManager, qcCheckPlanService)
{
_db = repo.AsSugarClient();
_userManager = userManager;
_qcCheckPlanService = qcCheckPlanService;
}
private async Task<dynamic> xxx(VisualDevModelDataCrInput input)
@@ -89,11 +87,7 @@ 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);
_ = SyncMesData(instock.id, instockDs.Select(x => x.material_id).ToList(), EnumTriggerEvent.入厂检按物料编号);
await _db.Ado.CommitTranAsync();
}
catch (Exception ex)

12
WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs
View File

@@ -27,8 +27,9 @@ namespace Tnb.WarehouseMgr
private readonly IWmsOutStockService _wmsOutStockService;
private readonly IQcCheckPlanService _qcCheckPlanService;
public WmsSaleService(ISqlSugarRepository<WmsPurchaseH> repo, IUserManager userManager, IWmsOutStockService wmsOutStockService, IQcCheckPlanService qcCheckPlanService)
: base(repo, userManager)
public WmsSaleService(ISqlSugarRepository<WmsPurchaseH> repo, IUserManager userManager,
IWmsOutStockService wmsOutStockService, IQcCheckPlanService qcCheckPlanService)
: base(repo, userManager, qcCheckPlanService)
{
_wmsOutStockService = wmsOutStockService;
_qcCheckPlanService = qcCheckPlanService;
@@ -50,12 +51,7 @@ namespace Tnb.WarehouseMgr
visualDevModelDataInput.data["location_code"] = "YCL01-01-01";
(string pkId, List <WmsOutstockD> outStockDList) multi = await _wmsOutStockService.OutStockApplyFor(visualDevModelDataInput);
CreateTaskEntity ctEntity = new();
ctEntity.maintableid = multi.pkId;
ctEntity.materialids = multi.outStockDList?.Select(x => x.material_id!).ToList() ?? Array.Empty<string>().ToList();
ctEntity.triggerevent = EnumTriggerEvent.出厂检按入厂频次;
_ = _qcCheckPlanService.CreateWmsTask(ctEntity);
_ = SyncMesData(multi.pkId, multi.outStockDList?.Select(x => x.material_id!).ToList() ?? Array.Empty<string>().ToList(), EnumTriggerEvent.出厂检按入厂频次);
return await Task.FromResult(1);
}