合并最新

2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
@@ -150,12 +150,12 @@ namespace BLL
        /// <param name="menuId"></param>
        /// <param name="projectId"></param>
        /// <param name="unitId"></param>
-        public static void InsertCodeRecordsByMenuIdProjectIdUnitId(string menuId, string projectId, string unitId, string dataId, DateTime? compileDate)
+        public static string InsertCodeRecordsByMenuIdProjectIdUnitId(string menuId, string projectId, string unitId, string dataId, DateTime? compileDate)
        {
+            string ruleCode = string.Empty;
            var IsHaveCodeRecords = Funs.DB.Sys_CodeRecords.FirstOrDefault(x => x.DataId == dataId);
            if (IsHaveCodeRecords == null)  ///是否已存在编码
            {
-                string ruleCode = string.Empty;
                string ruleCodeower = string.Empty;
                int digit = 4; ///流水位数
                string symbolower = "-"; ///业主间隔符
@@ -269,6 +269,12 @@ namespace BLL
                Funs.DB.Sys_CodeRecords.InsertOnSubmit(newCodeRecords);
                Funs.DB.SubmitChanges();
            }
+            else
+            {
+                ruleCode = IsHaveCodeRecords.Code;
+            }
+
+            return ruleCode;
        }
        #endregion