From 63e94e068622d4ef843cee0d19d4f2d231316304 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 25 七月 2025 17:20:38 +0800
Subject: [PATCH] 完善查询语句, 日志记录的封装
---
wms/WCSHelper.cs | 55 +++++++++++++++++++------------------------------------
1 files changed, 19 insertions(+), 36 deletions(-)
diff --git a/wms/WCSHelper.cs b/wms/WCSHelper.cs
index 38fdc5c..63ff4e4 100644
--- a/wms/WCSHelper.cs
+++ b/wms/WCSHelper.cs
@@ -11,6 +11,9 @@
using System.Threading.Tasks;
namespace HH.WCS.Mobox3.DSZSH.wms {
+ /// <summary>
+ /// [ 閫氱敤涓氬姟 ] 甯姪绫�+ /// </summary>
internal class WCSHelper {
internal static string GenerateTaskNo() {
var id = SYSHelper.GetSerialNumber("浠诲姟鍙�, "TN");
@@ -52,30 +55,7 @@
return loc == null ? "0" : loc.S_AGV_SITE;
}
- /// <summary>
- /// <!--寮冪敤|鐞嗙敱:涓嶇伒娲�娑夊強涓氬姟杩囦簬鍏蜂綋-->妫�煡瀹瑰櫒绫诲瀷鏄惁姝ｇ‘
- /// </summary>
- /// <param name="cntrCode"></param>
- /// <param name="cntrType"></param>
- /// <param name="errMsg"></param>
- /// <returns></returns>
- private static bool CheckCntrType(string cntrCode, string cntrType, out string errMsg) {
- var db = new SqlHelper<object>().GetInstance();
- errMsg = string.Empty;
-
- var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == cntrType).First();
- if (cntr == null) {
- errMsg = $"瀹瑰櫒'{cntrCode}'鍦╗瀹瑰櫒琛╙涓笉瀛樺湪,璇峰湪鍓嶅彴椤甸潰涓淮鎶�";
- return false;
- }
- if (cntr.S_TYPE != cntrType) {
- errMsg = $"瀹瑰櫒'{cntrCode}'鍦╗瀹瑰櫒琛╙涓殑绫诲瀷鏄�{cntr.S_TYPE},涓嶆槸'{cntrType}'!";
- return false;
- }
-
- return true;
- }
-
+ #region 瀹瑰櫒鐩稿叧淇℃伅 鏌ヨ / 缁戝畾
/// <summary>
/// 鏍规嵁 [ 瀹瑰櫒鍙�] , 鏌ヨ褰撳墠瀹瑰櫒鍏宠仈鐨�[ 璐т綅 ] [ 璐т綅瀹瑰櫒 ] [ 瀹瑰櫒璐у搧 ] 淇℃伅 ( 鍙煡璇�1 鏉�)
/// </summary>
@@ -154,12 +134,14 @@
loc.T_MODIFY = DateTime.Now;
return locCntrRel;
- }
+ }
+ #endregion
+ #region 璧风偣 / 缁堢偣璐т綅閿�+ 鍒涘缓浠诲姟
/// <summary>
/// 璧风偣鍑哄簱閿� /// </summary>
- /// <remarks>瑕佹眰: loc != null; 閿佺姸鎬�'鏃�;</remarks>
+ /// <remarks><b>[ 瑕佹眰 ]</b> loc 鈮�null ; 閿佺姸鎬�'鏃� ;</remarks>
/// <param name="loc"></param>
/// <param name="lockSource"></param>
public static void LockStartLoc(TN_Location loc, string lockSource = "") {
@@ -178,7 +160,7 @@
/// <summary>
/// 缁堢偣鍏ュ簱閿� /// </summary>
- /// <remarks>瑕佹眰 : loc 鈮�null ; 閿佺姸鎬�'鏃� ;</remarks>
+ /// <remarks><b>[ 瑕佹眰 ]</b> loc 鈮�null ; 閿佺姸鎬�'鏃� ;</remarks>
/// <param name="loc"></param>
/// <param name="lockSource"></param>
public static void LockEndLoc(TN_Location loc, string lockSource = "") {
@@ -197,13 +179,13 @@
/// <summary>
/// 鍒涘缓浠诲姟
/// </summary>
- /// <remarks>瑕佹眰 : <br/>(1) startLoc / endLoc 鈮�null<br/>(2) startLoc / endLoc 瀛樺湪 S_CODE , S_AREA_CODE 瀛楁</remarks>
- /// <param name="startLoc">璧风偣璐т綅:鑷冲皯鎻愪緵:S_CODE,S_AREA_CODE</param>
- /// <param name="endLoc">缁堢偣璐т綅:鑷冲皯鎻愪緵:S_CODE,S_AREA_CODE</param>
+ /// <remarks><b>[ 瑕佹眰 ]</b> startLoc / endLoc 鈮�null ; startLoc / endLoc 瀛樺湪 S_CODE , S_AREA_CODE 瀛楁</remarks>
+ /// <param name="startLoc">璧风偣璐т綅 : 鑷冲皯鎻愪緵:S_CODE , S_AREA_CODE</param>
+ /// <param name="endLoc">缁堢偣璐т綅 : 鑷冲皯鎻愪緵:S_CODE , S_AREA_CODE</param>
/// <param name="cntId">瀹瑰櫒鍙�/param>
- /// <param name="type">浠诲姟绫诲瀷(鍚嶇О)</param>
+ /// <param name="type">浠诲姟绫诲瀷 ( 鍚嶇О )</param>
/// <param name="pri">浼樺厛绾�/param>
- /// <param name="agv">AGV绫诲瀷</param>
+ /// <param name="agv">AGV 绫诲瀷</param>
/// <returns></returns>
public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, int pri = 3, int agv = 1) {
TN_Task task = new TN_Task() {
@@ -227,13 +209,13 @@
/// <summary>
/// 鍒涘缓浠诲姟 + 璐т綅閿� /// </summary>
- /// <remarks>瑕佹眰 : <br/>(1) startLoc / endLoc 鈮�null<br/>(2) startLoc / endLoc 瀛樺湪 S_CODE , S_AREA_CODE 瀛楁</remarks>
+ /// <remarks><b>[ 瑕佹眰 ]</b> (1) startLoc / endLoc 鈮�null ; (2) startLoc / endLoc 瀛樺湪 S_CODE , S_AREA_CODE 瀛楁</remarks>
/// <param name="startLoc">璧风偣璐т綅 : 鑷冲皯鎻愪緵 : S_CODE , S_AREA_CODE</param>
/// <param name="endLoc">缁堢偣璐т綅 : 鑷冲皯鎻愪緵 : S_CODE , S_AREA_CODE</param>
/// <param name="cntId">瀹瑰櫒鍙�/param>
- /// <param name="type">浠诲姟绫诲瀷(鍚嶇О)</param>
+ /// <param name="type">浠诲姟绫诲瀷 ( 鍚嶇О )</param>
/// <param name="pri">浼樺厛绾�/param>
- /// <param name="agv">AGV绫诲瀷</param>
+ /// <param name="agv">AGV 绫诲瀷</param>
/// <returns></returns>
public static TN_Task BuildTaskWithLocLock(TN_Location startLoc, TN_Location endLoc, string cntId, string type, int pri = 3, int agv = 1) {
var task = BuildTask(startLoc, endLoc, cntId, type, pri);
@@ -241,7 +223,8 @@
LockEndLoc(endLoc, task.S_CODE);
return task;
- }
+ }
+ #endregion
internal static bool CheckActionRecordExist(string no, int code) {
var db = new SqlHelper<TN_Task_Action>().GetInstance();
--
Gitblit v1.9.1