From c3202f7d43746c084066d88e58913d85c0173d88 Mon Sep 17 00:00:00 2001 From: 杨张扬 <634643841@qq.com> Date: 星期五, 13 六月 2025 17:14:42 +0800 Subject: [PATCH] 双钱-需求变更,增加复检合格物料自动搬送流程 --- core/Monitor.cs | 78 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/core/Monitor.cs b/core/Monitor.cs index 29452fc..0bdcc36 100644 --- a/core/Monitor.cs +++ b/core/Monitor.cs @@ -350,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() -- Gitblit v1.9.1