cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r371

Browse Source 
SVN-Revision: r371
This commit is contained in:
wyf
2025-03-21 10:11:38 +00:00
parent e00dcdd72d
commit cfb630488f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.ProductSched/FrmProductSched.cs
+10 -10
View File
@@ -126,8 +126,8 @@ namespace Lskj.ProductiSched
//上方表格 //上方表格
bandGcTop.Model = DataModel.TopSysModel; bandGcTop.Model = DataModel.TopSysModel;
bandGcTop.SetEditColumns(DataModel.TopGridColumns, GridCustomColumnStruct.BaseMainGridView + DataModel.TopModuleModel.FormKey); bandGcTop.SetEditColumns(DataModel.TopGridColumns, GridCustomColumnStruct.BaseMainGridView + DataModel.TopModuleModel.FormKey);
bandGcTop.SetGridRightMenus(BaseModuleImpl.GetBaseGridRightMenus(DataModel.TopModuleModel.FormKey), DataModel.TopSysModel); bandGcTop.SetGridRightMenus(BaseModuleImpl.GetBaseGridRightMenus(DataModel.TopModuleModel.ModeCode), DataModel.TopSysModel);
bandGcTop.SetGridRowColors(BaseModuleImpl.GetBaseGridRowColors(DataModel.TopModuleModel.FormKey)); bandGcTop.SetGridRowColors(BaseModuleImpl.GetBaseGridRowColors(DataModel.TopModuleModel.ModeCode));
AddDataColumns(bandGcTop); AddDataColumns(bandGcTop);
if (DataModel.TopModuleModel.HasReport) if (DataModel.TopModuleModel.HasReport)
{ {
@@ -138,8 +138,8 @@ namespace Lskj.ProductiSched
{ {
bandGcBottom.Model = DataModel.BottomSysModel; bandGcBottom.Model = DataModel.BottomSysModel;
bandGcBottom.SetEditColumns(DataModel.BottomGridColumns, GridCustomColumnStruct.BaseMainGridView + DataModel.BottomModuleModel.FormKey); bandGcBottom.SetEditColumns(DataModel.BottomGridColumns, GridCustomColumnStruct.BaseMainGridView + DataModel.BottomModuleModel.FormKey);
bandGcBottom.SetGridRightMenus(BaseModuleImpl.GetBaseGridRightMenus(DataModel.BottomModuleModel.FormKey), DataModel.BottomSysModel); bandGcBottom.SetGridRightMenus(BaseModuleImpl.GetBaseGridRightMenus(DataModel.BottomModuleModel.ModeCode), DataModel.BottomSysModel);
bandGcBottom.SetGridRowColors(BaseModuleImpl.GetBaseGridRowColors(DataModel.BottomModuleModel.FormKey)); bandGcBottom.SetGridRowColors(BaseModuleImpl.GetBaseGridRowColors(DataModel.BottomModuleModel.ModeCode));
AddDataColumns(bandGcBottom); AddDataColumns(bandGcBottom);
foreach (GridBand gridBand in bandGcBottom.BandedView.Bands) foreach (GridBand gridBand in bandGcBottom.BandedView.Bands)
{ {
@@ -161,8 +161,8 @@ namespace Lskj.ProductiSched
{ {
gcRight.Model = DataModel.RightSysModel; gcRight.Model = DataModel.RightSysModel;
gcRight.SetEditColumns(DataModel.RightGridColumns, GridCustomColumnStruct.BaseMainGridView + DataModel.RightModuleModel.FormKey); gcRight.SetEditColumns(DataModel.RightGridColumns, GridCustomColumnStruct.BaseMainGridView + DataModel.RightModuleModel.FormKey);
gcRight.SetGridRightMenus(BaseModuleImpl.GetBaseGridRightMenus(DataModel.RightModuleModel.FormKey), DataModel.RightSysModel); gcRight.SetGridRightMenus(BaseModuleImpl.GetBaseGridRightMenus(DataModel.RightModuleModel.ModeCode), DataModel.RightSysModel);
gcRight.SetGridRowColors(BaseModuleImpl.GetBaseGridRowColors(DataModel.RightModuleModel.FormKey)); gcRight.SetGridRowColors(BaseModuleImpl.GetBaseGridRowColors(DataModel.RightModuleModel.ModeCode));
} }
} }
/// <summary> /// <summary>
@@ -424,7 +424,7 @@ namespace Lskj.ProductiSched
} }
// 调用存储过程保存变更数据 // 调用存储过程保存变更数据
string msg; string msg;
int ret = SaveDayPlanChanges(tvp, typeDate,out msg); int ret = SaveDayPlanChanges(tvp, typeDate, out msg);
if (ret == 1) if (ret == 1)
{ {
MessageUtil.Show("保存成功：" + msg); MessageUtil.Show("保存成功：" + msg);
@@ -644,8 +644,8 @@ namespace Lskj.ProductiSched
{ {
LabelDateEdit labelDateEdit = baseUserControl as LabelDateEdit; LabelDateEdit labelDateEdit = baseUserControl as LabelDateEdit;
DateTime dateTime = labelDateEdit.TextEdit.DateTime; DateTime dateTime = labelDateEdit.TextEdit.DateTime;
UpdateDynamicColumns(bandGcTop, dateTime,typeDate); UpdateDynamicColumns(bandGcTop, dateTime, typeDate);
UpdateDynamicColumns(bandGcBottom, dateTime,typeDate); UpdateDynamicColumns(bandGcBottom, dateTime, typeDate);
} }
} }
/// <summary> /// <summary>
@@ -680,7 +680,7 @@ namespace Lskj.ProductiSched
DataTable dataDetail = bandGcTop.GridControl.DataSourceTable().Copy(); DataTable dataDetail = bandGcTop.GridControl.DataSourceTable().Copy();
bandGcTop.GridControl.DataSource = null; bandGcTop.GridControl.DataSource = null;
string sqlValue = DataModel.RightModuleModel.MenuSql; 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}"; sqlValue = $"{ReplaceHelper.ReplaceWhereCond(sqlValue)} and day >= '{dateTime.ToString("yyyy-MM-dd")}' {isweekcond}";
DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue); DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue);
MergeMainDataWithDayPlan(dataMain, dataDayPlan, dateTime, typeDate); MergeMainDataWithDayPlan(dataMain, dataDayPlan, dateTime, typeDate);