From 8f0f149d607a7246fa25e81340602ce5e47398fe Mon Sep 17 00:00:00 2001 From: pulg <plg@Haninfo> Date: 星期四, 10 七月 2025 18:14:38 +0800 Subject: [PATCH] 1 --- HH.WCS.QingXiNongfu/core/TaskCore.cs | 311 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 309 insertions(+), 2 deletions(-) diff --git a/HH.WCS.QingXiNongfu/core/TaskCore.cs b/HH.WCS.QingXiNongfu/core/TaskCore.cs index aedaea0..6035cc5 100644 --- a/HH.WCS.QingXiNongfu/core/TaskCore.cs +++ b/HH.WCS.QingXiNongfu/core/TaskCore.cs @@ -3,10 +3,10 @@ using HH.WCS.QingXigongchang.process; using HH.WCS.QingXigongchang.util; using HH.WCS.QingXigongchang.wms; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; -using System.Xml.Schema; using static HH.WCS.QingXigongchang.api.ApiModel; namespace HH.WCS.QingXigongchang.core @@ -34,7 +34,7 @@ && wmsTask.S_B_STATE.Trim() != "寮哄埗瀹屾垚" && wmsTask.S_B_STATE.Trim() != "鍙栨秷") { - if (model.State < 8 || model.State > 1000) + if (model.State < 10 || model.State > 1000) { if (model.State < 7 && string.IsNullOrEmpty(model.ForkliftNo)) { @@ -96,6 +96,15 @@ r = TaskProcess.OperateStatus(wmsTask, 8); if (r.ResultCode != -1) TaskHelper.BeEnd(wmsTask); + break; + case 9://寮哄埗鍙栨秷 //璧风偣瑙g粦閿侀噴鏀�缁堢偣閿侀噴鏀�+ // var R = NDCHelper.CancelS(model.No); + r = TaskProcess.OperateStatus(wmsTask, 9); + if (r.ResultCode != -1) + { + wmsTask.T_END_TIME = DateTime.Now; + TaskHelper.UpdateStatus(wmsTask, "鍙栨秷"); + } break; @@ -199,6 +208,17 @@ var list = TaskHelper.GetTaskListByState("鏈墽琛�); if (list.Count > 0) { + //foreach (var mst in list) + //{ + // var dinfo = Settings.GetDeviceInfoList().FindAll(x => x.deviceType == 13); + // if (dinfo.Find(x => x.location.Contains(mst.S_START_LOC)) != null) + // mst.N_PRIORITY = 99; + // else + // if (dinfo.Find(x => x.location.Contains(mst.S_END_LOC)) != null) + // mst.N_PRIORITY = 98; + //} + //list = list.OrderByDescending(x => x.N_PRIORITY).ToList(); + list.ForEach(task => { if (!TaskProcess.Intercept(task)) @@ -238,7 +258,294 @@ } } + /// <summary> + /// 60鍒嗛挓鏇存柊涓�搴撳 + /// </summary> + /// <param name="min"></param> + public static void CheckKuRong(int min) + { + try + { + Console.WriteLine("CheckKurRong"); + //濡傛灉琛ㄥ唴娌℃湁鏁版嵁灏卞垵濮嬪寲涓�笅锛屾湁鏁版嵁浜唌odify鏃堕棿鍜屽綋鍓嶆椂闂磋秴杩�0min鍐嶇粺璁′竴娆�+ var db = new SqlHelper<object>().GetInstance(); + var info = db.Queryable<KuRong>().First(); + if (info == null || DateTime.Now.Subtract(info.T_MODIFY).TotalMinutes > min) + { + //1銆佹煡鍒板皬鏉垮簱鍖轰笅闈㈡墍鏈夌殑搴撲綅 + var totalX = 0; + var totalRows = 0; + var list = new List<KuRong>(); + var areas = db.Queryable<Location>().Select(x => x.S_AREA_CODE).ToList().FindAll(x => System.Text.RegularExpressions.Regex.IsMatch(x, @"QX-\d+_[A-Z]+")).Select(x => x.Split('_')[0]).Distinct().ToList(); //GetAreas(); + areas.ForEach(area => + { + totalX += db.Queryable<Location>().Count(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_X")); + totalRows += db.Queryable<Location>().Where(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_X")).Select(b => b.N_ROW).Distinct().Count(); + var aresList = db.Queryable<Location>().Where(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_")).Select(b => b.S_AREA_CODE).Distinct().ToList(); + aresList = aresList.Select(a => a.Split('_')[0]).Distinct().ToList(); + aresList.ForEach(a => + { + //b => b.S_AREA_CODE == a + "_X" + Console.WriteLine("area:" + a); + // && b.S_AREA_CODE.EndsWith("X") + var rows = db.Queryable<Location>().Where(b => b.S_AREA_CODE.StartsWith(a)).Select(b => b.N_ROW).Distinct().ToList(); + if (rows.Count > 0) + { + Console.WriteLine(string.Join(",", rows)); + rows.ForEach(b => + { + var kr = new KuRong() { StorageLoc = a.Split('-')[1] + "-" + b, T_MODIFY = DateTime.Now }; + Console.WriteLine(kr.StorageLoc); + //姣忎竴鎺掕鏌ヤ竴涓嬫湁娌℃湁鎵樼洏 + var listLoc = db.Queryable<Location>().Where(c => c.S_AREA_CODE.Contains(c.S_AREA_CODE) && c.N_ROW == b && c.N_CURRENT_NUM > 0).ToList(); + if (!listLoc.Any()) + { + //娌℃墭鐩橈紝榛樿鏈�ぇ瀹归噺鏄皬鏉跨殑鏁伴噺 + var count = db.Queryable<Location>().Count(c => c.S_AREA_CODE == a + "_X" && c.N_ROW == b) * 2 * 2;//2灞�鎵�+ kr.MaxCapacity = count; + kr.AvailableCapacity = count; + kr.ProductItem = ""; + } + else + { + //鏈夋墭鐩�鍒ゆ柇鏄彔2灞傝繕鏄�灞傦紝瑕佽幏鍙栫墿鏂欎俊鎭�+ var lcr = db.Queryable<LocCntrRel>().Includes(it => it.CntrItemRel).Where(l => l.S_LOC_CODE == listLoc[0].S_LOC_CODE).First(); + if (lcr != null && lcr.CntrItemRel != null) + { + var maxLayer = ContainerHelper.GetItem(ass => ass.S_ITEM_NAME == lcr.CntrItemRel.S_ITEM_NAME && ass.S_ITEM_CODE == lcr.CntrItemRel.S_ITEM_CODE)?.MaxLayer ?? listLoc[0].N_CAPACITY; + var total = db.Queryable<Location>().Count(c => c.S_AREA_CODE == listLoc[0].S_AREA_CODE && c.N_ROW == b) * maxLayer * 2; + var count = db.Queryable<Location>().Where(c => c.S_AREA_CODE == listLoc[0].S_AREA_CODE && c.N_ROW == b && c.N_CURRENT_NUM > 0).Sum(c => c.N_CURRENT_NUM) * 2; // 鎸囧畾缁熻瀛楁 + kr.ProductItem = lcr.CntrItemRel.S_ITEM_CODE; + kr.MaxCapacity = total; + kr.FilledCapacity = count; + kr.AvailableCapacity = total - count; + } + } + list.Add(kr); + }); + } + else + { + Console.WriteLine("area:" + a + ":鏈幏鍙栧埌鎺�); + } + }); + }); + var ordersCount = db.Queryable<WorkOrder>().Where(a => a.SQL_State == "鎵ц涓�).Count(); + var totalDesiredCapacity = ordersCount * 4 * 3 * (totalX / totalRows); + LogHelper.Error($"鎴愬搧灏忔澘鍖烘�璐т綅鏄瘂totalX},鎬绘帓鏁版槸{totalRows},褰撳墠鎵ц宸ュ崟鏁伴噺鏄瘂ordersCount}", null); + var totalAvailableCapacity = list.Sum(a => a.AvailableCapacity); + var totalAssignableCapacity = totalAvailableCapacity - totalDesiredCapacity; + list.ForEach(a => { a.DesiredCapacity = totalDesiredCapacity; a.CRC = totalAvailableCapacity; a.RAC = totalAssignableCapacity; }); + if (info == null) + { + /*鈥婼QL Server鈥�1000 鏉�鎵规 鍗曚釜 INSERT 璇彞鏈�鏀寔 1000 鏉�VALUES 瀛愬彞锛岃秴鍑轰細鎶ヨ娉曢敊璇�*/ + db.Insertable(list).ExecuteCommand(); + } + else + { + //鏇存柊 + list.ForEach(a => + { + var old = db.Queryable<KuRong>().Where(b => b.StorageLoc == a.StorageLoc).First(); + if (old != null) + { + old.MaxCapacity = a.MaxCapacity; + old.AvailableCapacity = a.AvailableCapacity; + old.FilledCapacity = a.FilledCapacity; + old.ProductItem = a.ProductItem; + old.DesiredCapacity = a.DesiredCapacity; + old.CRC = a.CRC; + old.RAC = a.RAC; + old.T_MODIFY = DateTime.Now; + db.Updateable(old).UpdateColumns(it => new { it.MaxCapacity, it.FilledCapacity, it.AvailableCapacity, it.ProductItem, it.T_MODIFY }).ExecuteCommand(); + } + else + { + db.Insertable(a).ExecuteCommand(); + } + }); + } + } + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + LogHelper.Error(ex.Message, ex); + } + + //缁熻褰撳墠浜х嚎 + } + + internal static void Kuronggg() + { + int min = 60; + try + { + LogHelper.Info("Run>>CheckKurRong"); + //濡傛灉琛ㄥ唴娌℃湁鏁版嵁灏卞垵濮嬪寲涓�笅锛屾湁鏁版嵁浜唌odify鏃堕棿鍜屽綋鍓嶆椂闂磋秴杩�0min鍐嶇粺璁′竴娆�+ var db = new SqlHelper<object>().GetInstance(); + var info = db.Queryable<KuRong>().First(); + if (info == null || DateTime.Now.Subtract(info.T_MODIFY).TotalMinutes > min) + { + db.Deleteable<KuRong>().ExecuteCommand(); + info = null; + + //1銆佹煡鍒板皬鏉垮簱鍖轰笅闈㈡墍鏈夌殑搴撲綅 + var totalX = 0; + var totalRows = 0; + var list = new List<KuRong>(); + var areas = db.Queryable<Location>().Select(x => x.S_AREA_CODE).ToList().FindAll(x => x != null && System.Text.RegularExpressions.Regex.IsMatch(x, @"QX-\d+_[A-Z]+")).Select(x => x.Split('_')[0]).Distinct().ToList(); //GetAreas(); + LogHelper.Info($"KurRongCalc List {JsonConvert.SerializeObject(areas)}"); + areas.ForEach(area => + { + totalX += db.Queryable<Location>().Count(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_X")); + totalRows += db.Queryable<Location>().Where(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_X")).Select(b => b.N_ROW).Distinct().Count(); + var aresList = db.Queryable<Location>().Where(b => b.S_AREA_CODE.StartsWith(area) && b.S_AREA_CODE.Contains("_")).Select(b => b.S_AREA_CODE).Distinct().ToList(); + aresList = aresList.Select(a => a.Split('_')[0]).Distinct().ToList(); + LogHelper.Info($"KurRongCalc aresList {JsonConvert.SerializeObject(aresList)}"); + aresList.ForEach(a => + { + //b => b.S_AREA_CODE == a + "_X" + Console.WriteLine("area:" + a); + // && b.S_AREA_CODE.EndsWith("X") + var rows = db.Queryable<Location>().Where(b => b.S_AREA_CODE.StartsWith(a)).Select(b => b.N_ROW).Distinct().ToList(); + if (rows.Count > 0) + { + Console.WriteLine(string.Join(",", rows)); + rows.ForEach(b => + { + var kr = new KuRong() { StorageLoc = a.Split('-')[1] + "-" + b, T_MODIFY = DateTime.Now }; + Console.WriteLine(kr.StorageLoc); + //姣忎竴鎺掕鏌ヤ竴涓嬫湁娌℃湁鎵樼洏 + var listLoc = db.Queryable<Location>().Where(c => c.S_AREA_CODE.Contains(a) && c.N_ROW == b).ToList();//&& c.N_CURRENT_NUM > 0 + + //濡傛灉鏈夋甯哥墿鏂欐帓锛屽氨鐢紝 娌℃湁鎴栬� 绌烘帓 锛屽氨鐢ㄥ皬鏉�+ var norAreacode = ""; + foreach (var arl in listLoc.GroupBy(x => x.S_AREA_CODE)) + { + if (arl.ToList().Find(x => x.S_LOCK_STATE.Contains("绌洪棿閿�)) == null) + { + if (arl.ToList().Find(x => x.N_CURRENT_NUM > 0) != null) + { + norAreacode = arl.Key; + break; + } + } + } + LogHelper.Info($"KurRongCalc [{a}]-{b} 缁熻鏄惁姝e父{norAreacode}"); + if (string.IsNullOrEmpty(norAreacode)) + { + norAreacode = a + "_X"; + //娌℃墭鐩橈紝榛樿鏈�ぇ瀹归噺鏄皬鏉跨殑鏁伴噺 + var count = db.Queryable<Location>().Count(c => c.S_AREA_CODE == norAreacode && c.N_ROW == b) * 2 * 2;//2灞�鎵�+ kr.MaxCapacity = count; + kr.AvailableCapacity = count; + kr.ProductItem = ""; + } + else + { + var locode = listLoc.Find(x => x.S_AREA_CODE == norAreacode && x.N_CURRENT_NUM > 0); + //鏈夋墭鐩�鍒ゆ柇鏄彔2灞傝繕鏄�灞傦紝瑕佽幏鍙栫墿鏂欎俊鎭�+ var lcr = db.Queryable<LocCntrRel>().Includes(it => it.CntrItemRel).Where(l => l.S_LOC_CODE == locode.S_LOC_CODE).First(); + LogHelper.Info($"KurRongCalc {norAreacode}-{locode.S_LOC_CODE}-鑾峰彇鍒版墭鐩樼墿鏂欎俊鎭紵锛歿lcr != null}"); + if (lcr != null && lcr.CntrItemRel != null) + { + var maxLayer = ContainerHelper.GetItem(ass => ass.S_ITEM_NAME == lcr.CntrItemRel.S_ITEM_NAME && ass.S_ITEM_CODE == lcr.CntrItemRel.S_ITEM_CODE)?.MaxLayer ?? 0; + + //LogHelper.Info($"KurRongCalc {norAreacode}-{lcr.CntrItemRel.S_ITEM_NAME}-{lcr.CntrItemRel.S_ITEM_CODE}-maxlayer:{maxLayer}-{locode.S_LOC_CODE}-{locode.N_CAPACITY}"); + if (maxLayer <= 0) + { + maxLayer = locode.N_CAPACITY; + } + var total = db.Queryable<Location>().Count(c => c.S_AREA_CODE == norAreacode && c.N_ROW == b) * maxLayer * 2; + //LogHelper.Info($"KurRongCalc {norAreacode}-{locode.S_LOC_CODE}"); + var count = db.Queryable<Location>().Where(c => c.S_AREA_CODE == norAreacode && c.N_ROW == b && c.N_CURRENT_NUM > 0).Sum(c => c.N_CURRENT_NUM) * 2; // 鎸囧畾缁熻瀛楁 + + kr.ProductItem = lcr.CntrItemRel.S_ITEM_CODE; + if (!string.IsNullOrEmpty(lcr.CntrItemRel.S_ITEM_NAME)) + kr.ProductItem = lcr.CntrItemRel.S_ITEM_NAME; + kr.MaxCapacity = total; + kr.FilledCapacity = count; + kr.AvailableCapacity = total - count; + } + } + list.Add(kr); + }); + } + else + { + Console.WriteLine("area:" + a + ":鏈幏鍙栧埌鎺�); + } + }); + + }); + + var ordersCount = 0;// db.Queryable<WorkOrder>().Where(a => a.SQL_State == "鎵ц涓�).Count(); + foreach (var pline in Settings.GetDeviceInfoList().FindAll(x => x.deviceType == 9)) + { + ordersCount += db.Queryable<WorkOrder>().Where(a => a.SQL_PLineNo == pline.deviceName && a.SQL_State == "鎵ц涓�).Count(); + } + var totalDesiredCapacity = ordersCount * 4 * 3 * (totalX / totalRows); + LogHelper.Error($"鎴愬搧灏忔澘鍖烘�璐т綅鏄瘂totalX},鎬绘帓鏁版槸{totalRows},褰撳墠鎵ц宸ュ崟鏁伴噺鏄瘂ordersCount}", new Exception("Kurong")); + //var totalAvailableCapacity = list.Sum(a => a.AvailableCapacity); + //var totalAssignableCapacity = totalAvailableCapacity - totalDesiredCapacity; + //list.ForEach(a => { a.DesiredCapacity = totalDesiredCapacity; a.CRC = totalAvailableCapacity; a.RAC = totalAssignableCapacity; }); + var totalAvailableCapacity = list.Sum(a => a.MaxCapacity);// AvailableCapacity); + var DRC = list.Sum(x => x.FilledCapacity); + var totalAssignableCapacity = totalAvailableCapacity - DRC - totalDesiredCapacity; + var BAC = list.Sum(x => x.AvailableCapacity); + list.ForEach(a => + { + a.DesiredCapacity = totalDesiredCapacity; + a.CRC = totalAvailableCapacity; + a.RAC = totalAssignableCapacity; + a.BAC = BAC; + a.DRC = DRC; + }); + if (info == null) + { + /*鈥婼QL Server鈥�1000 鏉�鎵规 鍗曚釜 INSERT 璇彞鏈�鏀寔 1000 鏉�VALUES 瀛愬彞锛岃秴鍑轰細鎶ヨ娉曢敊璇�*/ + for (int i = 0; i < list.Count; i += 1000) + { + db.Insertable(list.Skip(i).Take(1000).ToList()).ExecuteCommand(); + } + } + else + { + //鏇存柊 + list.ForEach(a => + { + var old = db.Queryable<KuRong>().Where(b => b.StorageLoc == a.StorageLoc).First(); + if (old != null) + { + old.MaxCapacity = a.MaxCapacity; + old.AvailableCapacity = a.AvailableCapacity; + old.FilledCapacity = a.FilledCapacity; + old.ProductItem = a.ProductItem; + old.DesiredCapacity = a.DesiredCapacity; + old.CRC = a.CRC; + old.RAC = a.RAC; + old.T_MODIFY = DateTime.Now; + db.Updateable(old).UpdateColumns(it => new { it.MaxCapacity, it.FilledCapacity, it.AvailableCapacity, it.ProductItem, it.T_MODIFY }).ExecuteCommand(); + } + else + { + db.Insertable(a).ExecuteCommand(); + } + }); + } + } + + LogHelper.Info("OVER<<CheckKurRong"); + } + catch (Exception ex) + { + Console.WriteLine(ex.Message); + LogHelper.Error(ex.Message, ex); + } + + } } } -- Gitblit v1.9.1