From cbba9b897a865fbf253a03cd818a1044637e8334 Mon Sep 17 00:00:00 2001 From: kazelee <1847801760@qq.com> Date: 星期五, 30 五月 2025 17:25:50 +0800 Subject: [PATCH] 修复git云端文件夹大小写不一致的问题:完成 --- core/WCSCore.cs | 72 ++++++++++++++++++++++++++++++++++- 1 files changed, 69 insertions(+), 3 deletions(-) diff --git a/core/WCSCore.cs b/core/WCSCore.cs index a9985d1..312a7a3 100644 --- a/core/WCSCore.cs +++ b/core/WCSCore.cs @@ -88,9 +88,9 @@ var nextOutboundTask = Task.Run(() => { UpdateOutboundTaskState(3); }); - var pickUpReturnErpTask = Task.Run(() => { - PickUpReturnErp(TN_Task); - }); + //var pickUpReturnErpTask = Task.Run(() => { + // PickUpReturnErp(TN_Task); + //}); } break; @@ -110,6 +110,10 @@ // }); //} + var recordTask = Task.Run(() => { + RecordTaskTable(TN_Task); + }); + break; case 7: // 寮傚父 TaskProcess.OperateStatus(TN_Task, 7); // 寮傚父澶勭悊 @@ -124,6 +128,68 @@ return true; } + private static void RecordTaskTable(TN_Task task) { + var db = new SqlHelper<object>().GetInstance(); + var info = ""; + + try { + var cgDetail = new TN_CG_Detail(); + + var emptyTask = false; + if (task.S_TYPE != TaskName.H濂借繍绠盻绌虹涓婄嚎 && task.S_TYPE != TaskName.H濂借繍绠盻绌虹鍏ュ簱 && + task.S_TYPE != TaskName.T鎵樼洏_绌烘墭涓婄嚎 && task.S_TYPE != TaskName.T鎵樼洏_绌烘墭鍏ュ簱) { + // 闈炵┖鎵樹换鍔★紙绌烘墭浠诲姟鏃犳硶鍦–GDetail鏌ュ埌鐗╂枡淇℃伅锛�+ emptyTask= true; + cgDetail = db.Queryable<TN_CG_Detail>() + .Where(d => d.S_CNTR_CODE == task.S_CNTR_CODE) + .First(); + + if (cgDetail == null) { + info = $"浠诲姟{task.S_CODE}瀹屾垚锛岃褰曞嚭鍏ュ簱澶辫触锛氭棤娉曞湪瀹瑰櫒璐у搧鏄庣粏琛ㄤ腑鎵惧埌鎵樼洏{task.S_CNTR_CODE}瀵瑰簲鐨勭墿鏂�; + LogHelper.Info(info); + } + } + + var isInbound = false; + var inboundTasks = new List<string> { + TaskName.H濂借繍绠盻婊$涓嬬嚎鍏ュ簱, TaskName.H濂借繍绠盻绌虹鍏ュ簱, TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱, TaskName.T鎵樼洏_绌烘墭鍏ュ簱, + TaskName.C鎶芥_鍚堟牸鍥炲簱, TaskName.C鎶芥_涓嶅悎鏍肩Щ搴� TaskName.Y绉诲簱 + }; + if (inboundTasks.Contains(task.S_TYPE)) { + isInbound= true; + } + + var record = new TN_Record_Table { + S_ITEM_CODE = cgDetail.S_ITEM_CODE, + S_BATCH_NO = cgDetail.S_BATCH_NO, + S_ITEM_NAME = cgDetail.S_ITEM_NAME, + S_LOC_CODE = isInbound ? task.S_END_LOC : task.S_START_LOC, // 鍏ュ簱璁板綍缁堢偣璐т綅锛屽嚭搴撹褰曡捣鐐硅揣浣�+ S_CNTR_CODE = task.S_CNTR_CODE, + S_ITEM_SPEC = cgDetail.S_ITEM_SPEC, + S_NET_WEIGHT = cgDetail.S_NET_WEIGHT, + S_QUALITY_GRADE = cgDetail.S_QUALITY_GRADE, + S_STANDARD = cgDetail.S_STANDARD, + S_TASK_NO = task.S_CODE, + T_RECORD_TIME = DateTime.Now, + S_TYPE = task.S_TYPE, + S_BS_CODE = task.S_BS_TYPE, + N_QTY = cgDetail.N_ITEM_NUM, + }; + + if (db.Insertable<TN_Record_Table>(record).ExecuteCommand() <= 0) { + info = "鎻掑叆鍑哄叆搴撹褰曡〃澶辫触锛� + JsonConvert.SerializeObject(record); + LogHelper.Info(info); + return; + } + + info = "鎻掑叆鍑哄叆搴撹褰曡〃鎴愬姛"; + LogHelper.Info(info); + } + catch (Exception ex) { + LogHelper.InfoEx(ex); + } + } + public static ReturnResult SafetyInteraction(SafetyInteractionInfo model) { var db = new SqlHelper<object>().GetInstance(); var info = ""; -- Gitblit v1.9.1