From a8627a98b82d2364cbe849ca746e72fbab9916e5 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 21 五月 2025 17:31:14 +0800
Subject: [PATCH] 重构代码修复事务问题，测试完善后台盘点功能
---
wms/LocationHelper.cs | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/Helpers/LocationHelper.cs b/wms/LocationHelper.cs
similarity index 92%
rename from Helpers/LocationHelper.cs
rename to wms/LocationHelper.cs
index 8102958..50e1f21 100644
--- a/Helpers/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -1,4 +1,4 @@
-锘縰sing HH.WCS.Mobox3.AnGang.Models;
+锘縰sing HH.WCS.Mobox3.AnGang.models;
using HH.WCS.Mobox3.AnGang.config;
using Newtonsoft.Json;
using SqlSugar;
@@ -7,11 +7,10 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using static HH.WCS.Mobox3.AnGang.Controllers.ApiModel;
-using HH.WCS.Mobox3.AnGang.Helpers;
-using static HH.WCS.Mobox3.AnGang.Dtos.Response.MoboxResponse;
+using static HH.WCS.Mobox3.AnGang.api.ApiModel;
+using HH.WCS.Mobox3.AnGang.util;
-namespace HH.WCS.Mobox3.AnGang.Helper {
+namespace HH.WCS.Mobox3.AnGang.wms {
public class LocationHelper
{
private static Dictionary<string, TN_Location> Locations = null;
@@ -54,7 +53,7 @@
/// <returns></returns>
internal static List<TN_Location> GetAllLocList()
{
- var db = DbHelper.GetDbClient();
+ var db = new SqlHelper<object>().GetInstance();
return db.Queryable<TN_Location>().ToList();
}
@@ -131,8 +130,29 @@
internal static TN_Location GetLoc(string code)
{
- var db = DbHelper.GetDbClient();
+ 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>
+ /// <param name="lockState">1:鍏ュ簱閿併�2:鍑哄簱閿併�2:鍏跺畠閿�/param>
+ /// <param name="lockSource">閿佺殑鏉ユ簮=浠诲姟鍙�/param>
+ /// <returns></returns>
+ public static bool LockLoc(ref TN_Location loc, int lockState, string lockSource = "") {
+ //if (loc == null || loc.N_LOCK_STATE != 0) {
+ // return false;
+ //}
+
+ loc.N_LOCK_STATE = lockState;
+ loc.S_LOCK_STATE = TN_Location.GetLockStateStr(lockState);
+ loc.S_LOCK_OP = lockSource;
+ loc.T_MODIFY = System.DateTime.Now;
+
+ return true;
}
/// <summary>
@@ -146,7 +166,7 @@
public static bool LockLoc(string loc, int lockState, string lockSource = "")
{
var res = false;
- var db = DbHelper.GetDbClient();
+ var db = new SqlHelper<object>().GetInstance();
var model = db.Queryable<TN_Location>().Where(a => a.S_CODE == loc).First();
LogHelper.Info($"閿佽揣浣峽loc},鐘舵�{lockState},淇℃伅" + JsonConvert.SerializeObject(model));
if (model != null && model.N_LOCK_STATE == 0)
@@ -171,7 +191,7 @@
{
LogHelper.Info("UnLockLoc:" + loc);
var res = false;
- var db = DbHelper.GetDbClient();
+ var db = new SqlHelper<object>().GetInstance();
var model = db.Queryable<TN_Location>().Where(a => a.S_CODE == loc).First();
if (model != null)
{
@@ -197,7 +217,7 @@
/// <returns></returns>
public static string UnBindingLoc(string loc, List<string> cntrs)
{
- var db = DbHelper.GetDbClient();
+ var db = new SqlHelper<object>().GetInstance();
var logs = $"璐т綅锛歿loc}锛屽鍣細{JsonConvert.SerializeObject(cntrs)}";
try
{
@@ -270,7 +290,7 @@
/// <returns></returns>
public static string BindingLoc(string loc, List<string> cntrs)
{
- var db = DbHelper.GetDbClient();
+ var db = new SqlHelper<object>().GetInstance();
var logs = $"璐т綅锛歿loc}锛屽鍣細{JsonConvert.SerializeObject(cntrs)}";
try
{
@@ -379,7 +399,7 @@
LogHelper.Info("瑙﹀彂API锛氳揣浣嶅鍣ㄩ噸缃� + JsonConvert.SerializeObject(model), "API");
var result = new SimpleResult();
- var db = DbHelper.GetDbClient();
+ var db = new SqlHelper<object>().GetInstance();
try
{
--
Gitblit v1.9.1