提交当前本机最新程序

插件库/Lskj.Business/Impl/BaseModuleImpl.cs

@@ -1375,6 +1375,18 @@ namespace Lskj.Business.Impl
             return GetDataTableResult(sqlValue);
         }
 
+        /// <summary>
+        /// 获取基础档案附加信息,用formKey查询
+        /// </summary>
+        /// <param name="tabKey"></param>
+        /// <returns></returns>
+        public static DataTable GetBaseAttachKey(string tabKey)
+        {
+            string sqlValue = string.Format(@"select * from p_SystemdllTabAttach where tabKey='{0}' and ISNULL(isVisible,0)=0 order by orderid", tabKey);
+            return GetDataTableResult(sqlValue);
+        }
+
+
 
         /// <summary>
         /// <para>说明：判断存储过程参数方法</para>

插件库/Lskj.Business/Impl/BaseSpecImpl.cs

@@ -72,11 +72,14 @@ namespace Lskj.Business.Impl
                 maxNum += "9";
             }
 
-            string sqlValue = string.Format("select max(cast({1} as bigint))+1 from {0} where {1} like '{2}{3}'", tableName, parentKey, parentValue, maxdivision);
+            // SpeciesNo是层级编码，完整编码可能超过bigint范围，只对当前节点编号进行数值运算。
+            string sqlValue = string.Format("select max(cast(right({1},{4}) as bigint))+1 from {0} where {1} like '{2}{3}'", tableName, parentKey, parentValue, maxdivision, firstNode.Length);
             string maxNo = GetResult(sqlValue) + "";
 
             if (string.IsNullOrWhiteSpace(maxNo))
                 maxNo = parentValue + PrefixNum+"1";
+            else
+                maxNo = parentValue + maxNo.PadLeft(firstNode.Length, '0');
             maxNo = maxNo.PadLeft(parentValue.Length + firstNode.Length, '0');
 
             if ((PrefixNum + "0").Equals(maxNo.Substring(maxNo.Length - firstNode.Length)))
@@ -87,11 +90,11 @@ namespace Lskj.Business.Impl
                     return maxNum;
 
                 // 取未使用的编号
-                sqlValue = string.Format("select cast({1} as bigint) as SpeciesNo from {0} where {1} like '{2}{3}' order by {1}", tableName, parentKey, parentValue,maxdivision);
+                sqlValue = string.Format("select cast(right({1},{4}) as bigint) as SpeciesNo from {0} where {1} like '{2}{3}' order by SpeciesNo", tableName, parentKey, parentValue,maxdivision, firstNode.Length);
                 DataTable table = GetDataTableResult(sqlValue);
 
                 Int64 speciesNo = table.Rows.Count > 0 ? Convert.ToInt64(table.Rows[0]["SpeciesNo"] + "") : 0;
-                if (speciesNo != Int64.Parse(parentValue + PrefixNum+"1"))
+                if (speciesNo != 1)
                     return parentValue +PrefixNum+"1";;
 
                 foreach (DataRow item in table.Rows)
@@ -101,8 +104,7 @@ namespace Lskj.Business.Impl
 
                     if (rowSpeciesNo != speciesNo + 1)
                     {
-                        maxNo = (speciesNo + 1).ToString();
-                        maxNo = maxNo.PadLeft(parentValue.Length + firstNode.Length, '0');
+                        maxNo = parentValue + (speciesNo + 1).ToString().PadLeft(firstNode.Length, '0');
 
                         break;
                     }

插件库/Lskj.Business/Impl/SystemInfo.cs

@@ -329,6 +329,7 @@ namespace Lskj.Business
             Instance.SourceFilteringMobile = item.Table.Columns.Contains("SourceFilteringMobile") && !string.IsNullOrEmpty(item["SourceFilteringMobile"] + "") ? "1".Equals(item["SourceFilteringMobile"] + "") : false;
             Instance.LoginUsername = item.Table.Columns.Contains("LoginUsername") && !string.IsNullOrEmpty(item["LoginUsername"] + "") ? item["LoginUsername"] + "" : "";
             Instance.MainLeftShowMode = item.Table.Columns.Contains("MainLeftShowMode") && !string.IsNullOrEmpty(item["MainLeftShowMode"] + "") ? item["MainLeftShowMode"] + "" : "";
+            Instance.DeadlockPrompt = item.Table.Columns.Contains("DeadlockPrompt") && !string.IsNullOrEmpty(item["DeadlockPrompt"] + "") ? item["DeadlockPrompt"] + "" : "";
         }
         /// <summary>
         /// 高拍仪AccessKey
@@ -1149,6 +1150,10 @@ namespace Lskj.Business
         /// 主界面左侧树展示模式
         /// </summary>
         public string MainLeftShowMode;
+        /// <summary>
+        /// 死锁提示
+        /// </summary>
+        public string DeadlockPrompt;
 
     }
 }