1、禁用所有加锁功能

JLHHJSvr/DBA/ParkDBVersion.cs

@@ -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.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
 
-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.250919", @"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
+//", ""),
+  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)", ""),
                 };
             }
         }

JLHHJSvr/Helper/LockHelper.cs

@@ -24,7 +24,7 @@ namespace JLHHJSvr.Helper
         /// <param name="billid"></param>
         public static void LockBill(SqlCommand cmd, string keyword, int billid, string billcode,string opemp, int lockMinutes = 30)
         {
-            //return;
+            return;
             try
             {
                 cmd.CommandText = "sp_lock_record";
@@ -60,7 +60,7 @@ namespace JLHHJSvr.Helper
         /// <param name="billid"></param>
         public static void UnLockBill(SqlCommand cmd, string keyword, int billid, string opemp, byte is_admin)
         {
-            //return;
+            return;
             try
             {
                 cmd.CommandText = "sp_unlock_record";
@@ -116,7 +116,7 @@ namespace JLHHJSvr.Helper
         public static bool CheckIsLock(SqlCommand cmd, string keyword, int billid, string opemp,out string arg_msg)
         {
             arg_msg = string.Empty;
-            //return false;
+            return false;
             var item = CheckLockAll(cmd, keyword, billid, opemp);
             if (item.Code == LockCheckResultCode.LockedByOther)
             {

JLHWEB/src/hooks/usePageRouter.ts

@@ -53,77 +53,13 @@ export const usePageRouter = () => {
   };
 
   const pageCheckOpen = async (path: string, keyword: string, billid: number, billcode: string) => {
-    await CheckLock({ keyword, billid, billcode });
-
-    // let pageid = window.location.href.split("pageid=")[1];
-    // if (pageid) {
-    // let poststr = JSON.stringify({
-    //   pageid: pageid,
-    //   putdata: {
-    //     url: path,
-    //     title: getRouteTitle(path, title),
-    //     showType: "MainNewTabPage"
-    //   }
-    // });
-
-    // let _window = window as any;
-    // if (_window?.chrome?.webview) {`
-    //   // 客户端
-    //   console.log("_window.chrome.webview.postMessage ", poststr, ";_window ", _window);
-    //   _window.chrome.webview.postMessage(poststr);
-    // } else if (window.top) {
-    //   // 浏览器
-    //   console.log("window.top.postMessage ", poststr, ";window ", window);
-    //   window.top.postMessage(poststr, "*");
-    // } else if (window.parent) {
-    //   // 一般不使用
-    //   console.log("window.parent.postMessage ", poststr, ";window ", window);
-    //   window.parent.postMessage(poststr, "*");
-    // } else {
-    //   // 一般不使用
-    //   console.log("window.postMessage ", poststr, ";window ", window);
-    //   window.postMessage(poststr, "*");
-    // }
-    // } else {
+    // await CheckLock({ keyword, billid, billcode });
     router.push(path);
-    // }
   };
 
   const pageCheckRefresh = async (path: string, keyword: string, billid: number, billcode: string) => {
-    await CheckLock({ keyword, billid, billcode });
-
-    // let pageid = window.location.href.split("pageid=")[1];
-    // if (pageid) {
-    // let poststr = JSON.stringify({
-    //   pageid: pageid,
-    //   putdata: {
-    //     url: path,
-    //     title: getRouteTitle(path, title),
-    //     showType: "MainNewTabPage"
-    //   }
-    // });
-
-    // let _window = window as any;
-    // if (_window?.chrome?.webview) {`
-    //   // 客户端
-    //   console.log("_window.chrome.webview.postMessage ", poststr, ";_window ", _window);
-    //   _window.chrome.webview.postMessage(poststr);
-    // } else if (window.top) {
-    //   // 浏览器
-    //   console.log("window.top.postMessage ", poststr, ";window ", window);
-    //   window.top.postMessage(poststr, "*");
-    // } else if (window.parent) {
-    //   // 一般不使用
-    //   console.log("window.parent.postMessage ", poststr, ";window ", window);
-    //   window.parent.postMessage(poststr, "*");
-    // } else {
-    //   // 一般不使用
-    //   console.log("window.postMessage ", poststr, ";window ", window);
-    //   window.postMessage(poststr, "*");
-    // }
-    // } else {
+    // await CheckLock({ keyword, billid, billcode });
     router.replace(path);
-    // }
   };
 
   /**