From f978872b6de4e7e20d992a2ee7cda902c11347b9 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 30 六月 2025 15:31:56 +0800
Subject: [PATCH] 优化配置文件读取逻辑，将ERP反馈接口写入配置文件中配置
---
core/Monitor.cs | 44 ++++++++------------------------------------
1 files changed, 8 insertions(+), 36 deletions(-)
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 2204e35..0a93748 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -23,7 +23,7 @@
public static void CheckInbound() {
var db = new SqlHelper<object>().GetInstance();
var info = "";
-
+
try {
// 鏌ヤ骇绾挎槸鍚︽湁鐗╂枡淇℃伅
foreach (var prod in Settings.ProductionLines) {
@@ -74,7 +74,8 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+ var taskInfo = Settings.GetTaskInfo(ETask.C鎴愬搧鑳跺嚭搴�;
+ var taskName = taskInfo.TaskName;
try {
var orderList = db.Queryable<TN_Outbound_Order>()
@@ -224,37 +225,6 @@
}
-
- //// BEG 鏌ユ壘6涓湀浠ュ墠鐨勪换鍔¤〃鍜屼换鍔″姩浣滆〃
- //var oldTaskList = db.Queryable<TN_Task>()
- // .Where(t => t.T_MODIFY < DateTime.Now.AddMonths(-6))
- // .Where(t => t.N_B_STATE == 3 && t.S_B_STATE == "瀹屾垚")
- // .ToList();
-
- //var oldTaskActionList = db.Queryable<TN_Task, TN_Task_Action>((t, a) => t.S_CODE == a.S_TASK_CODE)
- // .Where(t => t.T_MODIFY < DateTime.Now.AddMonths(-6))
- // .Where(t => t.N_B_STATE == 3 && t.S_B_STATE == "瀹屾垚")
- // .Select((t, a) => a)
- // .ToList();
- //// END
-
- //using (var tran = db.Ado.UseTran()) {
- // // 鍦ㄥ嚭搴撹疆璇腑澶勭悊锛屾煡鎵句换鍔″崟鏄惁鏈夊崐骞村墠涓斿凡缁忓畬鎴愮殑浠诲姟锛屽鏋滄湁鍒欏垹闄�- // // 杩欎釜鎿嶄綔涓嶅奖鍝嶆甯告祦绋嬶紝濡傛灉澶辫触涔熶笉闇�鍥炴粴
- // //if (db.Deleteable<TN_Task>()
- // // .Where(t => t.T_MODIFY < DateTime.Now.AddMonths(-6))
- // // .Where(t => t.N_B_STATE == 3 && t.S_B_STATE == "瀹屾垚")
- // // .ExecuteCommand() <= 0) {
- // // info = $"杞{taskName}鍗曟椂灏濊瘯鍒犻櫎鍗婂勾鍓嶇殑浠诲姟澶辫触";
- // // LogHelper.Info(info);
- // //}
- // if (db.Deleteable<TN_Task>(oldTaskList).ExecuteCommand() <= 0
- // && db.Deleteable<TN_Task_Action>(oldTaskActionList).ExecuteCommand() <= 0) {
- // info = $"杞{taskName}鍗曟椂灏濊瘯鍒犻櫎鍗婂勾鍓嶇殑浠诲姟澶辫触";
- // LogHelper.Info(info);
- // }
- //}
-
}
catch (Exception ex) {
info = $"杞锛歿taskName}锛氬彂鐢熶簡寮傚父锛歿ex.Message}";
@@ -266,7 +236,8 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.C鎶芥_鍑哄簱;
+ var taskInfo = Settings.GetTaskInfo(ETask.C鎶芥鍑哄簱);
+ var taskName = taskInfo.TaskName;
try {
var orderList = db.Queryable<TN_Spot_Check>()
@@ -391,7 +362,8 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.Y绉诲簱;
+ var taskInfo = Settings.GetTaskInfo(ETask.Y绉诲簱);
+ var taskName = taskInfo.TaskName;
try {
var orderList = db.Queryable<TN_Relocation_List>()
@@ -599,7 +571,7 @@
model.ph = cgDetail.S_BATCH_NO;
var jsonInfo = JsonConvert.SerializeObject(model);
- var result = httpH.WebPost(Settings.ErpApiUrl + "CreateTaskReturn", jsonInfo);
+ var result = httpH.WebPost(Settings.ErpApiUrl + Settings.ErpRoute.CreateTaskReturn, jsonInfo);
LogHelper.InfoApi($"鍒涘缓浠诲姟瀹屾垚鍙嶉ERP鎺ュ彛锛岀粨鏋�{result}锛岃皟鐢ㄥ弬鏁帮細", model);
--
Gitblit v1.9.1