From 0cca5518f5babea276e37a922b930e25a4bd46eb Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 24 七月 2025 17:26:55 +0800
Subject: [PATCH] 优化数据库事务帮助类 , 查询/日志生成类
---
wms/LocationHelper.cs | 84 ++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 47 deletions(-)
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index fea5c42..78d0a21 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -11,7 +11,7 @@
namespace HH.WCS.Mobox3.DSZSH.wms {
/// <summary>
- /// 璐т綅甯姪绫伙紙鍖呭惈璐т綅-瀹瑰櫒鍏崇郴鐨勫鐞嗭級
+ /// 璐т綅甯姪绫�鍖呭惈璐т綅-瀹瑰櫒鍏崇郴鐨勫鐞�
/// </summary>
public class LocationHelper
{
@@ -77,25 +77,19 @@
/// <param name="loc"></param>
/// <param name="isEmpty">鏄惁灞炰簬浜哄伐绌烘墭鍖哄埌绌烘墭缂撳瓨搴撳尯</param>
/// <returns></returns>
- internal static string GetAgvSite(string loc, bool isEmpty = false)
- {
+ internal static string GetAgvSite(string loc, bool isEmpty = false) {
var site = "0";
- if (_locationDict.Keys.Contains(loc.Trim()) && !isEmpty)
- {
+ if (_locationDict.Keys.Contains(loc.Trim()) && !isEmpty) {
var Location = _locationDict[loc.Trim()];
site = Location.S_AGV_SITE;
}
- else
- {
+ else {
var Location = GetLoc(loc.Trim());
- if (Location != null)
- {
+ if (Location != null) {
site = Location.S_AGV_SITE;
- if (isEmpty)
- {
- if (Location.N_CURRENT_NUM == 0)
- {
+ if (isEmpty) {
+ if (Location.N_CURRENT_NUM == 0) {
site = Location.S_AGV_SITE;
}
}
@@ -104,14 +98,13 @@
return site;
}
- internal static TN_Location GetLoc(string code)
- {
+ internal static TN_Location GetLoc(string code) {
var db = new SqlHelper<object>().GetInstance();
return db.Queryable<TN_Location>().Where(a => a.S_CODE.Trim() == code).First();
}
/// <summary>
- /// 鍙栬揣瀹岃В閿佽捣鐐癸紝鍗歌揣瀹岃В閿佺粓鐐癸紝鍙楠岄攣鐨勬潵婧愶紝涔熷彲浠ヤ笉鏍￠獙
+ /// 鍙栬揣瀹岃В閿佽捣鐐�鍗歌揣瀹岃В閿佺粓鐐�鍙楠岄攣鐨勬潵婧�涔熷彲浠ヤ笉鏍￠獙
/// </summary>
/// <param name="loc"></param>
/// <returns></returns>
@@ -143,16 +136,15 @@
/// <param name="loc"></param>
/// <param name="cntrs"></param>
/// <returns></returns>
- public static string UnBindingLoc(string loc, List<string> cntrs)
+ public static string UnbindLocCntr(string loc, List<string> cntrs)
{
var db = new SqlHelper<object>().GetInstance();
- var logs = $"璐т綅锛歿loc}锛屽鍣細{JsonConvert.SerializeObject(cntrs)}";
+ var logs = $"璐т綅:{loc},瀹瑰櫒:{JsonConvert.SerializeObject(cntrs)}";
try
{
var lcrList = db.Queryable<TN_Loc_Container>().Where(a => cntrs.Contains(a.S_CNTR_CODE) && a.S_LOC_CODE == loc).ToList();
- if (lcrList.Count == 0)
- {
- LogHelper.Info($"璐т綅鏃犻渶瑙ｇ粦瀹瑰櫒锛屽湪鏁版嵁搴撲腑鏈壘鍒皗JsonConvert.SerializeObject(cntrs)}鐩稿叧鐨勮揣浣嶅鍣ㄥ叧绯昏〃淇℃伅");
+ if (lcrList.Count == 0) {
+ LogHelper.Info($"璐т綅鏃犻渶瑙ｇ粦瀹瑰櫒,鍦ㄦ暟鎹簱涓湭鎵惧埌{JsonConvert.SerializeObject(cntrs)}鐩稿叧鐨勮揣浣嶅鍣ㄥ叧绯昏〃淇℃伅");
}
cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();
@@ -168,44 +160,42 @@
{
if (db.Deleteable<TN_Loc_Container>().Where(it => cntrs.Contains(it.S_CNTR_CODE) && it.S_LOC_CODE == loc).ExecuteCommand() > 0)
{
- LogHelper.Info($"鍒犻櫎璐т綅瀹瑰櫒鍏崇郴琛ㄦ垚鍔燂紝{log}");
+ LogHelper.Info($"鍒犻櫎璐т綅瀹瑰櫒鍏崇郴琛ㄦ垚鍔�{log}");
}
else
{
tran.RollbackTran();
- LogHelper.Info($"鍒犻櫎璐т綅瀹瑰櫒鍏崇郴琛ㄥけ璐ワ紝{log}");
+ LogHelper.Info($"鍒犻櫎璐т綅瀹瑰櫒鍏崇郴琛ㄥけ璐�{log}");
- return "璐т綅瑙ｇ粦瀹瑰櫒澶辫触锛� + logs;
+ return "璐т綅瑙ｇ粦瀹瑰櫒澶辫触," + logs;
}
log = JsonConvert.SerializeObject(location);
- if (db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM, it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand() > 0)
- {
+ if (db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM, it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand() > 0) {
tran.CommitTran();
- LogHelper.Info($"鏇存柊璐т綅琛ㄦ垚鍔燂紝{log}");
+ LogHelper.Info($"鏇存柊璐т綅琛ㄦ垚鍔�{log}");
}
- else
- {
+ else {
tran.RollbackTran();
- LogHelper.Info($"鏇存柊璐т綅琛ㄥけ璐ワ紝{log}");
+ LogHelper.Info($"鏇存柊璐т綅琛ㄥけ璐�{log}");
- return "璐т綅瑙ｇ粦瀹瑰櫒澶辫触锛� + logs;
+ return "璐т綅瑙ｇ粦瀹瑰櫒澶辫触," + logs;
}
}
}
else
{
- LogHelper.Info($"鍦ㄦ暟鎹簱涓湭鎵惧埌璇ヨ揣浣嶏紝鏃犻渶鏇存柊锛岃揣浣嶏細{loc}");
+ LogHelper.Info($"鍦ㄦ暟鎹簱涓湭鎵惧埌璇ヨ揣浣�鏃犻渶鏇存柊,璐т綅:{loc}");
}
- return "璐т綅瑙ｇ粦瀹瑰櫒鎴愬姛锛� + logs;
+ return "璐т綅瑙ｇ粦瀹瑰櫒鎴愬姛," + logs;
}
catch (Exception ex)
{
- LogHelper.Info($"鍙戠敓浜嗗紓甯革紝璐т綅瑙ｇ粦瀹瑰櫒澶辫触锛寋ex.Message}");
- return "璐т綅缁戝畾瀹瑰櫒澶辫触锛� + logs;
+ LogHelper.Info($"鍙戠敓浜嗗紓甯�璐т綅瑙ｇ粦瀹瑰櫒澶辫触,{ex.Message}");
+ return "璐т綅缁戝畾瀹瑰櫒澶辫触," + logs;
}
}
@@ -218,7 +208,7 @@
public static string BindingLoc(string loc, List<string> cntrs)
{
var db = new SqlHelper<object>().GetInstance();
- var logs = $"璐т綅锛歿loc}锛屽鍣細{JsonConvert.SerializeObject(cntrs)}";
+ var logs = $"璐т綅:{loc},瀹瑰櫒:{JsonConvert.SerializeObject(cntrs)}";
try
{
// 鍒犻櫎宸茬粡缁戝畾杩囩殑瀹瑰櫒璁板綍
@@ -233,7 +223,7 @@
var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == item).First();
if (cntr == null) {
- LogHelper.Info($"璐т綅瑙ｇ粦鏃讹紝瀹瑰櫒{item}娌℃湁鍦ㄥ鍣ㄤ俊鎭〃涓煡鍒帮紝涓嶈褰曞鍣ㄧ被鍨�);
+ LogHelper.Info($"璐т綅瑙ｇ粦鏃�瀹瑰櫒{item}娌℃湁鍦ㄥ鍣ㄤ俊鎭〃涓煡鍒�涓嶈褰曞鍣ㄧ被鍨�);
bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item });
}
else {
@@ -247,10 +237,10 @@
{
if (db.Insertable(bindLocCntList).ExecuteCommand() <= 0) {
db.RollbackTran();
- LogHelper.Info($"鎻掑叆璐т綅瀹瑰櫒鍏崇郴琛ㄥけ璐ワ紝{log}");
- return "璐т綅缁戝畾瀹瑰櫒澶辫触锛� + logs;
+ LogHelper.Info($"鎻掑叆璐т綅瀹瑰櫒鍏崇郴琛ㄥけ璐�{log}");
+ return "璐т綅缁戝畾瀹瑰櫒澶辫触," + logs;
}
- LogHelper.Info($"鎻掑叆璐т綅瀹瑰櫒鍏崇郴琛ㄦ垚鍔燂紝{log}");
+ LogHelper.Info($"鎻掑叆璐т綅瀹瑰櫒鍏崇郴琛ㄦ垚鍔�{log}");
var location = db.Queryable<TN_Location>().First(a => a.S_CODE == loc);
if (location != null)
@@ -264,29 +254,29 @@
{
db.CommitTran();
- LogHelper.Info($"鏇存柊璐т綅琛ㄦ垚鍔燂紝{log}");
+ LogHelper.Info($"鏇存柊璐т綅琛ㄦ垚鍔�{log}");
}
else
{
db.RollbackTran();
- LogHelper.Info($"鏇存柊璐т綅琛ㄥけ璐ワ紝{log}");
+ LogHelper.Info($"鏇存柊璐т綅琛ㄥけ璐�{log}");
- return "璐т綅缁戝畾瀹瑰櫒澶辫触锛� + logs;
+ return "璐т綅缁戝畾瀹瑰櫒澶辫触," + logs;
}
}
else
{
db.RollbackTran();
- LogHelper.Info($"鏈壘鍒拌璐т綅{loc}锛屾垨鑰呭凡閿佸畾锛寋log}");
+ LogHelper.Info($"鏈壘鍒拌璐т綅{loc},鎴栬�宸查攣瀹�{log}");
}
}
- return "璐т綅缁戝畾瀹瑰櫒鎴愬姛锛� + logs;
+ return "璐т綅缁戝畾瀹瑰櫒鎴愬姛," + logs;
}
catch (Exception ex)
{
- LogHelper.Info($"鍙戠敓浜嗗紓甯革紝璐т綅缁戝畾瀹瑰櫒澶辫触锛�);
- return "璐т綅缁戝畾瀹瑰櫒澶辫触锛� + ex.Message;
+ LogHelper.Info($"鍙戠敓浜嗗紓甯�璐т綅缁戝畾瀹瑰櫒澶辫触,");
+ return "璐т綅缁戝畾瀹瑰櫒澶辫触," + ex.Message;
}
}
}
--
Gitblit v1.9.1