1、补充更新数据库版本

JLHHJSvr/DBA/ParkDBVersion.cs

@@ -30,7 +30,7 @@ namespace JLHHJSvr.DBA
     {
         protected override string currentVersion
         {
-            get { return "1.0.250921"; }
+            get { return "1.0.250923"; }
         }
 
         protected override string dbname
@@ -213,7 +213,7 @@ ALTER TABLE fx_user_dwlayout ADD  CONSTRAINT DF_fx_user_dwlayout_column_detail_h
   new Script("1.0.250730", @"
 ALTER TABLE u_user_jlhprice ADD whiteIPs varchar(2000) NULL
 ", ""),
-        new Script("1.0.250919", @"
+    new Script("1.0.250919", @"
 IF NOT EXISTS (SELECT * FROM Sys_scIdentity WHERE tablename = 'u_sys_post' AND columnname = 'postid')
 BEGIN
     INSERT INTO Sys_scIdentity (scid, tablename, columnname, ScIdentityno)
@@ -239,95 +239,95 @@ BEGIN
     );
 END
 ", ""),
-//    new Script("1.0.250919", @"
-//IF NOT EXISTS (SELECT * FROM sys_func_pwr WHERE funcid = 161)
-//BEGIN
-//    INSERT INTO sys_func_pwr (funcid, parentid, treename, menuname, if_use)
-//    VALUES
-//    (161, 109, '单据解锁', '单据解锁', 1),
-//    (162, 161, '单据解锁','解锁', 1);
-//END
+    new Script("1.0.250920", @"ALTER TABLE u_mtrl_price ADD is_singleqty BIT NOT NULL CONSTRAINT DF_u_lock_table_is_singleqty DEFAULT(0)", ""),
+    new Script("1.0.250923", @"
+IF NOT EXISTS (SELECT * FROM sys_func_pwr WHERE funcid = 161)
+BEGIN
+    INSERT INTO sys_func_pwr (funcid, parentid, treename, menuname, if_use)
+    VALUES
+    (161, 109, '单据解锁', '单据解锁', 1),
+    (162, 161, '单据解锁','解锁', 1);
+END
 
-//IF NOT EXISTS (SELECT * FROM sys.tables WHERE name = 'u_lock_table')
-//BEGIN
-//    CREATE TABLE u_lock_table (
-//        logid int IDENTITY(1,1) NOT NULL,
-//        keyword VARCHAR(24) NOT NULL CONSTRAINT DF_u_lock_table_keyword DEFAULT(''),
-//        billid INT NOT NULL CONSTRAINT DF_u_lock_table_billid DEFAULT(0),
-//        billcode VARCHAR(50) NOT NULL CONSTRAINT DF_u_lock_table_billcode DEFAULT(''),
-//        is_locked BIT NOT NULL CONSTRAINT DF_u_lock_table_is_locked DEFAULT(1),
-//        opemp VARCHAR(24) NOT NULL CONSTRAINT DF_u_lock_table_opemp DEFAULT(''),
-//        lock_time DATETIME NOT NULL CONSTRAINT DF_u_lock_table_lock_time DEFAULT(GETDATE()),
-//        expire_time DATETIME NULL CONSTRAINT DF_u_lock_table_expire_time DEFAULT(NULL),
-//        CONSTRAINT UK_u_lock_table PRIMARY KEY (logid),
-//        CONSTRAINT UQ_u_lock_table UNIQUE (keyword, billid)
-//    );
-//END
+IF NOT EXISTS (SELECT * FROM sys.tables WHERE name = 'u_lock_table')
+BEGIN
+    CREATE TABLE u_lock_table (
+        logid int IDENTITY(1,1) NOT NULL,
+        keyword VARCHAR(24) NOT NULL CONSTRAINT DF_u_lock_table_keyword DEFAULT(''),
+        billid INT NOT NULL CONSTRAINT DF_u_lock_table_billid DEFAULT(0),
+        billcode VARCHAR(50) NOT NULL CONSTRAINT DF_u_lock_table_billcode DEFAULT(''),
+        is_locked BIT NOT NULL CONSTRAINT DF_u_lock_table_is_locked DEFAULT(1),
+        opemp VARCHAR(24) NOT NULL CONSTRAINT DF_u_lock_table_opemp DEFAULT(''),
+        lock_time DATETIME NOT NULL CONSTRAINT DF_u_lock_table_lock_time DEFAULT(GETDATE()),
+        expire_time DATETIME NULL CONSTRAINT DF_u_lock_table_expire_time DEFAULT(NULL),
+        CONSTRAINT UK_u_lock_table PRIMARY KEY (logid),
+        CONSTRAINT UQ_u_lock_table UNIQUE (keyword, billid)
+    );
+END
 
-//IF NOT EXISTS (SELECT * FROM sys.procedures WHERE name = 'sp_lock_record')
-//BEGIN
-//    EXEC('
-//    CREATE PROCEDURE sp_lock_record
-//        @keyword VARCHAR(24),
-//        @billid INT,
-//        @billcode VARCHAR(50),
-//        @opemp VARCHAR(24),
-//        @lockMinutes INT = 30
-//    AS
-//    BEGIN
-//        SET NOCOUNT ON;
-//        DECLARE @now DATETIME = GETDATE();
-//        DECLARE @expire DATETIME = DATEADD(MINUTE, @lockMinutes, @now);
+IF NOT EXISTS (SELECT * FROM sys.procedures WHERE name = 'sp_lock_record')
+BEGIN
+    EXEC('
+    CREATE PROCEDURE sp_lock_record
+        @keyword VARCHAR(24),
+        @billid INT,
+        @billcode VARCHAR(50),
+        @opemp VARCHAR(24),
+        @lockMinutes INT = 30
+    AS
+    BEGIN
+        SET NOCOUNT ON;
+        DECLARE @now DATETIME = GETDATE();
+        DECLARE @expire DATETIME = DATEADD(MINUTE, @lockMinutes, @now);
 
-//        DELETE FROM u_lock_table
-//        WHERE keyword = @keyword AND billid = @billid
-//          AND expire_time IS NOT NULL AND expire_time < @now;
+        DELETE FROM u_lock_table
+        WHERE keyword = @keyword AND billid = @billid
+          AND expire_time IS NOT NULL AND expire_time < @now;
 
-//        BEGIN TRY
-//            INSERT INTO u_lock_table (keyword, billid, billcode, is_locked, opemp, lock_time, expire_time)
-//            VALUES (@keyword, @billid, @billcode, 1, @opemp, @now, @expire);
-//            SELECT 1 AS arg_rslt, ''加锁成功'' AS arg_msg;
-//        END TRY
-//        BEGIN CATCH
-//            SELECT 0 AS arg_rslt, ''当前单据已被锁定，不能编辑'' AS arg_msg;
-//        END CATCH
-//    END;
-//    ');
-//END
+        BEGIN TRY
+            INSERT INTO u_lock_table (keyword, billid, billcode, is_locked, opemp, lock_time, expire_time)
+            VALUES (@keyword, @billid, @billcode, 1, @opemp, @now, @expire);
+            SELECT 1 AS arg_rslt, ''加锁成功'' AS arg_msg;
+        END TRY
+        BEGIN CATCH
+            SELECT 0 AS arg_rslt, ''当前单据已被锁定，不能编辑'' AS arg_msg;
+        END CATCH
+    END;
+    ');
+END
 
-//IF NOT EXISTS (SELECT * FROM sys.procedures WHERE name = 'sp_unlock_record')
-//BEGIN
-//    EXEC('
-//    CREATE PROCEDURE sp_unlock_record
-//        @keyword VARCHAR(24),
-//        @billid INT,
-//        @opemp VARCHAR(24),
-//        @is_admin BIT = 0
-//    AS
-//    BEGIN
-//        SET NOCOUNT ON;
+IF NOT EXISTS (SELECT * FROM sys.procedures WHERE name = 'sp_unlock_record')
+BEGIN
+    EXEC('
+    CREATE PROCEDURE sp_unlock_record
+        @keyword VARCHAR(24),
+        @billid INT,
+        @opemp VARCHAR(24),
+        @is_admin BIT = 0
+    AS
+    BEGIN
+        SET NOCOUNT ON;
         
-//        IF @is_admin = 1
-//            DELETE FROM u_lock_table
-//            WHERE keyword = @keyword AND billid = @billid;
-//        ELSE
-//            DELETE FROM u_lock_table
-//            WHERE keyword = @keyword AND billid = @billid
-//              AND opemp = @opemp;
+        IF @is_admin = 1
+            DELETE FROM u_lock_table
+            WHERE keyword = @keyword AND billid = @billid;
+        ELSE
+            DELETE FROM u_lock_table
+            WHERE keyword = @keyword AND billid = @billid
+              AND opemp = @opemp;
         
-//        IF @@ROWCOUNT > 0
-//            SELECT 1 AS arg_rslt, ''解锁成功'' AS arg_msg;
-//        ELSE
-//            SELECT 0 AS arg_rslt, 
-//                   CASE 
-//                       WHEN @is_admin = 1 THEN ''解锁失败，记录不存在或已过期''
-//                       ELSE ''解锁失败，原因:可能不是本人加的锁或已过期''
-//                   END AS arg_msg;
-//    END;
-//    ');
-//END
-//", ""),
-  new Script("1.0.250920", @"ALTER TABLE u_mtrl_price ADD is_singleqty BIT NOT NULL CONSTRAINT DF_u_lock_table_is_singleqty DEFAULT(0)", ""),
+        IF @@ROWCOUNT > 0
+            SELECT 1 AS arg_rslt, ''解锁成功'' AS arg_msg;
+        ELSE
+            SELECT 0 AS arg_rslt, 
+                   CASE 
+                       WHEN @is_admin = 1 THEN ''解锁失败，记录不存在或已过期''
+                       ELSE ''解锁失败，原因:可能不是本人加的锁或已过期''
+                   END AS arg_msg;
+    END;
+    ');
+END
+", ""),
                 };
             }
         }