From 3bdd686d50ae8c999924ac64101a5dbe4e271c71 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 04 七月 2025 17:27:19 +0800
Subject: [PATCH] 优化日志信息，删除冗余的工具类代码
---
wms/WCSHelper.cs | 144 +++++++++++------------------------------------
1 files changed, 35 insertions(+), 109 deletions(-)
diff --git a/wms/WCSHelper.cs b/wms/WCSHelper.cs
index 5d2dde4..06549ea 100644
--- a/wms/WCSHelper.cs
+++ b/wms/WCSHelper.cs
@@ -46,118 +46,52 @@
return task;
}
- public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type) {
- TN_Task TN_Task = new TN_Task() {
- S_CODE = GenerateTaskNo(),
- S_START_AREA = startLoc.S_AREA_CODE,
- S_END_AREA = endLoc.S_AREA_CODE,
- S_START_LOC = startLoc.S_CODE,
- S_END_LOC = endLoc.S_CODE,
- S_TYPE = type,
- N_PRIORITY = 3, // 鍒濆浼樺厛绾ч粯璁や负锛�
- N_SCHEDULE_TYPE = 1, // NDC
- N_B_STATE = 0,
- S_CNTR_CODE = cntId,
- };
-
- return TN_Task;
- }
-
- public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, string op_no, string erp_no = "") {
- TN_Task TN_Task = new TN_Task() {
- S_CODE = GenerateTaskNo(),
- S_START_AREA = startLoc.S_AREA_CODE,
- S_END_AREA = endLoc.S_AREA_CODE,
- S_START_LOC = startLoc.S_CODE,
- S_END_LOC = endLoc.S_CODE,
- S_TYPE = type,
- N_PRIORITY = 3, // 鍒濆浼樺厛绾ч粯璁や负锛�
- N_SCHEDULE_TYPE = 1, // NDC
- N_B_STATE = 0,
- S_CNTR_CODE = cntId,
- S_OP_CODE = op_no,
- S_BS_NO = erp_no,
- S_BS_TYPE = erp_no == "" ? "" : "ERP",
- };
-
- return TN_Task;
+ public static string GetAgvSite(string locCode) {
+ var db = new SqlHelper<object>().GetInstance();
+ var loc = db.Queryable<TN_Location>().Where(l => l.S_CODE == locCode).First();
+ return loc == null ? "0" : loc.S_AGV_SITE;
}
/// <summary>
- /// 鍒涘缓鎼�浠诲姟
+ /// 璧风偣鍑哄簱閿侊紙寮哄埗璧嬪�锛屼笉浼氭鏌oc!=null锛岄攣鐘舵�=鏃狅紝闇�浼犲弬鍓嶇‘璁わ級
/// </summary>
- /// <param name="from">璧风偣</param>
- /// <param name="to">缁堢偣</param>
- /// <param name="taskType">浠诲姟绫诲瀷</param>
- /// <param name="pri">浼樺厛绾�/param>
- /// <param name="cntrInfo">瀹瑰櫒缂栫爜</param>
- /// <returns></returns>
- internal static bool CreateTask(string from, string to, string taskType, int pri, string cntrInfo) {
- var fromLoc = LocationHelper.GetLocation(from);
- var endLoc = LocationHelper.GetLocation(to);
+ /// <param name="loc"></param>
+ /// <param name="lockSource"></param>
+ public static void LockStartLoc(ref TN_Location loc, string lockSource = "") {
+ loc.N_LOCK_STATE = 2; // 璧风偣鍑哄簱閿�+ loc.S_LOCK_STATE = TN_Location.GetLockStateStr(2); // 璧风偣鍑哄簱閿�+ loc.S_LOCK_OP = lockSource;
+ loc.T_MODIFY = System.DateTime.Now;
+ }
+
+ /// <summary>
+ /// 缁堢偣鍏ュ簱閿侊紙寮哄埗璧嬪�锛屼笉浼氭鏌oc!=null锛岄攣鐘舵�=鏃狅紝闇�浼犲弬鍓嶇‘璁わ級
+ /// </summary>
+ /// <param name="loc"></param>
+ /// <param name="lockSource"></param>
+ public static void LockEndLoc(ref TN_Location loc, string lockSource = "") {
+ loc.N_LOCK_STATE = 1; // 缁堢偣鍑哄簱閿�+ loc.S_LOCK_STATE = TN_Location.GetLockStateStr(1); // 缁堢偣鍑哄簱閿�+ loc.S_LOCK_OP = lockSource;
+ loc.T_MODIFY = System.DateTime.Now;
+ }
+
+ public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, int pri = 3, int agvType = 1) {
TN_Task TN_Task = new TN_Task() {
S_CODE = GenerateTaskNo(),
- S_START_AREA = fromLoc.S_AREA_CODE,
+ S_START_AREA = startLoc.S_AREA_CODE,
S_END_AREA = endLoc.S_AREA_CODE,
- S_START_LOC = from,
- S_END_LOC = to,
- S_TYPE = taskType,
+ S_START_LOC = startLoc.S_CODE,
+ S_END_LOC = endLoc.S_CODE,
+ S_TYPE = type,
N_PRIORITY = pri,
- N_SCHEDULE_TYPE = 1,
- N_B_STATE = 0,
- S_CNTR_CODE = cntrInfo,
+ N_SCHEDULE_TYPE = agvType,
+ N_B_STATE = 0, // 浠诲姟鍒涘缓鏃讹紝榛樿绛夊緟
+ S_CNTR_CODE = cntId,
};
- var log = JsonConvert.SerializeObject(TN_Task);
- var db = new SqlHelper<TN_Task>().GetInstance();
- var res = db.Insertable(TN_Task).ExecuteCommand() > 0;
- if (res) {
- LogHelper.Info($"鎻掑叆浠诲姟鎴愬姛锛寋log}");
- }
- else {
- LogHelper.Info($"鎻掑叆浠诲姟澶辫触锛寋log}");
- }
- return res;
-
+ return TN_Task;
}
-
- public static bool CreateTask(List<CreateTasks> modes) {
- if (modes != null && modes.Count > 0) {
- List<TN_Task> tN_Tasks = new List<TN_Task>();
-
- foreach (var item in modes) {
-
- var fromLoc = LocationHelper.GetLocation(item.from);
- var endLoc = LocationHelper.GetLocation(item.to);
-
- tN_Tasks.Add(new TN_Task() {
- S_CODE = GenerateTaskNo(),
- S_START_AREA = fromLoc.S_AREA_CODE,
- S_END_AREA = endLoc.S_AREA_CODE,
- S_START_LOC = item.from,
- S_END_LOC = item.to,
- S_TYPE = item.taskType,
- N_PRIORITY = item.pri,
- N_SCHEDULE_TYPE = 1,
- N_B_STATE = 0,
- S_CNTR_CODE = item.cntrInfo,
- });
- }
- var log = JsonConvert.SerializeObject(tN_Tasks);
- var db = new SqlHelper<object>().GetInstance();
- var res = db.Insertable<TN_Task>(tN_Tasks).ExecuteCommand() > 0;
- if (res) {
- LogHelper.Info($"鎻掑叆浠诲姟鎴愬姛锛寋log}");
- }
- else {
- LogHelper.Info($"鎻掑叆浠诲姟澶辫触锛寋log}");
- }
- return res;
- }
-
- return false;
- }
-
internal static bool CheckActionRecordExist(string no, int code) {
var db = new SqlHelper<TN_Task_Action>().GetInstance();
@@ -211,13 +145,5 @@
var db = new SqlHelper<object>().GetInstance();
return db.Queryable<TN_Task>().Where(a => a.N_B_STATE == 0 && (a.S_B_STATE == "绛夊緟" || a.S_B_STATE == "寰呮帹閫�)).ToList();
}
- }
-
- public class CreateTasks {
- public string from { set; get; }
- public string to { set; get; }
- public string taskType { set; get; }
- public int pri { set; get; }
- public string cntrInfo { set; get; }
}
}
--
Gitblit v1.9.1