From 6840cfcbb1f72a9efdbee04c1c07f06351fdac18 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Thu, 23 Nov 2023 14:41:06 +0800 Subject: [PATCH 1/5] 1 --- .../Tnb.ProductionMgr/PrdFeedingService.cs | 4 +-- .../Tnb.ProductionMgr/PrdInstockService.cs | 19 +++++++----- .../Manager/User/IUserManager.cs | 5 +++ .../Manager/User/UserManager.part.cs | 31 +++++++++++++++++++ 4 files changed, 49 insertions(+), 10 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs index 4087a392..051a456d 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs @@ -553,7 +553,7 @@ namespace Tnb.ProductionMgr .LeftJoin((a, b) => a.create_id == b.Id) .LeftJoin((a,b,c)=>a.id==c.source_id) .LeftJoin((a,b,c,d)=>d.EnCode==DictConst.DOCUMENTSTATU) - .LeftJoin((a,b,c,d,e)=>e.DictionaryTypeId==d.Id && c.status==e.Id) + .LeftJoin((a,b,c,d,e)=>e.DictionaryTypeId==d.Id && a.status==e.EnCode) .Where((a,b)=>a.workstation_id==input.stationId) .WhereIF(statusList.Count>0,(a,b,c,d,e)=>statusList.Contains(e.EnCode)) .Select((a, b,c,d,e) => new FeedingRecordListOutput() @@ -571,7 +571,7 @@ namespace Tnb.ProductionMgr .LeftJoin((a, b) => a.create_id == b.Id) .LeftJoin((a,b,c)=>a.id==c.source_id) .LeftJoin((a,b,c,d)=>d.EnCode==DictConst.DOCUMENTSTATU) - .LeftJoin((a,b,c,d,e)=>e.DictionaryTypeId==d.Id && c.status==e.Id) + .LeftJoin((a,b,c,d,e)=>e.DictionaryTypeId==d.Id && a.status==e.EnCode) .Where((a,b)=>a.workstation_id==input.stationId) .WhereIF(statusList.Count>0,(a,b,c,d,e)=>statusList.Contains(e.EnCode)) .Select((a, b,c,d,e) => new FeedingRecordListOutput() diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs index be46cce0..7a241b19 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdInstockService.cs @@ -199,7 +199,7 @@ namespace Tnb.ProductionMgr }); } // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; - string domain = "http://tnb.tuotong-tech.com"; + string domain = _userManager.Domain; Dictionary header = new() { ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] @@ -397,7 +397,7 @@ namespace Tnb.ProductionMgr }); // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; // string domain = "http://localhost:9232"; - string domain = "http://tnb.tuotong-tech.com"; + string domain = _userManager.Domain; Dictionary header = new() { // ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] @@ -508,7 +508,7 @@ namespace Tnb.ProductionMgr // codeqty = (int)prdReport.reported_qty, // }); // // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; - // string domain = "http://tnb.tuotong-tech.com"; + // string domain = _userManager.Domain; // Dictionary header = new() // { // // ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] @@ -588,7 +588,8 @@ namespace Tnb.ProductionMgr string location_code = basLocation.location_code; PrdReport prdReport = await db.Queryable() - .Where(x => x.equip_id == equipment.id && x.status == 0).OrderByDescending(x => x.create_time) + .LeftJoin((x,y)=>x.material_id==y.id) + .Where((x,y) => y.category_id.Contains("\"DGJCJ\"") && x.status == 0).OrderByDescending(x => x.create_time) .FirstAsync(); BasMaterial basMaterial = await db.Queryable().SingleAsync(x => x.id == prdReport.material_id); @@ -653,7 +654,7 @@ namespace Tnb.ProductionMgr material_id = prdReport.material_id, material_code = basMaterial.code, unit_id = prdReport.unit_id, - code_batch = prdReport.barcode, + code_batch = prdReport.mo_task_code, pr_qty = (int)prdReport.reported_qty, }); @@ -667,7 +668,9 @@ namespace Tnb.ProductionMgr codeqty = (int)prdReport.reported_qty, }); // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; - string domain = "http://tnb.tuotong-tech.com"; + // string domain = _userManager.Domain; + // string domain = "http://localhost:9232"; + string domain = _userManager.Domain; Dictionary header = new() { // ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] @@ -781,7 +784,7 @@ namespace Tnb.ProductionMgr codeqty = (int)prdReport.reported_qty, }); // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; - string domain = "http://tnb.tuotong-tech.com"; + string domain = _userManager.Domain; // string domain = "http://localhost:9232"; Dictionary header = new() { @@ -971,7 +974,7 @@ namespace Tnb.ProductionMgr } // string domain = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; - string domain = "http://tnb.tuotong-tech.com"; + string domain = _userManager.Domain; Dictionary header = new() { // ["Authorization"] = App.HttpContext.Request.Headers["Authorization"] diff --git a/common/Tnb.Common.Core/Manager/User/IUserManager.cs b/common/Tnb.Common.Core/Manager/User/IUserManager.cs index c1804ac7..2f40a2e3 100644 --- a/common/Tnb.Common.Core/Manager/User/IUserManager.cs +++ b/common/Tnb.Common.Core/Manager/User/IUserManager.cs @@ -161,4 +161,9 @@ public interface IUserManager /// 获取管理员用户id. /// string GetAdminUserId(); + + /// + /// 域名 + /// + string Domain{ get; } } \ No newline at end of file diff --git a/common/Tnb.Common.Core/Manager/User/UserManager.part.cs b/common/Tnb.Common.Core/Manager/User/UserManager.part.cs index a36fd66a..78546641 100644 --- a/common/Tnb.Common.Core/Manager/User/UserManager.part.cs +++ b/common/Tnb.Common.Core/Manager/User/UserManager.part.cs @@ -6,5 +6,36 @@ public partial class UserManager { public static string AsscessToken { get; set; } + + public string Domain + { + get + { + try + { + string host = ""; + if (App.HttpContext != null) + { + host = (App.HttpContext.Request.IsHttps ? "https://" : "http://") + App.HttpContext.Request.Host; + } + else + { + var datatable = _repository.AsSugarClient().Ado + .GetDataTable("select * from bas_factory_config where key='domain' limit 1"); + if (datatable.Rows.Count > 0) + { + host = datatable.Rows[0]["value"].ToString(); + Console.WriteLine(host); + } + } + return host; + } + catch (Exception e) + { + return "http://tnb.tuotong-tech.com"; + } + + } + } } \ No newline at end of file From c879f0b6bd7fb3c0f16d5af303399419dac7b58d Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Thu, 23 Nov 2023 14:49:38 +0800 Subject: [PATCH 2/5] 1 --- .../Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs | 4 ++-- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs index d7546ed5..5a4b020b 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Enums/EnumTaskChainType.cs @@ -5,9 +5,9 @@ /// public enum EnumTaskChainType { - AGV = 1, + CTU = 1, KIVA = 2, - CTU = 3, + AGV = 3, 电梯 = 4, 输送线 = 5, } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 3ea2ec4f..90e37cb1 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -460,11 +460,12 @@ namespace Tnb.WarehouseMgr private async Task CallingLanding(List<(string endlocation_code, string device_id, string id, string floorNO)> endLocCodes) { Logger.Information($" 开始呼梯操作............."); + Logger.Information($"电梯信息:{JsonConvert.SerializeObject(s_elevatorMap)}"); try { foreach ((_, string devId, string disTaskId, string floorNO) in endLocCodes) { - + Logger.Information($"devId:{devId}"); if (!s_elevatorMap.TryGetValue(devId, out object? elevatorCode)) { continue; @@ -1041,22 +1042,18 @@ namespace Tnb.WarehouseMgr { if (points.FindAll(x => x.location_code != null && x.location_code.Contains("dt", StringComparison.OrdinalIgnoreCase))?.Count > 0) { - Logger.Information("获取当前电梯点"); //查询当前电梯点 List curEleDs = await _db.Queryable().Where(it => points.Select(x => x.id).Contains(it.point_id)).ToListAsync(); - Logger.Information($"当前电梯点:{string.Join(",",curEleDs.Select(x=>x.point_code))}"); //如果有电梯点，则会进行电梯的均匀分配 if (curEleDs?.Count > 0) { //当前电梯 WmsElevatorH curEle = await _db.Queryable().SingleAsync(it => it.id == curEleDs.First().bill_id && it.enabled == 1); - Logger.Debug($"档期电梯信息：{JsonConvert.SerializeObject(curEle)}"); //同电梯组电梯 List sGpEle = await _db.Queryable().Where(it => it.elevator_group == curEle.elevator_group && it.id != curEle.id && it.enabled == 1).ToListAsync(); - Logger.Debug($"同电梯组电梯：{JsonConvert.SerializeObject(sGpEle)}"); if (curEle == null && sGpEle?.Count > 0) { From 4071804c634644d77fb9dc00719ba8b0d5f89263 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Thu, 23 Nov 2023 15:38:18 +0800 Subject: [PATCH 3/5] 1 --- ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs index 051a456d..7bd25207 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs @@ -553,9 +553,9 @@ namespace Tnb.ProductionMgr .LeftJoin((a, b) => a.create_id == b.Id) .LeftJoin((a,b,c)=>a.id==c.source_id) .LeftJoin((a,b,c,d)=>d.EnCode==DictConst.DOCUMENTSTATU) - .LeftJoin((a,b,c,d,e)=>e.DictionaryTypeId==d.Id && a.status==e.EnCode) + .LeftJoin((a,b,c,d,e)=>e.DictionaryTypeId==d.Id && c.status==e.Id) .Where((a,b)=>a.workstation_id==input.stationId) - .WhereIF(statusList.Count>0,(a,b,c,d,e)=>statusList.Contains(e.EnCode)) + .WhereIF(statusList.Count>0,(a,b,c,d,e)=>statusList.Contains(SqlFunc.IsNull(e.EnCode,a.status))) .Select((a, b,c,d,e) => new FeedingRecordListOutput() { id = a.id, @@ -571,9 +571,9 @@ namespace Tnb.ProductionMgr .LeftJoin((a, b) => a.create_id == b.Id) .LeftJoin((a,b,c)=>a.id==c.source_id) .LeftJoin((a,b,c,d)=>d.EnCode==DictConst.DOCUMENTSTATU) - .LeftJoin((a,b,c,d,e)=>e.DictionaryTypeId==d.Id && a.status==e.EnCode) + .LeftJoin((a,b,c,d,e)=>e.DictionaryTypeId==d.Id && c.status==e.Id) .Where((a,b)=>a.workstation_id==input.stationId) - .WhereIF(statusList.Count>0,(a,b,c,d,e)=>statusList.Contains(e.EnCode)) + .WhereIF(statusList.Count>0,(a,b,c,d,e)=>statusList.Contains(SqlFunc.IsNull(e.EnCode,a.status))) .Select((a, b,c,d,e) => new FeedingRecordListOutput() { id = a.id, From 5e92c00df038d17cad8fb1ad3355750739b75edf Mon Sep 17 00:00:00 2001 From: "yang.lee" Date: Thu, 23 Nov 2023 15:51:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?Agv=E7=94=B5=E6=A2=AF=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=8B=E8=AF=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 6 ++++++ apihost/Tnb.API.Entry/Startup.cs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 90e37cb1..88a86f13 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -238,14 +238,17 @@ namespace Tnb.WarehouseMgr List elevatorList = await db.Queryable().InnerJoin((a, b) => a.id == b.bill_id) .Select((a, b) => new WmsElevatorH { + bill_id = b.bill_id, location_id = b.location_id, location_code = b.location_code, point_id = b.point_id, point_code = b.point_code, floor = b.floor + }, true).ToListAsync(); + Logger.Information($"elevatorList:{JsonConvert.SerializeObject(elevatorList)}"); //获取所有未下发的预任务申请 List preTasks = await db.Queryable().InnerJoin((a, b) => a.startlocation_id == b.location_id && a.carry_id == b.id) @@ -370,6 +373,9 @@ namespace Tnb.WarehouseMgr if (endPointIds?.Count > 0) { elevatorList = elevatorList.FindAll(x => endPointIds.Contains(x.point_id)); + + Logger.Information($"过滤后的elevatorList：{JsonConvert.SerializeObject(elevatorList)}"); + if (elevatorList?.Count > 0) { foreach (WmsElevatorH? e in elevatorList) 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 fda9ec5e72d1d82ed4afe569b0be31fc7dfbda40 Mon Sep 17 00:00:00 2001 From: zhoukeda <1315948824@qq.com> Date: Thu, 23 Nov 2023 15:52:03 +0800 Subject: [PATCH 5/5] 1 --- .../Tnb.ProductionMgr/PrdFeedingService.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs index 7bd25207..4507a7f1 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs @@ -30,6 +30,7 @@ namespace Tnb.ProductionMgr private readonly IUserManager _userManager; private readonly IPrdMoTaskService _prdMoTaskService; private readonly IBillRullService _billRullService; + private readonly IDictionaryDataService _dictionaryDataService; // private readonly WmsSignForDeliveryService _wmsSignForDeliveryService; @@ -39,6 +40,7 @@ namespace Tnb.ProductionMgr IBillRullService billRullService, IPrdMoTaskService prdMoTaskService, // WmsSignForDeliveryService wmsSignForDeliveryService, + IDictionaryDataService dictionaryDataService, IUserManager userManager ) { @@ -46,6 +48,7 @@ namespace Tnb.ProductionMgr _userManager = userManager; _prdMoTaskService = prdMoTaskService; // _wmsSignForDeliveryService = _wmsSignForDeliveryService; + _dictionaryDataService = dictionaryDataService; _billRullService = billRullService; } @@ -522,7 +525,9 @@ namespace Tnb.ProductionMgr string? status = queryJson.ContainsKey("status") ? queryJson["status"].ToString() : ""; // DateTime? start_time = queryJson.ContainsKey("start_time") ? queryJson["start_time"].ToString() == "" ? null : Convert.ToDateTime(queryJson["start_time"]) : null; // DateTime? end_time = queryJson.ContainsKey("end_time") ? queryJson["end_time"].ToString() == "" ? null : Convert.ToDateTime(queryJson["end_time"]) : null; - + + Dictionary dic = await _dictionaryDataService.GetDicByKey(DictConst.DOCUMENTSTATU); + if (string.IsNullOrEmpty(input.sidx)) { input.sidx = "create_time"; @@ -564,7 +569,7 @@ namespace Tnb.ProductionMgr type = "0", create_name = b.RealName, create_time = a.create_time==null ? "" : a.create_time.Value.ToString(DbTimeFormat.SS), - status = e.FullName + status = SqlFunc.IsNull(e.FullName,a.status) }); var queryable2 = db.Queryable() @@ -582,11 +587,18 @@ namespace Tnb.ProductionMgr type = a.type, create_name = b.RealName, create_time = a.create_time==null ? "" : a.create_time.Value.ToString(DbTimeFormat.SS), - status = e.FullName + status = SqlFunc.IsNull(e.FullName,a.status) }); var result = await db.UnionAll(queryable1,queryable2) .MergeTable() .OrderBy($"{input.sidx} {input.sort}") + .Mapper(a => + { + if (dic.ContainsKey(a.status)) + { + a.status = dic[a.status].ToString(); + } + }) .ToPagedListAsync(input.currentPage, input.pageSize); return PageResult.SqlSugarPageResult(result);