From c73e1efb7e04cd6a26bf566718b33e7871fd89d5 Mon Sep 17 00:00:00 2001 From: qianjiawei <1184704771@qq.com> Date: Fri, 21 Jul 2023 16:50:05 +0800 Subject: [PATCH 1/4] 1 --- .../Tnb.ProductionMgr/PrdMoTaskService.cs | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index cb64203f..6886f5fd 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -1008,16 +1008,22 @@ namespace Tnb.ProductionMgr var taskReportLogs = new List(); var prdTaskList = await db.Queryable().Where(it => input.TaskIds.Contains(it.id)).ToListAsync(); if (prdTaskList?.Count > 0) - { - /* - if (prdTaskList.Where(p => p.mo_task_status == "Closed").Count() > 0 && status == "InProgress") - { - foreach (var task in prdTaskList.Where(p => p.mo_task_status == "Closed").ToList()) - { + { + #region 质检模块 //质检 + if (prdTaskList.Where(p => p.mo_task_status == "Pause").Count() > 0 && status == "InProgress") + { + foreach (var task in prdTaskList.Where(p => p.mo_task_status == "Pause").ToList()) + { + TriggerPlanEntity entity = new TriggerPlanEntity(); + entity.materialid = task.material_id; + entity.processid = task.process_id; + entity.workid = task.workstation_id; + entity.triggerevent = EnumTriggerEvent.首件检生产任务暂停; + await _qcCheckPlanService.CreateTask(entity); } } - */ + #endregion prdTaskList.ForEach(x => x.mo_task_status = status); row = await db.Updateable(prdTaskList).ExecuteCommandAsync(); if (row > 0) From 5a050022e38f453fe056131b91a55541880d10c0 Mon Sep 17 00:00:00 2001 From: FanLian Date: Fri, 21 Jul 2023 16:55:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=BD=BD=E5=85=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/WmsCarryQueryService.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs index 2fb2cf42..d5a58f81 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Dynamic; using System.Linq; +using System.Linq.Expressions; using System.Text; using System.Threading.Tasks; using Aop.Api.Domain; @@ -11,6 +12,7 @@ using Mapster; using Microsoft.AspNetCore.Mvc; using SqlSugar; using Tnb.WarehouseMgr.Entities; +using Tnb.WarehouseMgr.Entities.Consts; using Tnb.WarehouseMgr.Entities.Dto; using Tnb.WarehouseMgr.Entities.Dto.Inputs; using Tnb.WarehouseMgr.Entities.Dto.Outputs; @@ -67,9 +69,18 @@ namespace Tnb.WarehouseMgr try { var carry = await _db.Queryable().SingleAsync(it => it.carry_code == input.carry_code); - var carryDs = await _db.Queryable().Where(it => it.carry_id == carry.id).ToListAsync(); - var mCarryIds = carryDs.Select(x=>x.membercarry_id).ToList(); - var carryCodes = await _db.Queryable().Where(it => mCarryIds.Contains(it.carry_id)).ToListAsync(); + List carryCodes = new(); + if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID) + { + var carryDs = await _db.Queryable().Where(it => it.carry_id == carry.id).ToListAsync(); + var mCarryIds = carryDs.Select(x => x.membercarry_id).ToList(); + carryCodes = await _db.Queryable().Where(it => mCarryIds.Contains(it.carry_id)).ToListAsync(); + } + else + { + carryCodes = await _db.Queryable().Where(it => it.carry_id == carry.id).ToListAsync(); + } + data = carry.Adapt(); data.wmsCarryCodes = carryCodes.Adapt>(); From 878d012aa84214ddfe77065c88e77bbd220d0455 Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 21 Jul 2023 16:56:07 +0800 Subject: [PATCH 3/4] 1 --- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 13 ++++++++----- .../Tnb.WarehouseMgr/WmskittingOutService.cs | 14 -------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index eabdffe4..8afd27da 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -197,22 +197,25 @@ namespace Tnb.WarehouseMgr { x.is_chain = 0; }); - items[^items.Count].groups = $"{groupCode}-1"; + items[0].groups = groupCode; + items[0].bill_code = $"{groupCode}-1"; } else if ((moveNum > areaPreTasks.Count && areaPreTasks.Count > 1) || moveNum < areaPreTasks.Count) { items.ForEach(x => x.is_chain = 1); var mod = items.Count % moveNum > 0 ? items.Count / moveNum + 1 : items.Count / moveNum; - int start = 0, end = moveNum; - var arrary = items.ToArray(); var itemsCount = items.Count; + var start = 0; + var end = Math.Min(itemsCount, moveNum); + var arrary = items.ToArray(); for (int i = 1; i <= mod; i++) { if (start >= itemsCount) break; var subArray = arrary[start..end]; for (int j = 0, arrLen = subArray.Length; j < arrLen; j++) { - subArray[j].groups = $"{groupCode}-{i}"; + subArray[j].groups = groupCode; + subArray[j].bill_code = $"{groupCode}-{i}"; } start = end; if ((end + moveNum) >= arrary.Length) @@ -255,7 +258,7 @@ namespace Tnb.WarehouseMgr { items[i].id = SnowflakeIdHelper.NextId(); items[i].status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID; - items[i].bill_code = await _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE); + //items[i].groups = await _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE); } if (moveNum == 1) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs index 35b71c63..c224d1a2 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs @@ -341,20 +341,6 @@ namespace Tnb.WarehouseMgr if (input.IsNull()) throw new ArgumentNullException(nameof(input)); try { - //var kittingOut = input[^1]; - //if ((!kittingOut.carry_id.IsNullOrEmpty() || !kittingOut.carry_code.IsNullOrEmpty()) && !kittingOut.location_code.IsNullOrEmpty()) - //{ - // WmsCarryH? curCarry = null; - // if (!kittingOut.carry_id.IsNullOrEmpty()) - // curCarry = await _db.Queryable().SingleAsync(it => it.id == kittingOut.carry_id); - // else - // curCarry = await _db.Queryable().FirstAsync(it => it.carry_code == kittingOut.carry_code); - - // var endLocation = await _db.Queryable().SingleAsync(it => it.id == kittingOut.location_code); - // var isMatch = await IsCarryAndLocationMatchByCarryStd(curCarry, endLocation); - // if (!isMatch) throw new AppFriendlyException("该载具无法放置到目标库位", 500); - - //} await _db.Ado.BeginTranAsync(); From 470ae8e8f6a1142f6c77801c66ea308884dc88d2 Mon Sep 17 00:00:00 2001 From: qianjiawei <1184704771@qq.com> Date: Fri, 21 Jul 2023 17:02:50 +0800 Subject: [PATCH 4/4] 1 --- .../Tnb.ProductionMgr/PrdMoTaskService.cs | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs index 6886f5fd..f6014392 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskService.cs @@ -685,7 +685,15 @@ namespace Tnb.ProductionMgr { await db.Ado.BeginTranAsync(); row = await db.Insertable(moTask).ExecuteCommandAsync(); - + #region 质检模块 + //质检 + TriggerPlanEntity entity = new TriggerPlanEntity(); + entity.materialid = moTask.material_id; + entity.processid = moTask.process_id; + entity.workid = moTask.workstation_id; + entity.triggerevent = EnumTriggerEvent.首件检新的生产任务; + await _qcCheckPlanService.CreateTask(entity); + #endregion //根据工单号获取当前工单包含的已排产数 var schedQty = db.Queryable().Where(it => it.mo_id == input.mo_id)?.Sum(d => d.scheduled_qty); @@ -802,6 +810,17 @@ namespace Tnb.ProductionMgr // } // } row = await _db.Insertable(moTask).ExecuteCommandAsync(); + #region 质检模块 + //质检 + TriggerPlanEntity entity = new TriggerPlanEntity(); + entity.materialid = moTask.material_id; + entity.processid = moTask.process_id; + entity.workid = moTask.workstation_id; + entity.triggerevent = EnumTriggerEvent.首件检新的生产任务; + await _qcCheckPlanService.CreateTask(entity); + + #endregion + var material_h = await _db.Queryable().FirstAsync(it => it.id == moTask.material_id); //添加生产任务操作记录日志 var taskLog = new PrdTaskLog();