SVN r626

SVN-Revision: r626

插件库/Lskj.PubBill/BillModule.cs

@@ -4806,7 +4806,7 @@ namespace Lskj.PubBill
                                         // 插入数据到临时表
                                         DataRow dr = tvp.NewRow();
                                         dr["lblOrderNo"] = billNo;
-                                        dr["billdocument_id"] = "计划文件"+ gcMain.jhrowitem.ToJsonObject();
+                                        dr["billdocument_id"] = "计划文件" + gcMain.jhrowitem.ToJsonObject();
                                         if (DateColumnList.Count > 0 && DateColumnList[0].Tag is DateTime dateTime)
                                         {
                                             dr["showday"] = dateTime.ToString("yyyy-MM-dd"); //日期
@@ -4818,7 +4818,7 @@ namespace Lskj.PubBill
                                     {
                                         item["lblOrderNo"] = billNo;
                                     }
-                                
+
                                     // 调用存储过程保存变更数据
                                     string msg;
                                     int ret = SaveDayPlanChanges(tvp, out msg);
@@ -5365,15 +5365,15 @@ namespace Lskj.PubBill
                     DataTable dataOnlyPlanFile = BaseImpl.GetDataTableResult(sqlIncludePlan);
                     MergeMainDataWithDayPlan(dataTable, dataNoPlanFile, dateTime);
                     //若存在缓存计划数据则渲染合计
-                    if (dataOnlyPlanFile.Rows.Count>0)
+                    if (dataOnlyPlanFile.Rows.Count > 0)
                     {
-                        string jhrowtiemjson = (dataOnlyPlanFile.Rows[0]["billdocument_id"] + "").Replace("计划文件","");
+                        string jhrowtiemjson = (dataOnlyPlanFile.Rows[0]["billdocument_id"] + "").Replace("计划文件", "");
                         try
                         {
                             JObject rowObject = JsonConvert.DeserializeObject<JObject>(jhrowtiemjson);
                             JArray jArray = new JArray();
                             jArray.Add(rowObject);
-                            DataRow jhrowitem= JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(jArray)).Rows[0];
+                            DataRow jhrowitem = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(jArray)).Rows[0];
                             //渲染计划合计
                             gcMain.AddHeadquarters(jhrowitem);
                         }
@@ -5381,6 +5381,7 @@ namespace Lskj.PubBill
                         {
                         }
                     }
+                    gcMain.RefreshHeaderColor();
                     this.gcMain.GridControl.DataSource = null;
                     this.gcMain.GridControl.DataSource = dataTable;
                 }
@@ -8248,34 +8249,4 @@ namespace Lskj.PubBill
         /// </summary>
         /// <param name="cond">The cond.</param>
         /// <param name="dataRow">The data row.</param>
-        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns>
-        private bool ValidateCond(string cond, DataRow dataRow)
-        {
-            bool result = false;
-            string condition = cond;
-            try
-            {
-                if (string.IsNullOrWhiteSpace(cond)) return true;//如果值是空格或者空行，默认正确
-                cond = ReplaceHelper.ReplaceRowParam(dataRow, cond);
-                if (cond.StartsWith("@") || cond.StartsWith("!"))
-                {
-                    result = "1".Equals(BaseImpl.GetDefaultValue(cond));
-                }
-                else if (dataRow == null)
-                {
-                    result = ReplaceHelper.EvalCond(cond);
-                }
-                else
-                {
-                    result = ReplaceHelper.ReplaceRowParamCond(dataRow, cond);
-                }
-                return result;
-            }
-            catch (Exception ex)
-            {
-
-            }
-            return result;
-        }
-    }
-}
+        /// <returns><c>true</c> if X