From d0a265713fd18162f3a82bdcd22e267df7298c7b Mon Sep 17 00:00:00 2001 From: 杨前锦 <1010338399@qq.com> Date: 星期一, 26 五月 2025 08:59:52 +0800 Subject: [PATCH] 印尼佳通-半制品代码逻辑优化 --- HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/core/Monitor.cs | 171 -------------------------------------------------------- 1 files changed, 1 insertions(+), 170 deletions(-) diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/core/Monitor.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/core/Monitor.cs index 15e3d1d..63a691a 100644 --- a/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/core/Monitor.cs +++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.YNJT_PT/core/Monitor.cs @@ -31,177 +31,8 @@ } - internal static void CheckOutWork() { - //璇昏嚜宸辩殑涓棿琛紝鎴戜滑鑷繁鐨勮〃鏈夎〃鏈変釜瀛楁璁℃暟锛岃鏁板皬浜庢渶澶у�锛岀户缁嚭搴擄紝涓�鐢熸垚涓�潯浠诲姟 - } - - - /// <summary> - /// 寰呭畾锛屾椤圭洰plc鎬庝箞瀵规帴杩樹笉纭畾 - /// </summary> - internal static void CheckDevice() { - //妫�祴杈撻�绾跨姸鎬�- - S7Helper.ReadStr("plc1", 100, 1, 8); - S7Helper.ReadBit("plc1", 101, 1, 2); - S7Helper.ReadInt("plc1", 102, 1, 6); - //1 璁惧plc鐨刬p deviceNo 鑷姩寤虹珛杩炴帴 - //2 璁惧瀵瑰簲鐨勯�璁」鍜岀嚎浣撶被鍨嬶紙杈撻�绾垮叆鍙c�杈撻�绾垮嚭鍙c�鎻愬崌鏈虹殑鍏ュ彛銆傘�銆傘�锛夎捣濮嬭鐨勫亸绉诲湴鍧�紝鍐欑殑鍋忕Щ鍦板潃 - //{ "deviceNo":"5","code":"9001","location":"F1CJ-SSX1-01","writeAddr900":0,"writeAddr905":-1,"writeAddr710":0,"readAddr901":2,"readAddr902":0,"lineType":1}, - //3 閫氳椤硅嚜鍔ㄨplc锛岃鍒扮殑鏁版嵁鏍规嵁lineType鍋氬鐞嗭紝鑷姩鍒涘缓浠诲姟鎴栬�鏇存柊浠诲姟鐘舵�锛堝垱寤轰竴涓澶囧姩浣滄垨浠诲姟鍔ㄤ綔锛屽鏋滄槸浠诲姟鍔ㄤ綔鏈変釜绾跨▼鍘昏锛�- } - - // 瀹氭椂鍣�鍗曚綅锛氬垎閽� - private static System.Timers.Timer aTimer = new System.Timers.Timer(Settings.WaitTime * 60000); - private static System.Timers.Timer bTimer = new System.Timers.Timer(Settings.WaitTime * 60000); - - private static string flag1 = null; - private static string flag2 = null; - - internal static void CheckEndLoc() { - - foreach (var item in ApiHelper.cacheInstockInfos) - { - var instockInfo = item.Value; - var end = WMSHelper.GetInstockEnd(instockInfo.item, instockInfo.endArea); - LogHelper.Info("缁堢偣璐т綅锛� + JsonConvert.SerializeObject(end), "TSSG"); - if (end != null) - { - ApiHelper.Instock(instockInfo); - ApiHelper.cacheInstockInfos.Remove(item); - LogHelper.Info("缂撳瓨淇℃伅鐢熸垚鍏ュ簱浠诲姟锛屽苟鍒犻櫎缂撳瓨淇℃伅锛� + JsonConvert.SerializeObject(item), "TSSG"); - return; - } - - if (item.Key == "192.168.1.160" && instockInfo.UDID != flag1) - { - flag1 = instockInfo.UDID; - - // 鎸傞挬Elapsed浜嬩欢浠ユ彁渚涘畾鏃跺櫒淇″彿 - aTimer.Elapsed -= OnTimedEvent1; - aTimer.Elapsed += OnTimedEvent1; - - // 璁剧疆鑷姩閲嶇疆涓簍rue锛堟剰鍛崇潃瀹氭椂鍣ㄤ細閲嶅瑙﹀彂锛�- aTimer.AutoReset = false; - - aTimer.Stop(); // 纭繚瀹氭椂鍣ㄥ仠姝�- aTimer.Enabled = true; // 鍚姩瀹氭椂鍣�- } - - if (item.Key == "192.168.1.161" && instockInfo.UDID != flag2) - { - flag2 = instockInfo.UDID; - - // 鎸傞挬Elapsed浜嬩欢浠ユ彁渚涘畾鏃跺櫒淇″彿 - aTimer.Elapsed -= OnTimedEvent2; - aTimer.Elapsed += OnTimedEvent2; - - // 璁剧疆鑷姩閲嶇疆涓簍rue锛堟剰鍛崇潃瀹氭椂鍣ㄤ細閲嶅瑙﹀彂锛�- aTimer.AutoReset = true; - - aTimer.Stop(); // 纭繚瀹氭椂鍣ㄥ仠姝�- aTimer.Enabled = true; // 鍚姩瀹氭椂鍣�- - } - } - } - - private static void OnTimedEvent1(Object source, ElapsedEventArgs e) - { - foreach (var item in ApiHelper.cacheInstockInfos) - { - var instockInfo = item.Value; - if (instockInfo.UDID == flag1) { - if (Settings.BufferArea != null && Settings.BufferArea != "") { - item.Value.endArea = Settings.BufferArea; - LogHelper.Info("ip:" + item.Key + "淇″彿绛夊緟鏃堕棿瓒呮椂锛屽彉鏇寸粓鐐瑰簱鍖轰负缂撳瓨鍖�, "TSSG"); - } - } - } - } - - private static void OnTimedEvent2(Object source, ElapsedEventArgs e) - { - foreach (var item in ApiHelper.cacheInstockInfos) - { - var instockInfo = item.Value; - if (instockInfo.UDID == flag2) - { - if (Settings.BufferArea != null && Settings.BufferArea != "") - { - item.Value.endArea = Settings.BufferArea; - LogHelper.Info("ip:" + item.Key + "淇″彿绛夊緟鏃堕棿瓒呮椂锛屽彉鏇寸粓鐐瑰簱鍖轰负缂撳瓨鍖�, "TSSG"); - } - } - } - } - - - // 鑷姩绉诲簱 - internal static void AutoShiftStock() - { - var startLoc = WMSHelper.GetShiftStockStart(Settings.BufferArea); - if (startLoc != null) { - var end = WMSHelper.GetInstockEnd(startLoc.LocCntrRel.CntrItemRel.S_ITEM_CODE); - if (end != null) { - var wcsTask = new WCSTask - { - S_OP_NAME = "鍏ュ簱", - S_CODE = WCSHelper.GenerateTaskNo(), - S_TYPE = "涓嬬嚎鍏ュ簱", - S_START_LOC = startLoc.S_CODE, - S_END_LOC = end.S_CODE, - S_SCHEDULE_TYPE = "NDC", - N_CNTR_COUNT = 1, - S_CNTR_CODE = startLoc.LocCntrRel.S_CNTR_CODE, - N_START_LAYER = startLoc.N_CURRENT_NUM, - N_END_LAYER = end.N_CURRENT_NUM + 1 - }; - if (WCSHelper.CreateTask(wcsTask)) - { - LocationHelper.LockLoc(startLoc.S_CODE, 2); - LocationHelper.LockLoc(end.S_CODE, 1); - } - } - } - } - - /// <summary> - /// 绉诲簱鍗曠Щ搴�- /// </summary> - public static void ShiftStockOrder() { - List<TN_YiKuDetail> tN_YiKuDetails = WMSHelper.getShiftOrderDetail(); - foreach (var item in tN_YiKuDetails) - { - if (item.N_QTY > item.N_COMPLETE_NUM) { - Location startLoc = WMSHelper.GetShiftStockStart(item.S_START_AREA, item.S_START_ROW); - Location endLoc = WMSHelper.GetShiftStockEnd(item.S_END_AREA, item.S_END_ROW); - if (startLoc != null && endLoc != null && !WMSHelper.isRowLock(endLoc)) - { - var wcsTask = new WCSTask - { - S_OP_CODE = item.S_NO, - S_OP_NAME = "绉诲簱鍗曠Щ搴�, - S_CODE = WCSHelper.GenerateTaskNo(), - S_TYPE = "绉诲簱", - S_START_LOC = startLoc.S_CODE, - S_END_LOC = endLoc.S_CODE, - S_SCHEDULE_TYPE = "NDC", - N_CNTR_COUNT = 1, - S_CNTR_CODE = startLoc.LocCntrRel.S_CNTR_CODE, - N_START_LAYER = startLoc.N_CURRENT_NUM, - N_END_LAYER = endLoc.N_CURRENT_NUM + 1 - }; - if (WCSHelper.CreateTask(wcsTask)) - { - LocationHelper.LockLoc(startLoc.S_CODE, 2); - LocationHelper.LockLoc(endLoc.S_CODE, 1); - } - } - } - } - } + } } -- Gitblit v1.9.1