From cfb630488fa09eaa6730faa3a6ae0a57909dccc9 Mon Sep 17 00:00:00 2001
From: wyf <wyf@local>
Date: Fri, 21 Mar 2025 10:11:38 +0000
Subject: [PATCH] SVN r371

SVN-Revision: r371
---
 插件库/Lskj.ProductSched/FrmProductSched.cs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/插件库/Lskj.ProductSched/FrmProductSched.cs b/插件库/Lskj.ProductSched/FrmProductSched.cs
index bb3a3ed..982ed54 100644
--- a/插件库/Lskj.ProductSched/FrmProductSched.cs
+++ b/插件库/Lskj.ProductSched/FrmProductSched.cs
@@ -126,8 +126,8 @@ namespace Lskj.ProductiSched
             //上方表格
             bandGcTop.Model = DataModel.TopSysModel;
             bandGcTop.SetEditColumns(DataModel.TopGridColumns, GridCustomColumnStruct.BaseMainGridView + DataModel.TopModuleModel.FormKey);
-            bandGcTop.SetGridRightMenus(BaseModuleImpl.GetBaseGridRightMenus(DataModel.TopModuleModel.FormKey), DataModel.TopSysModel);
-            bandGcTop.SetGridRowColors(BaseModuleImpl.GetBaseGridRowColors(DataModel.TopModuleModel.FormKey));
+            bandGcTop.SetGridRightMenus(BaseModuleImpl.GetBaseGridRightMenus(DataModel.TopModuleModel.ModeCode), DataModel.TopSysModel);
+            bandGcTop.SetGridRowColors(BaseModuleImpl.GetBaseGridRowColors(DataModel.TopModuleModel.ModeCode));
             AddDataColumns(bandGcTop);
             if (DataModel.TopModuleModel.HasReport)
             {
@@ -138,8 +138,8 @@ namespace Lskj.ProductiSched
             {
                 bandGcBottom.Model = DataModel.BottomSysModel;
                 bandGcBottom.SetEditColumns(DataModel.BottomGridColumns, GridCustomColumnStruct.BaseMainGridView + DataModel.BottomModuleModel.FormKey);
-                bandGcBottom.SetGridRightMenus(BaseModuleImpl.GetBaseGridRightMenus(DataModel.BottomModuleModel.FormKey), DataModel.BottomSysModel);
-                bandGcBottom.SetGridRowColors(BaseModuleImpl.GetBaseGridRowColors(DataModel.BottomModuleModel.FormKey));
+                bandGcBottom.SetGridRightMenus(BaseModuleImpl.GetBaseGridRightMenus(DataModel.BottomModuleModel.ModeCode), DataModel.BottomSysModel);
+                bandGcBottom.SetGridRowColors(BaseModuleImpl.GetBaseGridRowColors(DataModel.BottomModuleModel.ModeCode));
                 AddDataColumns(bandGcBottom);
                 foreach (GridBand gridBand in bandGcBottom.BandedView.Bands)
                 {
@@ -161,8 +161,8 @@ namespace Lskj.ProductiSched
             {
                 gcRight.Model = DataModel.RightSysModel;
                 gcRight.SetEditColumns(DataModel.RightGridColumns, GridCustomColumnStruct.BaseMainGridView + DataModel.RightModuleModel.FormKey);
-                gcRight.SetGridRightMenus(BaseModuleImpl.GetBaseGridRightMenus(DataModel.RightModuleModel.FormKey), DataModel.RightSysModel);
-                gcRight.SetGridRowColors(BaseModuleImpl.GetBaseGridRowColors(DataModel.RightModuleModel.FormKey));
+                gcRight.SetGridRightMenus(BaseModuleImpl.GetBaseGridRightMenus(DataModel.RightModuleModel.ModeCode), DataModel.RightSysModel);
+                gcRight.SetGridRowColors(BaseModuleImpl.GetBaseGridRowColors(DataModel.RightModuleModel.ModeCode));
             }
         }
         /// <summary>
@@ -424,7 +424,7 @@ namespace Lskj.ProductiSched
             }
             // 调用存储过程保存变更数据
             string msg;
-            int ret = SaveDayPlanChanges(tvp, typeDate,out msg);
+            int ret = SaveDayPlanChanges(tvp, typeDate, out msg);
             if (ret == 1)
             {
                 MessageUtil.Show("保存成功：" + msg);
@@ -644,8 +644,8 @@ namespace Lskj.ProductiSched
             {
                 LabelDateEdit labelDateEdit = baseUserControl as LabelDateEdit;
                 DateTime dateTime = labelDateEdit.TextEdit.DateTime;
-                UpdateDynamicColumns(bandGcTop, dateTime,typeDate);
-                UpdateDynamicColumns(bandGcBottom, dateTime,typeDate);
+                UpdateDynamicColumns(bandGcTop, dateTime, typeDate);
+                UpdateDynamicColumns(bandGcBottom, dateTime, typeDate);
             }
         }
         /// <summary>
@@ -680,7 +680,7 @@ namespace Lskj.ProductiSched
                 DataTable dataDetail = bandGcTop.GridControl.DataSourceTable().Copy();
                 bandGcTop.GridControl.DataSource = null;
                 string sqlValue = DataModel.RightModuleModel.MenuSql;
-                string isweekcond = DataModel.TopModuleModel.HasReport?"":$"and isWeek='{typeDate}'";
+                string isweekcond = DataModel.TopModuleModel.HasReport ? "" : $"and isWeek='{typeDate}'";
                 sqlValue = $"{ReplaceHelper.ReplaceWhereCond(sqlValue)} and day >= '{dateTime.ToString("yyyy-MM-dd")}' {isweekcond}";
                 DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue);
                 MergeMainDataWithDayPlan(dataMain, dataDayPlan, dateTime, typeDate);