From 149402ac439140cdde05e0886af6ace4e7c69b95 Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Mon, 13 Nov 2023 12:02:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=B1=BB=E5=9E=8B=E8=8E=B7=E5=8F=96=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=98=8E=E7=BB=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.WarehouseMgr/WmsCheckTaskService.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs index 170faaf5..6116d81e 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs @@ -37,6 +37,8 @@ namespace Tnb.WarehouseMgr private readonly IVisualDevService _visualDevService; private readonly IRunService _runService; private readonly IBillRullService _billRullService; + private static Dictionary _carryMap = new(); + public WmsCheckTaskService( ISqlSugarRepository repository, IWareHouseService wareHouseService, @@ -288,6 +290,11 @@ namespace Tnb.WarehouseMgr [HttpGet] public async Task GetTaskDetailByCheckType([FromQuery] CheckDetailQuery input) { + if(_carryMap.Count == 0) + { + _carryMap = await _db.Queryable().ToDictionaryAsync(x => x.id, x => x.carry_code); + } + var filterExpable = Expressionable.Create() .And((a, b, c) => a.wh_id == input.warehouse_id) .And((a, b, c) => a.is_type == ((int)EnumLocationType.存储库位).ToString()) @@ -307,17 +314,18 @@ namespace Tnb.WarehouseMgr .Where(filterExpable.ToExpression()) .Select() .ToListAsync(); - var carryIds = carryCodes?.Select(x => x.carry_id) ?? Enumerable.Empty(); - var checkStockDs = await _db.Queryable().Where(it => carryIds.Contains(it.carry_id)).ToListAsync(); - List outputs = checkStockDs.GroupBy(g => new { g.material_code, g.code_batch, g.location_code, g.carry_code }).Select(x => new CheckTaskDetailOutput + //var carryIds = carryCodes?.Select(x => x.carry_id) ?? Enumerable.Empty(); + //var checkStockDs = await _db.Queryable().Where(it => carryIds.Contains(it.carry_id)).ToListAsync(); + + List outputs = carryCodes.GroupBy(g => new { g.material_code, g.code_batch, g.location_code, g.carry_id }).Select(x => new WmsCheckstockD { material_code = x.Key.material_code, code_batch = x.Key.code_batch, location_code = x.Key.location_code, - carry_code = x.Key.carry_code, + carry_code = _carryMap[x.Key.carry_id]?.ToString() ?? string.Empty, pr_qty = x.Sum(d => d.pr_qty), closing_status = WmsWareHouseConst.CLOSINGSTATUS_WJS_ID, - qty = x.Sum(d => d.qty), + qty = 0, }) .ToList(); return outputs; From 18c3eb7183cc572ce150ed52522d5eaa75ff43b9 Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Mon, 13 Nov 2023 12:06:33 +0800 Subject: [PATCH 2/5] +1 --- WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs index 6116d81e..59ba69b9 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs @@ -317,13 +317,13 @@ namespace Tnb.WarehouseMgr //var carryIds = carryCodes?.Select(x => x.carry_id) ?? Enumerable.Empty(); //var checkStockDs = await _db.Queryable().Where(it => carryIds.Contains(it.carry_id)).ToListAsync(); - List outputs = carryCodes.GroupBy(g => new { g.material_code, g.code_batch, g.location_code, g.carry_id }).Select(x => new WmsCheckstockD + List outputs = carryCodes.GroupBy(g => new { g.material_code, g.code_batch, g.location_code, g.carry_id }).Select(x => new CheckTaskDetailOutput { material_code = x.Key.material_code, code_batch = x.Key.code_batch, location_code = x.Key.location_code, carry_code = _carryMap[x.Key.carry_id]?.ToString() ?? string.Empty, - pr_qty = x.Sum(d => d.pr_qty), + pr_qty = x.Sum(d => d.codeqty), closing_status = WmsWareHouseConst.CLOSINGSTATUS_WJS_ID, qty = 0, }) From c86ad9d8722d031c18e9c6a741d07904695c0ba5 Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Mon, 13 Nov 2023 13:51:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?RedisBackGround=20=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apihost/Tnb.API.Entry/Startup.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apihost/Tnb.API.Entry/Startup.cs b/apihost/Tnb.API.Entry/Startup.cs index 3dbfefd2..1efe0fb4 100644 --- a/apihost/Tnb.API.Entry/Startup.cs +++ b/apihost/Tnb.API.Entry/Startup.cs @@ -57,7 +57,7 @@ public class Startup : AppStartup //定时任务 services.AddHostedService(); - services.AddHostedService(); + //services.AddHostedService(); } From 58c05b301bbd52cfeb1cb6b647b22bf5706b5604 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Mon, 13 Nov 2023 15:01:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entity/EqpRepairApply.part.cs | 13 +++++++++++++ EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.part.cs diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.part.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.part.cs new file mode 100644 index 00000000..4e224964 --- /dev/null +++ b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.part.cs @@ -0,0 +1,13 @@ +using SqlSugar; + +namespace Tnb.EquipMgr.Entities +{ + public partial class EqpRepairApply + { + /// + /// 故障名称 + /// + [SugarColumn(IsIgnore = true)] + public string? fault_name { get; set; } + } +} \ No newline at end of file diff --git a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs index de39f2f4..d5388b94 100644 --- a/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs +++ b/EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs @@ -11,6 +11,7 @@ using JNPF.VisualDev; using JNPF.VisualDev.Interfaces; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; +using SQLitePCL; using SqlSugar; using Tnb.BasicData; using Tnb.EquipMgr.Entities; @@ -281,10 +282,12 @@ namespace Tnb.EquipMgr public async Task GetRepairApplyDetail(Dictionary dic) { string id = dic["id"]; - + var db = _repository.AsSugarClient(); EqpRepairApply eqpRepairApply = await _repository.GetSingleAsync(x => x.id == id); - EqpRepairOutApply eqpRepairOutApply = await _repository.AsSugarClient().Queryable().FirstAsync(x => x.repair_apply_id == id); + EqpRepairOutApply eqpRepairOutApply = await db.Queryable().FirstAsync(x => x.repair_apply_id == id); + EqpFault eqpFault = await db.Queryable().SingleAsync(x => x.id == eqpRepairApply.fault_id); + eqpRepairApply.fault_name = eqpFault != null ? eqpFault.fault_name : ""; return new RepairApplyDetailOutput() { eqpRepairApply = eqpRepairApply, From 171dd26dbc352b16f159a027aa2f46bbbb8f382b Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Mon, 13 Nov 2023 15:17:28 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=8E=B7=E5=8F=96=E4=BB=BB=E5=8A=A1=E6=98=8E?= =?UTF-8?q?=E7=BB=86=EF=BC=8C=E5=88=A0=E9=99=A4=E6=B3=A8=E9=87=8A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs index 59ba69b9..545a4c9c 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCheckTaskService.cs @@ -314,8 +314,6 @@ namespace Tnb.WarehouseMgr .Where(filterExpable.ToExpression()) .Select() .ToListAsync(); - //var carryIds = carryCodes?.Select(x => x.carry_id) ?? Enumerable.Empty(); - //var checkStockDs = await _db.Queryable().Where(it => carryIds.Contains(it.carry_id)).ToListAsync(); List outputs = carryCodes.GroupBy(g => new { g.material_code, g.code_batch, g.location_code, g.carry_id }).Select(x => new CheckTaskDetailOutput {