From 4a3a2c6ec04cb9680915d29b1a3c9cec6957bf60 Mon Sep 17 00:00:00 2001 From: 杨张扬 <634643841@qq.com> Date: 星期一, 16 六月 2025 17:40:15 +0800 Subject: [PATCH] 双钱-复检区合格物料自动回库 --- core/Monitor.cs | 328 ++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 254 insertions(+), 74 deletions(-) diff --git a/core/Monitor.cs b/core/Monitor.cs index b0de987..8ffc3c5 100644 --- a/core/Monitor.cs +++ b/core/Monitor.cs @@ -133,7 +133,10 @@ else { var endLoc = db.Queryable<TN_Location>(). - Where(c => c.S_AREA_CODE == Settings.Areas[1] && c.S_LOCK_STATE == "鏃� && c.N_LOCK_STATE == 0 && c.N_CURRENT_NUM == 0 && c.C_ENABLE == "Y"). + Where(c => c.S_AREA_CODE == Settings.Areas[1] && c.S_LOCK_STATE == "鏃� + && c.N_LOCK_STATE == 0 && c.N_CURRENT_NUM == 0 + && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == c.S_CODE).NotAny()//涓嶈兘鏈夎揣 + && c.C_ENABLE == "Y"). OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鐩存帴鍒ゆ柇褰撳墠鏁伴噺涓�鍗冲彲 if (endLoc != null) @@ -179,7 +182,7 @@ endLoc.N_LOCK_STATE = 1; endLoc.S_LOCK_STATE = "鍏ュ簱閿�; - startLoc.T_MODIFY = System.DateTime.Now; + endLoc.T_MODIFY = System.DateTime.Now; using (var tran = db.Ado.UseTran()) { @@ -278,7 +281,7 @@ return; } - var endLoc = db.Queryable<TN_Location>(). + var endLoc = db.Queryable<TN_Location>().//绌烘墭涓婄嚎鐨勭粓鐐逛笉鏍¢獙鏄惁鏈夎揣 First(a => a.S_CODE == endPoint.PointIn && a.S_LOCK_STATE == "鏃� && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y"); if (endLoc == null) @@ -347,6 +350,84 @@ } /// <summary> + /// 鍦ㄥ妫�尯妫�祴鐗╁搧鍚堟牸锛屽悎鏍肩殑鐗╁搧鑷姩鍥炲簱 + /// </summary> + internal static void CGOkCheck() + { + var db = new SqlHelper<object>().GetInstance(); + try + { + var startLoc = db.Queryable<TN_Location>() + .LeftJoin<TN_Loc_Container>((o, i) => o.S_CODE == i.S_LOC_CODE) + .LeftJoin<TN_CG_Detail>((o, i, s) => i.S_CNTR_CODE == s.S_CNTR_CODE) + .Where((o, i, s) => s.N_ITEM_STATE == 0 && s.S_ITEM_STATE == "鍚堟牸" + && o.S_AREA_CODE == Settings.Areas[7] && o.N_CURRENT_NUM > 0 + && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�).First(); + + if (startLoc== null) + { + LogHelper.Info("澶嶆鍖烘病鏈夊悎鏍肩殑鐗╁搧锛屾棤闇�嚜鍔ㄨ繑鍥�); + return; + } + + var endLoc = db.Queryable<TN_Location>().First(a => a.S_AREA_CODE == Settings.Areas[1] + && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� + && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == a.S_CODE).NotAny()//涓嶈兘鏈夎揣 + ); + + if (endLoc == null) + { + LogHelper.Info("缁堢偣搴撳尯宸叉弧鎴栬�宸插叏閮ㄩ攣浣�); + return; + } + + var cginfo = db.Queryable<TN_CG_Detail>() + .LeftJoin<TN_Loc_Container>((o, i) => o.S_CNTR_CODE == i.S_CNTR_CODE) + .Where((o, i) => i.S_LOC_CODE == startLoc.S_CODE).First(); + + if (WCSHelper.CreateTask(startLoc.S_CODE, endLoc.S_CODE, "澶嶆鍚堟牸鑷姩鍥炲簱", 3, cginfo.S_CNTR_CODE, out string taskNo, cginfo.S_SPE))//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣�+ { + LocationHelper.LockLoc(startLoc.S_CODE, 2);//璧风偣鍑哄簱閿侊紝 + LocationHelper.LockLoc(endLoc.S_CODE, 1);//缁堢偣鍏ュ簱閿�+ LogHelper.Info($"鐢熸垚澶嶆鍚堟牸鑷姩鍥炲簱浠诲姟鎴愬姛锛屽鍣ㄥ彿{cginfo.S_CNTR_CODE}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐箋endLoc.S_CODE}"); + + Task task99 = Task.Run(() => + { + WMSHelper.InsertOpInfo("鑷姩杞", "澶嶆鍚堟牸鑷姩鍥炲簱", cginfo.S_CNTR_CODE); + }); + + Task task27 = Task.Run(() => + { + var target = new TN_InventoryM() + { + S_ID = cginfo.S_ID, + RFID = cginfo.S_CNTR_CODE, + SPEC = cginfo.S_SPE, + WEIGHT = cginfo.F_QTY, + ITEMSTATE = cginfo.S_ITEM_STATE, + ITEMCODE = cginfo.S_ITEM_CODE, + LOGINNAME = "鑷姩杞", + SHIFT = "鏃�, + }; + SpecHelper.InsertInventoryM(target); + }); + + return ; + } + else + { + LogHelper.Info($"鐢熸垚澶嶆鍚堟牸鑷姩鍥炲簱浠诲姟澶辫触锛屽鍣ㄥ彿{cginfo.S_CNTR_CODE}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐箋endLoc.S_CODE}"); + return; + } + + } + catch(Exception ex) + { + LogHelper.Error("CGOkCheck鍙戠敓浜嗗紓甯�, ex); + } + } + + /// <summary> /// 婊℃墭杩囨湡鍑哄簱 杩囨湡鍚堟牸鍥炲簱锛岃繃鏈熸鍝佸洖鐐� /// </summary> internal static void FullOutTime() @@ -366,8 +447,9 @@ if (startLoc_1 != null) { var endLoc_1 = db.Queryable<TN_Location>() - .First(o => o.S_AREA_CODE == Settings.Areas[12] && - o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�); + .Where(o => o.S_AREA_CODE == Settings.Areas[12] + && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()//涓嶈兘鏈夎揣 + && o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�).First(); if (endLoc_1 != null) { @@ -399,8 +481,9 @@ if (startLoc_2 != null) { var endLoc_2 = db.Queryable<TN_Location>() - .First(o => o.S_AREA_CODE == Settings.Areas[2] && - o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�); + .Where(o => o.S_AREA_CODE == Settings.Areas[2] + && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()//涓嶈兘鏈夎揣 + && o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�).First(); if (endLoc_2 != null) { @@ -443,8 +526,9 @@ if (startLoc_3 != null) { var endLoc_3 = db.Queryable<TN_Location>() - .First(o => o.S_AREA_CODE == Settings.Areas[11] && - o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�); + .Where(o => o.S_AREA_CODE == Settings.Areas[11] + && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == o.S_CODE).NotAny()//涓嶈兘鏈夎揣 + && o.N_CURRENT_NUM == 0 && o.N_LOCK_STATE == 0 && o.S_LOCK_STATE == "鏃�).First(); if (endLoc_3 != null) { @@ -467,7 +551,8 @@ SPEC = outTimeCg.S_SPE, CARCODE = outTimeCg.S_CAR_CODE, WEIGHT = outTimeCg.F_QTY, - REMELTTIME = DateTime.Now + REMELTTIME = DateTime.Now, + SHIFT = "None", }; SpecHelper.InsertRemeltDetail(target); }); @@ -497,7 +582,7 @@ var targetEPD = db.Queryable<TN_EquipProDetail>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID). Where((o, i) => o.ITEMSTATE != i.S_ITEM_STATE && i.S_ITEM_STATE != "寰呮" && i.N_ITEM_STATE != 1).First(); - if (targetEPD != null) + if (targetEPD != null)//鍚屾璐у搧鐘舵� { targetEPD.ITEMSTATE = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetEPD.S_ID).S_ITEM_STATE; db.Updateable<TN_EquipProDetail>(targetEPD).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand(); @@ -506,7 +591,7 @@ targetEPD = db.Queryable<TN_EquipProDetail>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID). Where((o, i) => System.DateTime.Now >= o.EXPIRATION && i.S_ITEM_STATE == "寰呮" && i.N_ITEM_STATE == 1).First(); - if (targetEPD != null) + if (targetEPD != null)//妫�祴鍑鸿繃鏈熺殑璐у搧 { targetEPD.ITEMSTATE = "杩囨湡"; db.Updateable<TN_EquipProDetail>(targetEPD).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand(); @@ -521,18 +606,23 @@ var targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID). Where((o, i) => o.ITEMSTATE != i.S_ITEM_STATE && i.S_ITEM_STATE != "寰呮" && i.N_ITEM_STATE != 1).First(); - if (targetInM != null) + if (targetInM != null)//鍚屾璐у搧鐘舵� { targetInM.ITEMSTATE = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetInM.S_ID).S_ITEM_STATE; db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand(); } + targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID). - Where((o, i) => System.DateTime.Now >= o.EXPIRATION && i.S_ITEM_STATE == "寰呮" && i.N_ITEM_STATE == 1).First(); + Where((o, i) => System.DateTime.Now >= o.EXPIRATION + && ((i.S_ITEM_STATE == "寰呮" && i.N_ITEM_STATE == 1) + || (i.S_ITEM_STATE == "鍚堟牸" && i.N_ITEM_STATE == 0)) + ).First(); - if (targetInM != null) + if (targetInM != null)//妫�祴鍑哄凡杩囨湡鐨勮揣鍝� { targetInM.ITEMSTATE = "杩囨湡"; + targetInM.EXPIRATION_DAY = "0"; db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand(); var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetInM.S_ID); @@ -540,97 +630,180 @@ cginfo.N_ITEM_STATE = 3; db.Updateable<TN_CG_Detail>(cginfo).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand(); } - + targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID). + Where((o, i) => System.DateTime.Now < o.EXPIRATION + && ((i.S_ITEM_STATE == "寰呮" && i.N_ITEM_STATE == 1) + || (i.S_ITEM_STATE == "鍚堟牸" && i.N_ITEM_STATE == 0)) + ).First(); + + if (targetInM != null)//妫�祴鍑哄揩杩囨湡鐨勮揣鍝�+ { + targetInM.EXPIRATION_DAY = SpecHelper.CalculateDaysDifference(System.DateTime.Now,targetInM.EXPIRATION).ToString(); + db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.EXPIRATION_DAY }).ExecuteCommand(); + } + + targetInM = db.Queryable<TN_InventoryM>().First(a => Convert.ToInt32(a.EXPIRATION_DAY) > 0 && a.ITEMSTATE == "杩囨湡"); + if (targetInM != null)//宸茶繃鏈熺殑璐у搧锛屽墿浣欏ぉ鏁版敼涓� + { + targetInM.EXPIRATION_DAY = "0"; + db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.EXPIRATION_DAY }).ExecuteCommand(); + } // 鍚屾 TN_DayProDetail var curDay = System.DateTime.Now.Date; - var targetDay = db.Queryable<TN_DayProDetail>().First(a => a.DAYTIME == curDay); - if (targetDay == null) - { - targetDay = new TN_DayProDetail() - { - DAYTIME = curDay, - }; - db.Insertable(targetDay).ExecuteCommand(); - } - var targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curDay && a.DOWNLINETIME <= curDay.AddDays(1)).ToList(); - var sumWeight = targetEPDs.Sum(a => a.WEIGHT); + var specList = targetEPDs.Select(a => a.SPEC).Distinct().ToList();//褰撳ぉ鐨勮揣鍝佹湁鍝簺瑙勬牸 - if (targetEPDs.Count > 0) + if (specList.Count>0) { - if (targetDay.WEIGHT != sumWeight) + foreach (var item in specList) { - targetDay.WEIGHT = sumWeight; - db.Updateable(targetDay).ExecuteCommand(); - } + var targetDay = db.Queryable<TN_DayProDetail>().First(a => a.DAYTIME == curDay && a.SPEC == item); + if (targetDay == null) + { + targetDay = new TN_DayProDetail() + { + DAYTIME = curDay, + SPEC = item, + }; + db.Insertable(targetDay).ExecuteCommand(); + } + else + { + var sumWeight = targetEPDs.Where(b=>b.SPEC == item).Sum(a => a.WEIGHT); + if (targetDay.WEIGHT != sumWeight) + { + targetDay.WEIGHT = sumWeight; + db.Updateable(targetDay).ExecuteCommand(); + } + else + { + LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_DayProDetail璺宠繃"); + } + } + } + } + else + { + LogHelper.Info("褰撳ぉ鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_DayProDetail璺宠繃"); } // 鍚屾 TN_WeekProSpcDetail var curWeek = System.DateTime.Now.Date.AddDays(-(int)System.DateTime.Now.DayOfWeek + 1); - var targetWeek = db.Queryable<TN_WeekProDetail>().First(a => a.DAYTIME == curWeek); - if (targetWeek == null) - { - targetWeek = new TN_WeekProDetail() - { - DAYTIME = curWeek, - }; - db.Insertable(targetWeek).ExecuteCommand(); - } - targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curWeek && a.DOWNLINETIME <= curWeek.AddDays(7)).ToList(); - if (targetEPDs.Count > 0) + specList = targetEPDs.Select(a => a.SPEC).Distinct().ToList();//褰撳懆鐨勮揣鍝佹湁鍝簺瑙勬牸 + if (specList.Count > 0) { - if (targetWeek.WEIGHT != sumWeight) + foreach (var item in specList) { - targetWeek.WEIGHT = sumWeight; - db.Updateable(targetWeek).ExecuteCommand(); + var targetWeek = db.Queryable<TN_WeekProDetail>().First(a => a.DAYTIME == curWeek && a.SPEC == item); + if (targetWeek == null) + { + targetWeek = new TN_WeekProDetail() + { + DAYTIME = curWeek, + SPEC = item, + }; + db.Insertable(targetWeek).ExecuteCommand(); + } + else + { + var sumWeight = targetEPDs.Where(b => b.SPEC == item).Sum(a => a.WEIGHT); + if (targetWeek.WEIGHT != sumWeight) + { + targetWeek.WEIGHT = sumWeight; + db.Updateable(targetWeek).ExecuteCommand(); + } + else + { + LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_WeekProSpcDetail璺宠繃"); + } + } } + } + else + { + LogHelper.Info("褰撳懆鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_WeekProSpcDetail璺宠繃"); } // 鍚屾 TN_MonthProSpcDetail var curMonth = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1).Date; - var targetMonth = db.Queryable<TN_MonthProDetail>().First(a => a.DAYTIME == curMonth); - if (targetMonth == null) - { - targetMonth = new TN_MonthProDetail() - { - DAYTIME = curMonth, - }; - db.Insertable(targetMonth).ExecuteCommand(); - } targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curMonth && a.DOWNLINETIME <= curMonth.AddMonths(1)).ToList(); - if (targetEPDs.Count > 0) + specList = targetEPDs.Select(a => a.SPEC).Distinct().ToList();//褰撴湀鐨勮揣鍝佹湁鍝簺瑙勬牸 + if (specList.Count > 0) { - if (targetMonth.WEIGHT != sumWeight) + foreach (var item in specList) { - targetMonth.WEIGHT = sumWeight; - db.Updateable(targetMonth).ExecuteCommand(); + var targetMonth = db.Queryable<TN_MonthProDetail>().First(a => a.DAYTIME == curMonth && a.SPEC == item); + if (targetMonth == null) + { + targetMonth = new TN_MonthProDetail() + { + DAYTIME = curMonth, + SPEC = item, + }; + db.Insertable(targetMonth).ExecuteCommand(); + } + else + { + var sumWeight = targetEPDs.Where(b => b.SPEC == item).Sum(a => a.WEIGHT); + if (targetMonth.WEIGHT != sumWeight) + { + targetMonth.WEIGHT = sumWeight; + db.Updateable(targetMonth).ExecuteCommand(); + } + else + { + LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_MonthProSpcDetail璺宠繃"); + } + } } + } + else + { + LogHelper.Info("褰撴湀鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_MonthProSpcDetail璺宠繃"); } // 鍚屾 TN_YearProSpcDetail var curYear = new DateTime(DateTime.Now.Year, 1, 1).Date; - var targetYear = db.Queryable<TN_YearProDetail>().First(a => a.DAYTIME == curYear); - if (targetYear == null) - { - targetYear = new TN_YearProDetail() - { - DAYTIME = curYear, - }; - db.Insertable(targetYear).ExecuteCommand(); - } + targetEPDs = db.Queryable<TN_EquipProDetail>().Where(a => a.DOWNLINETIME >= curYear && a.DOWNLINETIME <= curYear.AddYears(1)).ToList(); - if (targetEPDs.Count > 0) + specList = targetEPDs.Select(a => a.SPEC).Distinct().ToList();//褰撳勾鐨勮揣鍝佹湁鍝簺瑙勬牸 + if (specList.Count > 0) { - if (targetYear.WEIGHT != sumWeight) + foreach (var item in specList) { - targetYear.WEIGHT = sumWeight; - db.Updateable(targetYear).ExecuteCommand(); + var targetYear = db.Queryable<TN_YearProDetail>().First(a => a.DAYTIME == curYear && a.SPEC == item); + if (targetYear == null) + { + targetYear = new TN_YearProDetail() + { + DAYTIME = curYear, + SPEC = item, + }; + db.Insertable(targetYear).ExecuteCommand(); + } + else + { + var sumWeight = targetEPDs.Where(b => b.SPEC == item).Sum(a => a.WEIGHT); + if (targetYear.WEIGHT != sumWeight) + { + targetYear.WEIGHT = sumWeight; + db.Updateable(targetYear).ExecuteCommand(); + } + else + { + LogHelper.Info("閲嶉噺鐩哥瓑锛屽悓姝N_YearProSpcDetail璺宠繃"); + } + } } + } + else + { + LogHelper.Info("褰撳勾鐨勮揣鍝佽鏍煎垪琛ㄤ负0锛屽悓姝N_YearProSpcDetail璺宠繃"); } } catch (Exception ex) @@ -715,7 +888,11 @@ } - var endLoc = db.Queryable<TN_Location>().First(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.S_AREA_CODE == Settings.Areas[7]); + var endLoc = db.Queryable<TN_Location>() + .Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� + && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == a.S_CODE).NotAny()//涓嶈兘鏈夎揣 + && a.S_AREA_CODE == Settings.Areas[7]).First(); + if (endLoc == null) { LogHelper.Info($"鏈壘鍒板悎閫傜殑缁堢偣璐т綅锛岃姹俛.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == 鏃�&& a.S_AREA_CODE == Settings.Areas[7]"); @@ -776,7 +953,10 @@ } var endLoc = db.Queryable<TN_Location>(). - Where(a => a.S_AREA_CODE == Settings.Areas[4] && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y" && a.N_CURRENT_NUM == 0). + Where(a => a.S_AREA_CODE == Settings.Areas[4] && a.N_LOCK_STATE == 0 + && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y" && a.N_CURRENT_NUM == 0 + && SqlFunc.Subqueryable<TN_Loc_Container>().Where(b => b.S_LOC_CODE == a.S_CODE).NotAny() + ). OrderBy(a => a.N_CURRENT_NUM, OrderByType.Asc). First(); -- Gitblit v1.9.1