From 3aaad4bc18d4919a9008465a0d984b84f64193b2 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期二, 11 十一月 2025 09:53:37 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.DAL/Common.cs | 66 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/Wms/WMS.DAL/Common.cs b/Wms/WMS.DAL/Common.cs
index 61515e2..e64bffa 100644
--- a/Wms/WMS.DAL/Common.cs
+++ b/Wms/WMS.DAL/Common.cs
@@ -20,7 +20,7 @@
{
//public static readonly DataContext Db = new DataContext();
-
+ private readonly object GetMaxNoLock = new object();
/// <summary>
/// 鑾峰彇娣卞害涓�1鐨勫偍浣嶅彿锛堟牴鎹繁搴︿负2鐨勫偍浣嶅彿锛�
/// </summary>
@@ -163,40 +163,43 @@
/// <returns></returns>
public string GetMaxNo(string codeFlag)
{
- try
- {
- var maxNo = "";
- //鑾峰彇寮傚父鍙�
- maxNo = SelectMaxNo(codeFlag);
- if (!string.IsNullOrEmpty(maxNo))
+ lock (GetMaxNoLock)
+ {
+ try
{
- maxNo = maxNo.Substring(codeFlag.Length);
- }
- //鑾峰彇鏁版嵁搴撴椂闂村叓浣�
- string date = DateTime.Now.ToString("yyyyMMdd").Trim();
- string no = "";
- if (string.IsNullOrEmpty(maxNo))
- {
- no = codeFlag + date + "00001";
- }
- else
- {
- if (maxNo.Substring(0, 8) == date)
+ var maxNo = "";
+ //鑾峰彇寮傚父鍙�
+ maxNo = SelectMaxNo(codeFlag);
+ if (!string.IsNullOrEmpty(maxNo))
{
- int lastNo = Convert.ToInt32(maxNo.Substring(8, 5)) + 1;
- no = codeFlag + date + (lastNo.ToString().PadLeft(5, '0'));
+ maxNo = maxNo.Substring(codeFlag.Length);
}
- else
+ //鑾峰彇鏁版嵁搴撴椂闂村叓浣�
+ string date = DateTime.Now.ToString("yyyyMMdd").Trim();
+ string no = "";
+ if (string.IsNullOrEmpty(maxNo))
{
no = codeFlag + date + "00001";
}
+ else
+ {
+ if (maxNo.Substring(0, 8) == date)
+ {
+ int lastNo = Convert.ToInt32(maxNo.Substring(8, 5)) + 1;
+ no = codeFlag + date + (lastNo.ToString().PadLeft(5, '0'));
+ }
+ else
+ {
+ no = codeFlag + date + "00001";
+ }
+ }
+ return no;
}
- return no;
- }
- catch (Exception e)
- {
- Console.WriteLine(e);
- throw;
+ catch (Exception e)
+ {
+ Console.WriteLine(e);
+ throw;
+ }
}
}
/// <summary>
@@ -232,9 +235,9 @@
var list = DataContext.Db.Queryable<BllStockCheck>().Where(m => m.CRNo.StartsWith("CR")).ToList();
orderNo = list.Select(a => a.CRNo).Max();
}
- else if (codeFlag == InOutFlag.TK.ToString())//浠诲姟
+ else if (codeFlag == InOutFlag.TN.ToString())//浠诲姟
{
- var list = DataContext.Db.Queryable<LogTask>().Where(m => m.TaskNo.StartsWith("TK")).ToList();
+ var list = DataContext.Db.Queryable<LogTask>().Where(m => m.TaskNo.StartsWith("TN")).ToList();
orderNo = list.Max(m=>m.TaskNo);
}
else if (codeFlag == InOutFlag.EX.ToString())//寮傚父
@@ -478,7 +481,8 @@
/// 浠诲姟
/// </summary>
[Description("浠诲姟")]
- TK,
+ TN,
+
/// <summary>
/// 寮傚父鍙�
/// </summary>
--
Gitblit v1.8.0