SVN r486

SVN-Revision: r486

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

@@ -877,6 +877,10 @@ namespace Lskj.Business.Impl
             {
                 field += ",ImportReturnValue";
             }
+            if (HasExistsColumn("p_systembillsourcecond", "ImportCurrentValue"))
+            {
+                field += ",ImportCurrentValue";
+            }
             string sqlValue = string.Format(@"select id,controlLeft,controlTop,controlWidth,controlHeight,controlType as fieldTypeId,controlName as fieldName,controlLabel as userName,'' DataFormat,
 	                                   defaultValue,sourceSql as lookupSql,keyField as lookupKeyField,resultField as lookupResult,edited,checkCond,InputHintText{0}
                                 from p_systembillsourcecond 
@@ -1239,4 +1243,29 @@ namespace Lskj.Business.Impl
         /// <param name="comfirmAdvice">确认意见.</param>
         /// <returns>System.Int32.</returns>
         public static bool isParamComplete(string storedName, string[] Param)
+        {
+            string whereConfig = string.Empty;
+            for (int i = 0; i < Param.Length; i++)
+            {
+                whereConfig += string.Format(" LOWER(PARAMETER_NAME)=LOWER('{0}') or", Param[i]);
+            }
+            string sql = string.Format("SELECT PARAMETER_NAME AS [参数名称] FROM INFORMATION_SCHEMA.PARAMETERS WHERE SPECIFIC_NAME='{1}' and ({0})", whereConfig.Substring(0, whereConfig.Length - 2), storedName);
+            return SqlHelper.ExecuteDataTable(sql).Rows.Count == Param.Length;
+        }
 
+        /// <summary>
+        /// 创建只读列
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        public static DataTable getDetail_Details(string key)
+        {
+            string sql = string.Format("select * from p_systembillsourcedetail where sourceid=0 and sourcekey='{0}' and mxflag=1 and isnull(isVisible,0)=0 order by orderid", key);
+            return GetDataTableResult(sql);
+        }
+
+
+
+
+    }
+}

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

@@ -154,6 +154,10 @@ namespace Lskj.Business.Impl
             {
                 field += ",MuitlAuditBackFlag";
             }
+            if (HasExistsColumn("p_systembilltype", "DisableAutomaticRefresh"))
+            {
+                field += ",DisableAutomaticRefresh";
+            }
             string sqlValue = string.Format("select mastertable,overbacksql,overbackkey,overbackoper,overbackcond,prefix,formkey,billPrintType {0} from p_systembilltype where typecode=@DllCoid", field);
             DataTable dtTable = SqlHelper.ExecuteDataTable(sqlValue, new SqlParameter[] { new SqlParameter("@DllCoid", menuCode) });
             return dtTable.Rows.Count > 0 ? dtTable.Rows[0] : null;
@@ -408,23 +412,4 @@ namespace Lskj.Business.Impl
         /// <para>创建人：</para>
         /// <para>创建日期：2023-05-12</para>
         /// <para>修改人：</para>
-        /// <para>修改日期：</para>
+        /// <para>
-        /// <para>修改备注：</para>
-        /// <para>版本：1.0</para>
-        /// </summary>
-        /// <param name="typeCode">模块编号.</param>
-        /// <returns>DataRow.</returns>
-        public static DataRow GetAgencyAuthority(string typeCode) 
-        {
-            DataTable dtTable = new DataTable();
-            if (SqlHelper.ExecuteDataTable("select object_id('p_systemPrivilegeAgentTab')").Rows.Count > 0 && int.Parse(SqlHelper.ExecuteScalar("select count(*) from sysobjects where id = object_id('p_systemPrivilegeAgentTab')") + "") > 0)
-            {
-                string sqlValue = string.Format("select sourceuser from  p_systemPrivilegeAgentTab where modid='{0}' and targetuser='{1}' and starttime<=getdate() and endtime>=getdate() and ban=1", typeCode, ERPInfo.Instance.UserName);
-                dtTable = SqlHelper.ExecuteDataTable(sqlValue);
-            }
-            return dtTable.Rows.Count > 0 ? dtTable.Rows[0] : null;
-
-        }
-
-    }
-}

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

@@ -938,9 +938,12 @@ namespace Lskj.Business.Impl
             string Str = "";
             if (HasExistsColumn("Mps_MachineSetTab", "JzName"))
             {
-
                 Str = ",JzName";
             }
+            if (HasExistsColumn("Mps_MachineSetTab", "modid"))
+            {
+                Str += ",modid";
+            }
             string sqlValue = string.Format("select id dm,jtname mc{1} from Mps_MachineSetTab where workshopid='{0}' ", cjid, Str);
             if (!string.IsNullOrWhiteSpace(SystemInfo.Instance.MachineConditions)) sqlValue = sqlValue + SystemInfo.Instance.MachineConditions;
 

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

@@ -287,6 +287,9 @@ namespace Lskj.Business
             Instance.HideSubtitle = item.Table.Columns.Contains("HideSubtitle") && !string.IsNullOrEmpty(item["HideSubtitle"] + "") ? "1".Equals(item["HideSubtitle"] + "") : false;
             Instance.PubProductSysMgeCopyAndSave = item.Table.Columns.Contains("PubProductSysMgeCopyAndSave") && !string.IsNullOrEmpty(item["PubProductSysMgeCopyAndSave"] + "") ? "1".Equals(item["PubProductSysMgeCopyAndSave"] + "") : false;
             Instance.SplitOrderNewVer = item.Table.Columns.Contains("SplitOrderNewVer") && !string.IsNullOrEmpty(item["SplitOrderNewVer"] + "") ? "1".Equals(item["SplitOrderNewVer"] + "") : false;
+            Instance.HideErrorSQL = item.Table.Columns.Contains("HideErrorSQL") && !string.IsNullOrEmpty(item["HideErrorSQL"] + "") ? "1".Equals(item["HideErrorSQL"] + "") : false;
+            Instance.QuickImportMode = item.Table.Columns.Contains("QuickImportMode") && !string.IsNullOrEmpty(item["QuickImportMode"] + "") ? "1".Equals(item["QuickImportMode"] + "") : false;
+            Instance.DisableFilteringQuantity = item.Table.Columns.Contains("DisableFilteringQuantity") && !string.IsNullOrEmpty(item["DisableFilteringQuantity"] + "") ? "1".Equals(item["DisableFilteringQuantity"] + "") : false;
         }
         /// <summary>
         /// 高拍仪AccessKey
@@ -915,4 +918,16 @@ namespace Lskj.Business
         /// </summary>
         public bool CancelPasteClearSort;
         /// <summary>
-        ///树结构特殊加载（数据源中有Pid��
+        ///树结构特殊加载（数据源中有Pid列，则pid设置为对应节点的父节点）
+        /// </summary>
+        public bool TreeSpecialBinding;
+        /// <summary>
+        ///优化速度加载
+        /// </summary>
+        public bool OptimizationSpeed;
+        /// <summary>
+        ///明细导出显示
+        /// </summary>
+        public bool DetailExportDisplay;
+        /// <summary>
+        /