From fc25dda9baf3b5f4df23d35914f3dd343cf492e3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 28 七月 2025 17:30:21 +0800
Subject: [PATCH] 优化WCSHelper / 序列号生成逻辑 , 添加强制任务处理模块

---
 wms/SYSHelper.cs |   48 +++++++++++++++++++++++++++++++-----------------
 1 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/wms/SYSHelper.cs b/wms/SYSHelper.cs
index b48f3fd..9935a0c 100644
--- a/wms/SYSHelper.cs
+++ b/wms/SYSHelper.cs
@@ -2,48 +2,62 @@
 
 using SqlSugar;
 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
 namespace HH.WCS.Mobox3.DSZSH.wms {
     /// <summary>
-    /// 鐢ㄤ簬鐢熸垚搴忓垪鍙凤紝骞剁鐞嗗簭鍒楀彿鍓嶇紑鐨勫伐鍏风被
+    /// [ 搴忓垪鍙风敓鎴�] 甯姪绫�     /// </summary>
-    internal class SYSHelper
-    {
-        //浣跨敤闈欐� locker 瀵硅薄瀹炵幇绾跨▼鍚屾
+    public class SYSHelper {
         private static object locker = new object();
-        internal static int GetSerialNumber(string snType, string prefix) {
+        /// <summary>
+        /// <c>"{prefix}-{DateTime.Now.ToString(dateFormat)}-{id.ToString().PadLeft(length, '0')}"</c>
+        /// </summary>
+        /// <param name="snType"></param>
+        /// <param name="prefix"></param>
+        /// <param name="dateFormat"></param>
+        /// <param name="length"></param>
+        /// <returns></returns>
+        public static string GenerateSN(string snType, string prefix, string dateFormat = "yyMM", int length = 4) {
+            var header = $"{prefix}{DateTime.Now.ToString(dateFormat)}-";
+            var res = GetSerialNumber(snType, header);
+            if (res == 0) return "";
+            else {
+                return $"{header}{res.ToString().PadLeft(length, '0')}";
+            }
+        }
+
+        private static int GetSerialNumber(string snType, string prefix) {
             int result = 0;
             lock (locker) {
                 var db = new SqlHelper<object>().GetInstance();
                 var sId = db.Queryable<OI_SYS_MAXID>().Where(a => a.CN_S_TYPE.Trim() == snType && a.CN_S_PRE.Trim() == prefix).First();
                 if (sId != null) {
                     sId.CN_N_MAX++;
-                    //if (db.Ado.ExecuteCommand($"update OI_SYS_MAXID set CN_N_MAX={sId.CN_N_MAX} where CN_S_TYPE='{snType}' and CN_S_PRE='{prefix}' ") > 0) {
-                    //    result = sId.CN_N_MAX;
-                    //}
-
-                    // 鍙傛暟鍖栨煡璇紝閬垮厤SQL娉ㄥ叆
-                    if (db.Updateable<OI_SYS_MAXID>().SetColumns(it => it.CN_N_MAX == sId.CN_N_MAX).Where(it => it.CN_S_TYPE == snType
-                        && it.CN_S_PRE == prefix).ExecuteCommand() > 0) {
+                    if (db.Ado.ExecuteCommand($"update OI_SYS_MAXID set CN_N_MAX={sId.CN_N_MAX} " +
+                        $"where CN_S_TYPE='{snType}' and CN_S_PRE='{prefix}' ") > 0) {
                         result = sId.CN_N_MAX;
                     }
-
                 }
                 else {
                     //鎻掑叆琛�                     sId = new OI_SYS_MAXID { CN_S_TYPE = snType, CN_S_PRE = prefix, CN_N_MAX = 1 };
-                    result = db.Insertable<OI_SYS_MAXID>(sId).ExecuteCommand() > 0 ? 1 : 0;
-
+                    result = db.Insertable(sId).ExecuteCommand() > 0 ? 1 : 0;
                 }
             }
             return result;
         }
 
         [SugarTable("dbo.OI_SYS_MAXID")]
-        public class OI_SYS_MAXID
-        {
+        public class OI_SYS_MAXID {
             public string CN_S_TYPE { get; set; }
             public string CN_S_PRE { get; set; }
             public int CN_N_MAX { get; set; }
+            public DateTime CN_T_LAST { get; set; }
         }
     }
 }

--
Gitblit v1.9.1