From 92a3e9904f842cb678a6ffe617f46ba5488feb04 Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Fri, 10 Nov 2023 10:41:37 +0800 Subject: [PATCH 1/3] +1 --- WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumAuditType.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumAuditType.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumAuditType.cs index 27c45e47..2133be7c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumAuditType.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumAuditType.cs @@ -11,4 +11,4 @@ namespace Tnb.WarehouseMgr.Entities.Enums 反审核 = 0, 审核 = 1, } -} +} From 86b766500b4ee4b6364a9c8f7f42add77132d8cb Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Fri, 10 Nov 2023 11:02:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=EF=BC=8C=E9=94=80=E5=94=AE=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E5=90=8C=E6=AD=A5mes=E6=95=B0=E6=8D=AE=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsPurchaseAndSaleCommonService.cs | 17 ++++++++++++++++- .../Tnb.WarehouseMgr/WmsPurchaseService.cs | 10 ++-------- WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs | 12 ++++-------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs index 1ced5f17..50ddc332 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseAndSaleCommonService.cs @@ -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 s_materialMap = new(); + private readonly IQcCheckPlanService _qcCheckPlanService; - public WmsPurchaseAndSaleCommonService(ISqlSugarRepository repo, IUserManager userManager) + public WmsPurchaseAndSaleCommonService(ISqlSugarRepository repo, IUserManager userManager, IQcCheckPlanService qcCheckPlanService) { _db = repo.AsSugarClient(); _userManager = userManager; + _qcCheckPlanService = qcCheckPlanService; } protected async Task> PurchaseAndSaleUpdate(PurchaseAndReceiveUpInput input) @@ -120,6 +125,16 @@ namespace Tnb.WarehouseMgr return await _db.Updateable().SetColumns(it => it.audit_status == (int)input.auditType).Where(it => input.ids.Contains(it.id)).ExecuteCommandHasChangeAsync(); } + protected Task SyncMesData(string maintableId,List materialIds,EnumTriggerEvent triggerEvent) + { + CreateTaskEntity ctEntity = new(); + ctEntity.maintableid = maintableId; + ctEntity.materialids = materialIds; + ctEntity.triggerevent = triggerEvent; + return _qcCheckPlanService.CreateWmsTask(ctEntity); + + } + protected async Task UpdateChackStatus(MesCheckdCallbackUpinput input) where TEntity : BaseEntity, InOutCheckStatusUpdateEntity, new() { var stock = await _db.Queryable().SingleAsync(it => it.id == input.maintableid); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs index 70a14f5f..ba36e7ce 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs @@ -37,13 +37,11 @@ namespace Tnb.WarehouseMgr { private readonly ISqlSugarClient _db; private readonly IUserManager _userManager; - private readonly IQcCheckPlanService _qcCheckPlanService; public WmsPurchaseService(ISqlSugarRepository repo, IUserManager userManager, IQcCheckPlanService qcCheckPlanService) - : base(repo, userManager) + : base(repo, userManager, qcCheckPlanService) { _db = repo.AsSugarClient(); _userManager = userManager; - _qcCheckPlanService = qcCheckPlanService; } private async Task 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) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs index d11fa558..1cc47e88 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSaleService.cs @@ -27,8 +27,9 @@ namespace Tnb.WarehouseMgr private readonly IWmsOutStockService _wmsOutStockService; private readonly IQcCheckPlanService _qcCheckPlanService; - public WmsSaleService(ISqlSugarRepository repo, IUserManager userManager, IWmsOutStockService wmsOutStockService, IQcCheckPlanService qcCheckPlanService) - : base(repo, userManager) + public WmsSaleService(ISqlSugarRepository 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 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().ToList(); - ctEntity.triggerevent = EnumTriggerEvent.出厂检按入厂频次; - _ = _qcCheckPlanService.CreateWmsTask(ctEntity); + _ = SyncMesData(multi.pkId, multi.outStockDList?.Select(x => x.material_id!).ToList() ?? Array.Empty().ToList(), EnumTriggerEvent.出厂检按入厂频次); return await Task.FromResult(1); } From 8b3541c95039e65eac076c330af75ca109ff1643 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Fri, 10 Nov 2023 13:38:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=BF=9B=E8=A1=8C=E4=B8=AD=E5=BE=85=E5=BC=80?= =?UTF-8?q?=E5=B7=A5=E6=9A=82=E5=81=9C=E7=9A=84=E4=BB=BB=E5=8A=A1=E5=8D=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IPrdMoTaskService.cs | 7 +++++ .../Tnb.ProductionMgr/PrdMoTaskService.cs | 27 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs index a2a45e06..3a28f090 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMoTaskService.cs @@ -28,6 +28,13 @@ namespace Tnb.ProductionMgr.Interfaces /// Task GetPrdMoTaskInfoByStationId(Dictionary dic); + /// + /// 根据工位获取进行中待开工暂停的任务单信息 + /// + /// + /// + Task> GetPrdMoTaskListByStationId(Dictionary dic); + /// /// 外包装根据工位id获取喷码数据 /// diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index ad0bbe82..567eca46 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -2739,6 +2739,33 @@ namespace Tnb.ProductionMgr return prdMoTask; } + /// + /// 根据工位获取进行中待开工暂停的任务单信息 + /// + /// + /// + [HttpPost] + public async Task> GetPrdMoTaskListByStationId(Dictionary dic) + { + string station_id = dic.ContainsKey("station_id") ? dic["station_id"] : ""; + if (string.IsNullOrEmpty(station_id)) + { + throw Oops.Bah("工位错误"); + } + + List list = await _db.Queryable().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().SingleAsync(x => x.id == prdMoTask.material_id); + prdMoTask.material_name = basMaterial.name; + } + } + + return list; + } + /// /// 外包装根据工位id获取喷码数据 ///