From 77bb288cb1059a349bc38fb2255fcdfe2ddc3b32 Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期三, 19 三月 2025 15:05:46 +0800 Subject: [PATCH] 改gridview自适应 --- DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs | 2 DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs | 2 DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | 2 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs | 2 DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs | 2 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs | 2 DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs | 2 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs | 2 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs | 2 DevApp/Gs.DevApp/UserControl/SelectWwPc.cs | 2 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs | 2 DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs | 2 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 2 DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 2 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs | 2 DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs | 2 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 2 DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 2 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 2 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs | 2 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs | 2 DevApp/Gs.DevApp/UserControl/SelectHz.cs | 6 DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs | 2 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs | 2 DevApp/Gs.DevApp/UserControl/SelectCk.cs | 2 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 20 + DevApp/Gs.DevApp/UserControl/SelectCw.cs | 2 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 2 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 2 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs | 2 DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs | 2 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs | 2 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 2 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs | 190 +++++++------ DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs | 2 DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs | 2 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs | 2 DevApp/Gs.DevApp/DevFrm/User/Role.cs | 2 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 2 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs | 2 DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs | 2 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs | 2 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs | 2 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs | 2 DevApp/Gs.DevApp/UserControl/SelectOrg.cs | 2 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs | 2 DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs | 2 DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs | 2 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs | 4 DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs | 396 +++++++-------------------- DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs | 2 DevApp/Gs.DevApp/UserControl/ShowLogcs.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 2 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 2 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 2 DevApp/Gs.DevApp/UserControl/SelectWompba.cs | 2 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs | 2 DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs | 2 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs | 2 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs | 2 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs | 2 DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs | 2 DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs | 2 DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs | 13 DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.cs | 2 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs | 2 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 2 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs | 2 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 7 DevApp/Gs.DevApp/DevFrm/User/User.cs | 2 DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 2 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 2 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs | 3 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 17 DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs | 3 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 2 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs | 2 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 2 DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs | 2 86 files changed, 338 insertions(+), 473 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs index 342a34a..a9b321b 100644 --- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs @@ -122,7 +122,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs index df67de6..083e240 100644 --- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs @@ -127,7 +127,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs index 199c40a..44670a3 100644 --- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs @@ -256,7 +256,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs index 33908df..843a558 100644 --- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs @@ -127,7 +127,8 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); + } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs index ad575c3..c44492b 100644 --- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs @@ -127,7 +127,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs index e45fe80..4dcfb44 100644 --- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs @@ -275,7 +275,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs index 2b310f4..7e27e93 100644 --- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs @@ -129,7 +129,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs index fc680af..a167a09 100644 --- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs +++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs @@ -127,7 +127,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs index 5de6ebb..caad93f 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs @@ -414,7 +414,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs index 76a3d31..b2b7116 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs @@ -170,7 +170,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs index afee59c..8296b4e 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs @@ -172,7 +172,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs index 412defa..61ba6c6 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs @@ -411,7 +411,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs index 8e47821..b927c19 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.cs @@ -174,7 +174,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs index 2b1d6c5..194ed3c 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs @@ -402,7 +402,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs index 08d5e12..9da1f78 100644 --- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs @@ -182,7 +182,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs index 4f3cb51..75e5837 100644 --- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs +++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs @@ -133,7 +133,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs index cea936a..98c2a16 100644 --- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs +++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs @@ -129,7 +129,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs index 46e4758..a0d1a81 100644 --- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs +++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectCk.cs @@ -89,7 +89,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs index 908d4ee..497d181 100644 --- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs +++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPage.cs @@ -90,7 +90,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs index 6fec848..f8194ef 100644 --- a/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs +++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectPrint.cs @@ -88,7 +88,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs index 16be8ca..ab367da 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs @@ -274,7 +274,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs index 5c850b7..6831a51 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs @@ -253,8 +253,8 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs index 87deb25..e8b494d 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs @@ -413,7 +413,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs index 449f647..2317454 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs @@ -304,7 +304,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs index 12f033d..a9330d9 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs @@ -281,7 +281,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs index 9438731..cd05b88 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs @@ -466,7 +466,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs index 7c8a422..abba404 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs @@ -30,7 +30,7 @@ /// </summary> private void InitializeComponent() { - // this.jyxm1 = new QC.Jyxm("ipqc宸℃"); + // this.jyxm1 = new QC.Jyxm("iqc"); this.jyxm1 = new QC.Jyxm("iqc"); this.SuspendLayout(); // @@ -41,14 +41,15 @@ this.jyxm1.Name = "jyxm1"; this.jyxm1.Size = new System.Drawing.Size(1044, 711); this.jyxm1.TabIndex = 0; + // - // Frm_Jyxm + // Frm_MesQmCheckitemDt // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1044, 711); this.Controls.Add(this.jyxm1); - this.Name = "Frm_Jyxm"; + this.Name = "Frm_MesQmCheckitemDt"; this.Text = "iqc"; this.ResumeLayout(false); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs index b4d2334..c731a63 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs @@ -28,23 +28,23 @@ /// </summary> private void InitializeComponent() { - DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject(); - DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject(); + DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -125,6 +125,7 @@ this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1fdownAllow = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.xtraTabPageCopy = new DevExpress.XtraTab.XtraTabPage(); @@ -628,7 +629,7 @@ this.txt_fSubsidiary.IsReadly = false; this.txt_fSubsidiary.Location = new System.Drawing.Point(96, 12); this.txt_fSubsidiary.Name = "txt_fSubsidiary"; - this.txt_fSubsidiary.Size = new System.Drawing.Size(188, 28); + this.txt_fSubsidiary.Size = new System.Drawing.Size(183, 28); this.txt_fSubsidiary.TabIndex = 383; // // txt_itemId @@ -636,39 +637,39 @@ this.txt_itemId.IsReadly = false; this.txt_itemId.Location = new System.Drawing.Point(96, 44); this.txt_itemId.Name = "txt_itemId"; - this.txt_itemId.Size = new System.Drawing.Size(188, 28); + this.txt_itemId.Size = new System.Drawing.Size(183, 28); this.txt_itemId.TabIndex = 380; this.txt_itemId.Tag = "no"; // // txt_foneCheckdate // - this.txt_foneCheckdate.Location = new System.Drawing.Point(926, 44); + this.txt_foneCheckdate.Location = new System.Drawing.Point(909, 44); this.txt_foneCheckdate.Name = "txt_foneCheckdate"; this.txt_foneCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true; - this.txt_foneCheckdate.Size = new System.Drawing.Size(189, 28); + this.txt_foneCheckdate.Size = new System.Drawing.Size(185, 28); this.txt_foneCheckdate.StyleController = this.layoutMx1; this.txt_foneCheckdate.TabIndex = 267; this.txt_foneCheckdate.Tag = "readOnly"; // // txt_foneCheckor // - this.txt_foneCheckor.Location = new System.Drawing.Point(926, 12); + this.txt_foneCheckor.Location = new System.Drawing.Point(909, 12); this.txt_foneCheckor.Name = "txt_foneCheckor"; this.txt_foneCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true; - this.txt_foneCheckor.Size = new System.Drawing.Size(189, 28); + this.txt_foneCheckor.Size = new System.Drawing.Size(185, 28); this.txt_foneCheckor.StyleController = this.layoutMx1; this.txt_foneCheckor.TabIndex = 262; this.txt_foneCheckor.Tag = "readOnly"; // // txt_itemNo // - this.txt_itemNo.Location = new System.Drawing.Point(372, 44); + this.txt_itemNo.Location = new System.Drawing.Point(367, 44); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_itemNo.Properties.Appearance.Options.UseFont = true; - this.txt_itemNo.Size = new System.Drawing.Size(189, 28); + this.txt_itemNo.Size = new System.Drawing.Size(183, 28); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 370; this.txt_itemNo.Tag = "readOnly"; @@ -679,68 +680,68 @@ this.txt_memo.Name = "txt_memo"; this.txt_memo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_memo.Properties.Appearance.Options.UseFont = true; - this.txt_memo.Size = new System.Drawing.Size(188, 28); + this.txt_memo.Size = new System.Drawing.Size(183, 28); this.txt_memo.StyleController = this.layoutMx1; this.txt_memo.TabIndex = 219; // // txt_ftwoCheckor // - this.txt_ftwoCheckor.Location = new System.Drawing.Point(649, 12); + this.txt_ftwoCheckor.Location = new System.Drawing.Point(638, 12); this.txt_ftwoCheckor.Name = "txt_ftwoCheckor"; this.txt_ftwoCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true; - this.txt_ftwoCheckor.Size = new System.Drawing.Size(189, 28); + this.txt_ftwoCheckor.Size = new System.Drawing.Size(183, 28); this.txt_ftwoCheckor.StyleController = this.layoutMx1; this.txt_ftwoCheckor.TabIndex = 280; this.txt_ftwoCheckor.Tag = "readOnly"; // // txt_fversion // - this.txt_fversion.Location = new System.Drawing.Point(372, 12); + this.txt_fversion.Location = new System.Drawing.Point(367, 12); this.txt_fversion.Name = "txt_fversion"; this.txt_fversion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_fversion.Properties.Appearance.Options.UseFont = true; - this.txt_fversion.Size = new System.Drawing.Size(189, 28); + this.txt_fversion.Size = new System.Drawing.Size(183, 28); this.txt_fversion.StyleController = this.layoutMx1; this.txt_fversion.TabIndex = 298; this.txt_fversion.Tag = "readOnly"; // // txt_ftwoCheckdate // - this.txt_ftwoCheckdate.Location = new System.Drawing.Point(649, 44); + this.txt_ftwoCheckdate.Location = new System.Drawing.Point(638, 44); this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate"; this.txt_ftwoCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true; - this.txt_ftwoCheckdate.Size = new System.Drawing.Size(189, 28); + this.txt_ftwoCheckdate.Size = new System.Drawing.Size(183, 28); this.txt_ftwoCheckdate.StyleController = this.layoutMx1; this.txt_ftwoCheckdate.TabIndex = 285; this.txt_ftwoCheckdate.Tag = "readOnly"; // // txt_gg // - this.txt_gg.Location = new System.Drawing.Point(372, 76); + this.txt_gg.Location = new System.Drawing.Point(367, 76); this.txt_gg.Name = "txt_gg"; - this.txt_gg.Size = new System.Drawing.Size(189, 24); + this.txt_gg.Size = new System.Drawing.Size(183, 24); this.txt_gg.StyleController = this.layoutMx1; this.txt_gg.TabIndex = 384; this.txt_gg.Tag = "readOnly"; // // txt_ftwoChecked // - this.txt_ftwoChecked.Location = new System.Drawing.Point(565, 76); + this.txt_ftwoChecked.Location = new System.Drawing.Point(554, 76); this.txt_ftwoChecked.Name = "txt_ftwoChecked"; this.txt_ftwoChecked.Properties.Caption = "鎵瑰噯鏍囪瘑"; - this.txt_ftwoChecked.Size = new System.Drawing.Size(273, 24); + this.txt_ftwoChecked.Size = new System.Drawing.Size(267, 24); this.txt_ftwoChecked.StyleController = this.layoutMx1; this.txt_ftwoChecked.TabIndex = 385; this.txt_ftwoChecked.Tag = "readOnly"; // // txt_foneChecked // - this.txt_foneChecked.Location = new System.Drawing.Point(842, 76); + this.txt_foneChecked.Location = new System.Drawing.Point(825, 76); this.txt_foneChecked.Name = "txt_foneChecked"; this.txt_foneChecked.Properties.Caption = "瀹℃牳鏍囪瘑"; - this.txt_foneChecked.Size = new System.Drawing.Size(273, 24); + this.txt_foneChecked.Size = new System.Drawing.Size(269, 24); this.txt_foneChecked.StyleController = this.layoutMx1; this.txt_foneChecked.TabIndex = 386; this.txt_foneChecked.Tag = "readOnly"; @@ -776,30 +777,30 @@ this.layoutControlItem7}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; - columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition5.Width = 100D; - columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition6.Width = 100D; - columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition7.Width = 100D; - columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; - columnDefinition8.Width = 100D; + columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1.Width = 100D; + columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition2.Width = 100D; + columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition3.Width = 100D; + columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition4.Width = 100D; this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] { - columnDefinition5, - columnDefinition6, - columnDefinition7, - columnDefinition8}); - rowDefinition4.Height = 100D; - rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition5.Height = 100D; - rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; - rowDefinition6.Height = 100D; - rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; + columnDefinition1, + columnDefinition2, + columnDefinition3, + columnDefinition4}); + rowDefinition1.Height = 100D; + rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition2.Height = 100D; + rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent; + rowDefinition3.Height = 100D; + rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { - rowDefinition4, - rowDefinition5, - rowDefinition6}); - this.Root.Size = new System.Drawing.Size(1127, 116); + rowDefinition1, + rowDefinition2, + rowDefinition3}); + this.Root.Size = new System.Drawing.Size(1106, 116); this.Root.TextVisible = false; // // layoutControlItem1 @@ -807,17 +808,17 @@ this.layoutControlItem1.Control = this.txt_fSubsidiary; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem1.Size = new System.Drawing.Size(271, 32); this.layoutControlItem1.Text = "閫夋嫨缁勭粐"; this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_ftwoCheckor; - this.layoutControlItem3.Location = new System.Drawing.Point(553, 0); + this.layoutControlItem3.Location = new System.Drawing.Point(542, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; - this.layoutControlItem3.Size = new System.Drawing.Size(277, 32); + this.layoutControlItem3.Size = new System.Drawing.Size(271, 32); this.layoutControlItem3.Text = "鎵瑰噯浜�"; this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 18); // @@ -827,29 +828,29 @@ this.layoutControlItem4.Location = new System.Drawing.Point(0, 32); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem4.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem4.Size = new System.Drawing.Size(271, 32); this.layoutControlItem4.Text = "閫夋嫨鐗╂枡"; this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_ftwoCheckdate; - this.layoutControlItem6.Location = new System.Drawing.Point(553, 32); + this.layoutControlItem6.Location = new System.Drawing.Point(542, 32); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem6.Size = new System.Drawing.Size(277, 32); + this.layoutControlItem6.Size = new System.Drawing.Size(271, 32); this.layoutControlItem6.Text = "鎵瑰噯鏃ユ湡"; this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 18); // // layoutControlItem9 // this.layoutControlItem9.Control = this.txt_ftwoChecked; - this.layoutControlItem9.Location = new System.Drawing.Point(553, 64); + this.layoutControlItem9.Location = new System.Drawing.Point(542, 64); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem9.Size = new System.Drawing.Size(277, 32); + this.layoutControlItem9.Size = new System.Drawing.Size(271, 32); this.layoutControlItem9.Text = "鎵瑰噯鏍囪瘑"; this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem9.TextVisible = false; @@ -857,32 +858,32 @@ // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_foneCheckor; - this.layoutControlItem10.Location = new System.Drawing.Point(830, 0); + this.layoutControlItem10.Location = new System.Drawing.Point(813, 0); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem10.Size = new System.Drawing.Size(277, 32); + this.layoutControlItem10.Size = new System.Drawing.Size(273, 32); this.layoutControlItem10.Text = "瀹℃牳浜�"; this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_foneCheckdate; - this.layoutControlItem11.Location = new System.Drawing.Point(830, 32); + this.layoutControlItem11.Location = new System.Drawing.Point(813, 32); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem11.Size = new System.Drawing.Size(277, 32); + this.layoutControlItem11.Size = new System.Drawing.Size(273, 32); this.layoutControlItem11.Text = "瀹℃牳鏃堕棿"; this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_foneChecked; - this.layoutControlItem12.Location = new System.Drawing.Point(830, 64); + this.layoutControlItem12.Location = new System.Drawing.Point(813, 64); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem12.Size = new System.Drawing.Size(277, 32); + this.layoutControlItem12.Size = new System.Drawing.Size(273, 32); this.layoutControlItem12.Text = "瀹℃牳鏍囪瘑"; this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem12.TextVisible = false; @@ -893,39 +894,39 @@ this.layoutControlItem2.Location = new System.Drawing.Point(0, 64); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem2.Size = new System.Drawing.Size(276, 32); + this.layoutControlItem2.Size = new System.Drawing.Size(271, 32); this.layoutControlItem2.Text = "澶囨敞"; this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 18); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_fversion; - this.layoutControlItem5.Location = new System.Drawing.Point(276, 0); + this.layoutControlItem5.Location = new System.Drawing.Point(271, 0); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; - this.layoutControlItem5.Size = new System.Drawing.Size(277, 32); + this.layoutControlItem5.Size = new System.Drawing.Size(271, 32); this.layoutControlItem5.Text = "鐗堟湰(鑷姩)"; this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_gg; - this.layoutControlItem8.Location = new System.Drawing.Point(276, 64); + this.layoutControlItem8.Location = new System.Drawing.Point(271, 64); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem8.Size = new System.Drawing.Size(277, 32); + this.layoutControlItem8.Size = new System.Drawing.Size(271, 32); this.layoutControlItem8.Text = "鐗╂枡瑙勬牸"; this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_itemNo; - this.layoutControlItem7.Location = new System.Drawing.Point(276, 32); + this.layoutControlItem7.Location = new System.Drawing.Point(271, 32); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; - this.layoutControlItem7.Size = new System.Drawing.Size(277, 32); + this.layoutControlItem7.Size = new System.Drawing.Size(271, 32); this.layoutControlItem7.Text = "鐗╂枡缂栫爜"; this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 18); // @@ -984,6 +985,7 @@ this.gvMx1fupAllow, this.gvMx1fstand, this.gvMx1fdownAllow, + this.gridColumn19, this.gvMxDel}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; @@ -1236,6 +1238,17 @@ this.gvMx1fdownAllow.VisibleIndex = 11; this.gvMx1fdownAllow.Width = 60; // + // gridColumn19 + // + this.gridColumn19.Caption = "鏍峰搧鍩烘暟"; + this.gridColumn19.FieldName = "ypsl"; + this.gridColumn19.MinWidth = 25; + this.gridColumn19.Name = "gridColumn19"; + this.gridColumn19.Tag = "edit"; + this.gridColumn19.Visible = true; + this.gridColumn19.VisibleIndex = 12; + this.gridColumn19.Width = 94; + // // gvMxDel // this.gvMxDel.Caption = "绉婚櫎"; @@ -1243,16 +1256,16 @@ this.gvMxDel.MinWidth = 50; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 12; + this.gvMxDel.VisibleIndex = 13; this.gvMxDel.Width = 100; // // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; - editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); @@ -1374,10 +1387,10 @@ // repositoryItemButtonEdit3 // this.repositoryItemButtonEdit3.AutoHeight = false; - editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; - editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; + editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; + editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3"; this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick); @@ -1601,5 +1614,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs index 3592c02..dd8da99 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs @@ -25,6 +25,7 @@ InitializeComponent(); strType = _strType; + } protected override void OnCreateControl() { @@ -39,6 +40,10 @@ toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick; + decimal _dfValue = 1; + if (strType == "iqc") + _dfValue = 5; + this.gvMx1.InitNewRow += (s, e) => { this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", _dfValue); }; this.toolBarMenu1.getXmlConfig(); Form parentForm = this.FindForm(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); @@ -79,7 +84,6 @@ btnSave.Click += BtnSave_Click; } - private void GridView1_ColumnFilterChanged(object sender, EventArgs e) @@ -292,6 +296,11 @@ MsgHelper.ShowError("鎺ュ彈姘村钩涓嶈兘涓虹┖锛�"); return; } + if (string.IsNullOrEmpty(row["ypsl"].ToString())) + { + MsgHelper.ShowError("鏍峰搧鏁伴噺骞充笉鑳戒负绌猴紒"); + return; + } string _Fstand = row["Fstand"].ToString(); string _FupAllow = row["FupAllow"].ToString(); string _FdownAllow = row["FdownAllow"].ToString(); @@ -334,7 +343,7 @@ Memo = row["memo"].ToString(), FupAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FupAllow"].ToString()), FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()), - + ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()), }); } } @@ -375,7 +384,6 @@ { MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); } - } /// <summary> @@ -406,7 +414,8 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); + } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs index 7ca0633..544d461 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Models/MesQmCheckitemDt.cs @@ -220,7 +220,16 @@ /// <summary> /// ///</summary> - - public Guid? Pid { get; set; } + + + + /// <summary> + /// 鏍峰搧鏁伴噺 + /// </summary> + public decimal? ypsl { get; set; } + + + + public Guid? Pid { get; set; } } } diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs index a8e87da..da3621c 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs @@ -426,7 +426,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs index 966b5c5..668c1cb 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs @@ -161,7 +161,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs index f966757..fae9d0a 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs @@ -432,7 +432,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs index 20c93b3..271b9b6 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs @@ -159,7 +159,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs index 2f9fac9..cc423a6 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs @@ -493,7 +493,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs index fb68f24..3d3563d 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs @@ -159,7 +159,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs index 13166a6..07fa5b8 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs @@ -30,33 +30,24 @@ private void InitializeComponent() { this.gv_indepUserCode = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_stockOrgId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_ownerType = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_ownerId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_lineK3id = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_lineNo = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_iqcStatus = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_itemType = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_depotSectionsCode = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_depotsCode = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_depotSectionsId = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_depotsId = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.gcMain1 = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); this.pageBar1 = new UserControls.Data.UcPageBar(); @@ -71,85 +62,57 @@ // this.gv_indepUserCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_indepUserCode.AppearanceCell.Options.UseFont = true; - this.gv_indepUserCode.Caption = "鍏ュ簱浜虹紪鐮� "; + this.gv_indepUserCode.Caption = "鍏ュ簱浜�"; this.gv_indepUserCode.FieldName = "indepUserCode"; this.gv_indepUserCode.MinWidth = 50; this.gv_indepUserCode.Name = "gv_indepUserCode"; this.gv_indepUserCode.OptionsColumn.AllowEdit = false; this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE"; this.gv_indepUserCode.Visible = true; - this.gv_indepUserCode.VisibleIndex = 24; - this.gv_indepUserCode.Width = 94; - // - // gv_stockOrgId - // - this.gv_stockOrgId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_stockOrgId.AppearanceCell.Options.UseFont = true; - this.gv_stockOrgId.Caption = "搴撳瓨缁勭粐id "; - this.gv_stockOrgId.FieldName = "stockOrgId"; - this.gv_stockOrgId.MinWidth = 50; - this.gv_stockOrgId.Name = "gv_stockOrgId"; - this.gv_stockOrgId.OptionsColumn.AllowEdit = false; - this.gv_stockOrgId.Tag = "query_a.Stock_Org_Id"; - this.gv_stockOrgId.Visible = true; - this.gv_stockOrgId.VisibleIndex = 23; - this.gv_stockOrgId.Width = 94; + this.gv_indepUserCode.VisibleIndex = 13; + this.gv_indepUserCode.Width = 73; // // gv_ownerType // this.gv_ownerType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_ownerType.AppearanceCell.Options.UseFont = true; - this.gv_ownerType.Caption = "璐т富绫诲瀷(BD_OwnerOrg 缁勭粐,BD_Supplier 渚涘簲鍟�,BD_Customer 瀹㈡埛) "; + this.gv_ownerType.Caption = "璐т富绫诲瀷"; this.gv_ownerType.FieldName = "ownerType"; this.gv_ownerType.MinWidth = 50; this.gv_ownerType.Name = "gv_ownerType"; this.gv_ownerType.OptionsColumn.AllowEdit = false; this.gv_ownerType.Tag = "query_a.Owner_Type"; this.gv_ownerType.Visible = true; - this.gv_ownerType.VisibleIndex = 22; - this.gv_ownerType.Width = 94; + this.gv_ownerType.VisibleIndex = 10; + this.gv_ownerType.Width = 73; // // gv_ownerId // this.gv_ownerId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_ownerId.AppearanceCell.Options.UseFont = true; - this.gv_ownerId.Caption = "璐т富id "; + this.gv_ownerId.Caption = "璐т富ID"; this.gv_ownerId.FieldName = "ownerId"; this.gv_ownerId.MinWidth = 50; this.gv_ownerId.Name = "gv_ownerId"; this.gv_ownerId.OptionsColumn.AllowEdit = false; this.gv_ownerId.Tag = "query_a.Owner_Id"; this.gv_ownerId.Visible = true; - this.gv_ownerId.VisibleIndex = 21; - this.gv_ownerId.Width = 94; + this.gv_ownerId.VisibleIndex = 11; + this.gv_ownerId.Width = 73; // // gv_depotId // this.gv_depotId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_depotId.AppearanceCell.Options.UseFont = true; - this.gv_depotId.Caption = "浠撳簱ID "; + this.gv_depotId.Caption = "浠撳簱ID"; this.gv_depotId.FieldName = "depotId"; this.gv_depotId.MinWidth = 50; this.gv_depotId.Name = "gv_depotId"; this.gv_depotId.OptionsColumn.AllowEdit = false; this.gv_depotId.Tag = "query_a.DEPOT_ID"; this.gv_depotId.Visible = true; - this.gv_depotId.VisibleIndex = 20; - this.gv_depotId.Width = 94; - // - // gv_suppId - // - this.gv_suppId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_suppId.AppearanceCell.Options.UseFont = true; - this.gv_suppId.Caption = "渚涘簲鍟唅d "; - this.gv_suppId.FieldName = "suppId"; - this.gv_suppId.MinWidth = 50; - this.gv_suppId.Name = "gv_suppId"; - this.gv_suppId.OptionsColumn.AllowEdit = false; - this.gv_suppId.Tag = "query_a.SUPP_ID"; - this.gv_suppId.Visible = true; - this.gv_suppId.VisibleIndex = 19; - this.gv_suppId.Width = 94; + this.gv_depotId.VisibleIndex = 6; + this.gv_depotId.Width = 73; // // gv_itemId // @@ -162,92 +125,8 @@ this.gv_itemId.OptionsColumn.AllowEdit = false; this.gv_itemId.Tag = "query_a.ITEM_ID"; this.gv_itemId.Visible = true; - this.gv_itemId.VisibleIndex = 18; - this.gv_itemId.Width = 94; - // - // gv_lineK3id - // - this.gv_lineK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_lineK3id.AppearanceCell.Options.UseFont = true; - this.gv_lineK3id.Caption = "琛孠3ID "; - this.gv_lineK3id.FieldName = "lineK3id"; - this.gv_lineK3id.MinWidth = 50; - this.gv_lineK3id.Name = "gv_lineK3id"; - this.gv_lineK3id.OptionsColumn.AllowEdit = false; - this.gv_lineK3id.Tag = "query_a.LINE_K3ID"; - this.gv_lineK3id.Visible = true; - this.gv_lineK3id.VisibleIndex = 17; - this.gv_lineK3id.Width = 94; - // - // gv_ebelnK3id - // - this.gv_ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true; - this.gv_ebelnK3id.Caption = "K3ID "; - this.gv_ebelnK3id.FieldName = "ebelnK3id"; - this.gv_ebelnK3id.MinWidth = 50; - this.gv_ebelnK3id.Name = "gv_ebelnK3id"; - this.gv_ebelnK3id.OptionsColumn.AllowEdit = false; - this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID"; - this.gv_ebelnK3id.Visible = true; - this.gv_ebelnK3id.VisibleIndex = 16; - this.gv_ebelnK3id.Width = 94; - // - // gv_billNo - // - this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_billNo.AppearanceCell.Options.UseFont = true; - this.gv_billNo.Caption = "鍗曟嵁缂栧彿 "; - this.gv_billNo.FieldName = "billNo"; - this.gv_billNo.MinWidth = 50; - this.gv_billNo.Name = "gv_billNo"; - this.gv_billNo.OptionsColumn.AllowEdit = false; - this.gv_billNo.Tag = "query_a.BILL_NO"; - this.gv_billNo.Visible = true; - this.gv_billNo.VisibleIndex = 15; - this.gv_billNo.Width = 94; - // - // gv_lineNo - // - this.gv_lineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_lineNo.AppearanceCell.Options.UseFont = true; - this.gv_lineNo.Caption = "琛屽彿 "; - this.gv_lineNo.FieldName = "lineNo"; - this.gv_lineNo.MinWidth = 50; - this.gv_lineNo.Name = "gv_lineNo"; - this.gv_lineNo.OptionsColumn.AllowEdit = false; - this.gv_lineNo.Tag = "query_a.LINE_NO"; - this.gv_lineNo.Visible = true; - this.gv_lineNo.VisibleIndex = 14; - this.gv_lineNo.Width = 94; - // - // gv_suppNo - // - this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_suppNo.AppearanceCell.Options.UseFont = true; - this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮� "; - this.gv_suppNo.FieldName = "suppNo"; - this.gv_suppNo.MinWidth = 50; - this.gv_suppNo.Name = "gv_suppNo"; - this.gv_suppNo.OptionsColumn.AllowEdit = false; - this.gv_suppNo.Tag = "query_a.SUPP_NO"; - this.gv_suppNo.Visible = true; - this.gv_suppNo.VisibleIndex = 13; - this.gv_suppNo.Width = 94; - // - // gv_iqcStatus - // - this.gv_iqcStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_iqcStatus.AppearanceCell.Options.UseFont = true; - this.gv_iqcStatus.Caption = "璐ㄩ噺鐘舵�� "; - this.gv_iqcStatus.FieldName = "iqcStatus"; - this.gv_iqcStatus.MinWidth = 50; - this.gv_iqcStatus.Name = "gv_iqcStatus"; - this.gv_iqcStatus.OptionsColumn.AllowEdit = false; - this.gv_iqcStatus.Tag = "query_a.IQC_STATUS"; - this.gv_iqcStatus.Visible = true; - this.gv_iqcStatus.VisibleIndex = 12; - this.gv_iqcStatus.Width = 94; + this.gv_itemId.VisibleIndex = 0; + this.gv_itemId.Width = 73; // // gv_indepDate // @@ -255,69 +134,27 @@ this.gv_indepDate.AppearanceCell.Options.UseFont = true; this.gv_indepDate.Caption = "鍏ュ簱鏃ユ湡 "; this.gv_indepDate.FieldName = "indepDate"; - this.gv_indepDate.MinWidth = 50; + this.gv_indepDate.MinWidth = 10; this.gv_indepDate.Name = "gv_indepDate"; this.gv_indepDate.OptionsColumn.AllowEdit = false; this.gv_indepDate.Tag = "query_a.INDEP_DATE"; this.gv_indepDate.Visible = true; - this.gv_indepDate.VisibleIndex = 11; - this.gv_indepDate.Width = 94; - // - // gv_itemType - // - this.gv_itemType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_itemType.AppearanceCell.Options.UseFont = true; - this.gv_itemType.Caption = "0 鐗╂枡 1 鍗婃垚鍝� 2 鎴愬搧 "; - this.gv_itemType.FieldName = "itemType"; - this.gv_itemType.MinWidth = 50; - this.gv_itemType.Name = "gv_itemType"; - this.gv_itemType.OptionsColumn.AllowEdit = false; - this.gv_itemType.Tag = "query_a.ITEM_TYPE"; - this.gv_itemType.Visible = true; - this.gv_itemType.VisibleIndex = 10; - this.gv_itemType.Width = 94; - // - // gv_checkDate - // - this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_checkDate.AppearanceCell.Options.UseFont = true; - this.gv_checkDate.Caption = "妫�楠屾棩鏈� "; - this.gv_checkDate.FieldName = "checkDate"; - this.gv_checkDate.MinWidth = 50; - this.gv_checkDate.Name = "gv_checkDate"; - this.gv_checkDate.OptionsColumn.AllowEdit = false; - this.gv_checkDate.Tag = "query_a.CHECK_DATE"; - this.gv_checkDate.Visible = true; - this.gv_checkDate.VisibleIndex = 9; - this.gv_checkDate.Width = 94; + this.gv_indepDate.VisibleIndex = 14; + this.gv_indepDate.Width = 10; // // gv_depotSectionsCode // this.gv_depotSectionsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true; - this.gv_depotSectionsCode.Caption = "璐т綅CODE "; + this.gv_depotSectionsCode.Caption = "璐т綅缂栧彿"; this.gv_depotSectionsCode.FieldName = "depotSectionsCode"; this.gv_depotSectionsCode.MinWidth = 50; this.gv_depotSectionsCode.Name = "gv_depotSectionsCode"; this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false; this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE"; this.gv_depotSectionsCode.Visible = true; - this.gv_depotSectionsCode.VisibleIndex = 8; - this.gv_depotSectionsCode.Width = 94; - // - // gv_depotsCode - // - this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_depotsCode.AppearanceCell.Options.UseFont = true; - this.gv_depotsCode.Caption = "瀛愬簱CODE "; - this.gv_depotsCode.FieldName = "depotsCode"; - this.gv_depotsCode.MinWidth = 50; - this.gv_depotsCode.Name = "gv_depotsCode"; - this.gv_depotsCode.OptionsColumn.AllowEdit = false; - this.gv_depotsCode.Tag = "query_a.DEPOTS_CODE"; - this.gv_depotsCode.Visible = true; - this.gv_depotsCode.VisibleIndex = 7; - this.gv_depotsCode.Width = 94; + this.gv_depotSectionsCode.VisibleIndex = 9; + this.gv_depotSectionsCode.Width = 73; // // gv_quantity // @@ -330,64 +167,8 @@ this.gv_quantity.OptionsColumn.AllowEdit = false; this.gv_quantity.Tag = "query_a.QUANTITY"; this.gv_quantity.Visible = true; - this.gv_quantity.VisibleIndex = 6; - this.gv_quantity.Width = 94; - // - // gv_lotNo - // - this.gv_lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_lotNo.AppearanceCell.Options.UseFont = true; - this.gv_lotNo.Caption = "鍘傚鎵规 "; - this.gv_lotNo.FieldName = "lotNo"; - this.gv_lotNo.MinWidth = 50; - this.gv_lotNo.Name = "gv_lotNo"; - this.gv_lotNo.OptionsColumn.AllowEdit = false; - this.gv_lotNo.Tag = "query_a.LOT_NO"; - this.gv_lotNo.Visible = true; - this.gv_lotNo.VisibleIndex = 5; - this.gv_lotNo.Width = 94; - // - // gv_depotSectionsId - // - this.gv_depotSectionsId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_depotSectionsId.AppearanceCell.Options.UseFont = true; - this.gv_depotSectionsId.Caption = "璐т綅id "; - this.gv_depotSectionsId.FieldName = "depotSectionsId"; - this.gv_depotSectionsId.MinWidth = 50; - this.gv_depotSectionsId.Name = "gv_depotSectionsId"; - this.gv_depotSectionsId.OptionsColumn.AllowEdit = false; - this.gv_depotSectionsId.Tag = "query_a.DEPOT_SECTIONS_ID"; - this.gv_depotSectionsId.Visible = true; - this.gv_depotSectionsId.VisibleIndex = 4; - this.gv_depotSectionsId.Width = 94; - // - // gv_depotsId - // - this.gv_depotsId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_depotsId.AppearanceCell.Options.UseFont = true; - this.gv_depotsId.Caption = "瀛愬簱id(涓�鑸笉瀛樻暟鎹�) "; - this.gv_depotsId.FieldName = "depotsId"; - this.gv_depotsId.MinWidth = 50; - this.gv_depotsId.Name = "gv_depotsId"; - this.gv_depotsId.OptionsColumn.AllowEdit = false; - this.gv_depotsId.Tag = "query_a.DEPOTS_ID"; - this.gv_depotsId.Visible = true; - this.gv_depotsId.VisibleIndex = 3; - this.gv_depotsId.Width = 94; - // - // gv_itemNo - // - this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); - this.gv_itemNo.AppearanceCell.Options.UseFont = true; - this.gv_itemNo.Caption = "鐗╂枡缂栫爜"; - this.gv_itemNo.FieldName = "itemNo"; - this.gv_itemNo.MinWidth = 50; - this.gv_itemNo.Name = "gv_itemNo"; - this.gv_itemNo.OptionsColumn.AllowEdit = false; - this.gv_itemNo.Tag = "query_a.ITEM_NO"; - this.gv_itemNo.Visible = true; - this.gv_itemNo.VisibleIndex = 2; - this.gv_itemNo.Width = 94; + this.gv_quantity.VisibleIndex = 5; + this.gv_quantity.Width = 73; // // gv_itemBarcode // @@ -400,8 +181,8 @@ this.gv_itemBarcode.OptionsColumn.AllowEdit = false; this.gv_itemBarcode.Tag = "query_a.ITEM_BARCODE"; this.gv_itemBarcode.Visible = true; - this.gv_itemBarcode.VisibleIndex = 1; - this.gv_itemBarcode.Width = 94; + this.gv_itemBarcode.VisibleIndex = 4; + this.gv_itemBarcode.Width = 73; // // gv_guid // @@ -413,8 +194,6 @@ this.gv_guid.Name = "gv_guid"; this.gv_guid.OptionsColumn.AllowEdit = false; this.gv_guid.Tag = "query_a.guid"; - this.gv_guid.Visible = true; - this.gv_guid.VisibleIndex = 0; this.gv_guid.Width = 94; // // toolBarMenu1 @@ -451,36 +230,87 @@ this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gv_guid, - this.gv_itemBarcode, - this.gv_itemNo, - this.gv_depotsId, - this.gv_depotSectionsId, - this.gv_lotNo, - this.gv_quantity, - this.gv_depotsCode, - this.gv_depotSectionsCode, - this.gv_checkDate, - this.gv_itemType, - this.gv_indepDate, - this.gv_iqcStatus, - this.gv_suppNo, - this.gv_lineNo, - this.gv_billNo, - this.gv_ebelnK3id, - this.gv_lineK3id, this.gv_itemId, - this.gv_suppId, + this.gridColumn3, + this.gridColumn2, + this.gridColumn4, + this.gv_itemBarcode, + this.gv_quantity, this.gv_depotId, - this.gv_ownerId, + this.gridColumn6, + this.gridColumn1, + this.gv_depotSectionsCode, this.gv_ownerType, - this.gv_stockOrgId, - this.gv_indepUserCode}); + this.gv_ownerId, + this.gridColumn5, + this.gv_indepUserCode, + this.gv_indepDate}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; this.gridView1.OptionsFind.ShowSearchNavButtons = false; this.gridView1.OptionsView.ShowAutoFilterRow = true; this.gridView1.OptionsView.ShowGroupPanel = false; + // + // gridColumn3 + // + this.gridColumn3.Caption = "鐗╂枡缂栫爜"; + this.gridColumn3.FieldName = "itemNo"; + this.gridColumn3.MinWidth = 25; + this.gridColumn3.Name = "gridColumn3"; + this.gridColumn3.Visible = true; + this.gridColumn3.VisibleIndex = 1; + this.gridColumn3.Width = 73; + // + // gridColumn2 + // + this.gridColumn2.Caption = "鐗╂枡鍚嶇О"; + this.gridColumn2.FieldName = "itemName"; + this.gridColumn2.MinWidth = 25; + this.gridColumn2.Name = "gridColumn2"; + this.gridColumn2.Visible = true; + this.gridColumn2.VisibleIndex = 2; + this.gridColumn2.Width = 73; + // + // gridColumn4 + // + this.gridColumn4.Caption = "瑙勬牸鍨嬪彿"; + this.gridColumn4.FieldName = "itemModel"; + this.gridColumn4.MinWidth = 25; + this.gridColumn4.Name = "gridColumn4"; + this.gridColumn4.Visible = true; + this.gridColumn4.VisibleIndex = 3; + this.gridColumn4.Width = 73; + // + // gridColumn6 + // + this.gridColumn6.Caption = "浠撳簱缂栧彿"; + this.gridColumn6.FieldName = "depotNo"; + this.gridColumn6.MinWidth = 25; + this.gridColumn6.Name = "gridColumn6"; + this.gridColumn6.Visible = true; + this.gridColumn6.VisibleIndex = 7; + this.gridColumn6.Width = 73; + // + // gridColumn1 + // + this.gridColumn1.Caption = "浠撳簱鍚嶇О"; + this.gridColumn1.FieldName = "depotName"; + this.gridColumn1.MinWidth = 25; + this.gridColumn1.Name = "gridColumn1"; + this.gridColumn1.Visible = true; + this.gridColumn1.VisibleIndex = 8; + this.gridColumn1.Width = 73; + // + // gridColumn5 + // + this.gridColumn5.Caption = "璐т富鍚嶇О"; + this.gridColumn5.FieldName = "ownerName"; + this.gridColumn5.MinWidth = 25; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 12; + this.gridColumn5.Width = 73; // // xtraTabControl1 // @@ -539,30 +369,20 @@ private DevExpress.XtraTab.XtraTabPage xtraTabPage1; private UserControls.Data.UcPageBar pageBar1; private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode; - private DevExpress.XtraGrid.Columns.GridColumn gv_stockOrgId; private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType; private DevExpress.XtraGrid.Columns.GridColumn gv_ownerId; private DevExpress.XtraGrid.Columns.GridColumn gv_depotId; - private DevExpress.XtraGrid.Columns.GridColumn gv_suppId; private DevExpress.XtraGrid.Columns.GridColumn gv_itemId; - private DevExpress.XtraGrid.Columns.GridColumn gv_lineK3id; - private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id; - private DevExpress.XtraGrid.Columns.GridColumn gv_billNo; - private DevExpress.XtraGrid.Columns.GridColumn gv_lineNo; - private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo; - private DevExpress.XtraGrid.Columns.GridColumn gv_iqcStatus; private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate; - private DevExpress.XtraGrid.Columns.GridColumn gv_itemType; - private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate; private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsCode; - private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode; private DevExpress.XtraGrid.Columns.GridColumn gv_quantity; - private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo; - private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsId; - private DevExpress.XtraGrid.Columns.GridColumn gv_depotsId; - private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo; private DevExpress.XtraGrid.Columns.GridColumn gv_itemBarcode; private DevExpress.XtraGrid.Columns.GridColumn gv_guid; - + private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs index c073715..d41d17e 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs @@ -107,7 +107,8 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); + } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs index 4358911..d05238b 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs @@ -356,7 +356,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs index 47ea52b..f729395 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.cs @@ -172,7 +172,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs index fbe66f6..aa882f4 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesOrder.cs @@ -123,7 +123,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs index 986e82c..bf9eeb1 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs @@ -414,7 +414,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs index 92d86b0..b82fa9b 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs @@ -159,7 +159,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs index 4aeb84a..9eea23a 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs @@ -294,7 +294,7 @@ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉 pageBar1.CurrentPage = curPage;//褰撳墠椤� pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟 - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs index 131a92c..4e54b64 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs @@ -226,7 +226,7 @@ pageBar1.TotalPages = dddd; pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟 pageBar1.CurrentPage = curPage;//褰撳墠椤� - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else { diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs index 6388018..6581c51 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs @@ -265,7 +265,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs index abd2e7e..457dfe1 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs @@ -65,7 +65,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs index 48879fa..820faf3 100644 --- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs +++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs @@ -123,7 +123,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs index b9c85da..a613921 100644 --- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs +++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs @@ -268,7 +268,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs index a761da1..db25c0f 100644 --- a/DevApp/Gs.DevApp/DevFrm/User/User.cs +++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs @@ -279,7 +279,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs index d466a6c..2688220 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs @@ -161,7 +161,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs index a6f445c..0af0fae 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs @@ -140,7 +140,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs index ea75cda..c630216 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs @@ -125,7 +125,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs index 9e4ed9a..8e42dfa 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs @@ -283,7 +283,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs index 2ae5682..9081815 100644 --- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs +++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs @@ -428,7 +428,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs index 9e75f06..a00261d 100644 --- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs +++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs @@ -124,7 +124,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs index aeadb12..f85e65a 100644 --- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs +++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs @@ -238,7 +238,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs index 2803143..c06051c 100644 --- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs @@ -174,7 +174,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs index a921dd7..0ca244f 100644 --- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs +++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs @@ -350,7 +350,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs index e081862..bc5dcf7 100644 --- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs +++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs @@ -423,7 +423,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs index 84694c1..a38ba2c 100644 --- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.cs @@ -172,7 +172,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs index c8a28a1..a76fee4 100644 --- a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs +++ b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwTbl.cs @@ -87,7 +87,7 @@ gcMain.BindingContext = new BindingContext(); gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); var dddd = dd.rtnData.pages; //鎬婚〉 pageBar1.TotalPages = dddd; pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟 diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs index c7779fa..298ec70 100644 --- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs +++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs @@ -386,7 +386,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs index 3fe77e9..00a42d0 100644 --- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs @@ -183,7 +183,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs index edd3337..ef89e66 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs @@ -178,7 +178,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs index eba844b..3f30f06 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs @@ -169,7 +169,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs index ad22a49..b99446d 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs @@ -408,7 +408,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs index 232f9de..789cd5a 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.cs @@ -160,7 +160,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs index 9a26e53..842d454 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs @@ -129,7 +129,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs index a37c77a..66f7907 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.cs @@ -429,7 +429,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs index 289d2d1..487e5d2 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs @@ -174,7 +174,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs index 79191ab..c2b3d8e 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs @@ -397,7 +397,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs index 584b918..3a57524 100644 --- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs +++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuoDj.cs @@ -159,7 +159,7 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs index 60e3a1c..b4761e5 100644 --- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs +++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs @@ -415,7 +415,8 @@ } else txt.ReadOnly = isEdt; - if (txt != null) { + if (txt != null) + { switch (strVal) { case "True": @@ -432,7 +433,7 @@ break; } } - + continue; } //鍗曢�� @@ -1606,7 +1607,7 @@ GridView dgv = s as GridView; if (dgv != null) { - if (dgv.GetSelectedRows() != null && dgv.GetSelectedRows().Count()>0) + if (dgv.GetSelectedRows() != null && dgv.GetSelectedRows().Count() > 0) { var selectedRow = dgv.GetSelectedRows()[0]; // 鑾峰彇绗竴涓�変腑琛岀殑绱㈠紩 if (selectedRow >= 0) @@ -1768,7 +1769,7 @@ { column.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near; column.OptionsColumn.AllowEdit = true; - column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains; + // column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains; column.OptionsFilter.AutoFilterCondition = DevExpress.XtraGrid.Columns.AutoFilterCondition.Contains; column.OptionsFilter.ImmediateUpdateAutoFilter = false; if (column.Tag == null || column.Tag.ToString().EndsWith("edit")) @@ -1777,6 +1778,7 @@ column.OptionsColumn.ReadOnly = true; if (column.Tag == null || column.Tag.ToString().Length <= 0) column.OptionsFilter.AllowAutoFilter = false; + } gridView1.OptionsFilter.AllowAutoFilterConditionChange = DevExpress.Utils.DefaultBoolean.False; gridView1.OptionsView.ShowAutoFilterRow = true; @@ -1874,6 +1876,14 @@ edit.SelectAll(); } + public static void SetGridLayout(GridView gridView1) + { + foreach (GridColumn column in gridView1.Columns) + { + if (column.Width > 500) + column.Width = 500; + } + } public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null) { xtraTabControl1.SelectedPageChanged += (s, e) => @@ -2064,7 +2074,7 @@ column.Visible = bool.Parse(controlVisible); } } - + } } } diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs index 674d107..b46560c 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs @@ -98,7 +98,7 @@ gcMain.BindingContext = new BindingContext(); gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); var dddd = dd.rtnData.pages; //鎬婚〉 pageBar1.TotalPages = dddd; pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟 diff --git a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs b/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs index 7859650..ad6e8ca 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs @@ -89,7 +89,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.cs index 1d1fb17..feb746a 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectCk.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectCk.cs @@ -71,7 +71,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/UserControl/SelectCw.cs b/DevApp/Gs.DevApp/UserControl/SelectCw.cs index d1a369e..cccbe0e 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectCw.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectCw.cs @@ -75,7 +75,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else { diff --git a/DevApp/Gs.DevApp/UserControl/SelectHz.cs b/DevApp/Gs.DevApp/UserControl/SelectHz.cs index fcd0fa5..7b03888 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectHz.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectHz.cs @@ -70,7 +70,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); @@ -157,7 +157,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); @@ -197,7 +197,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs b/DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs index 1b1dab5..7518f64 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectItemTbl.cs @@ -84,7 +84,7 @@ gcMain.BindingContext = new BindingContext(); gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); var dddd = dd.rtnData.pages; //鎬婚〉 pageBar1.TotalPages = dddd; pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟 diff --git a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs index 2498aa3..c8c5f3a 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.cs @@ -101,7 +101,7 @@ gcMain.BindingContext = new BindingContext(); gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); var dddd = dd.rtnData.pages; //鎬婚〉 pageBar1.TotalPages = dddd; pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟 diff --git a/DevApp/Gs.DevApp/UserControl/SelectOrg.cs b/DevApp/Gs.DevApp/UserControl/SelectOrg.cs index dffe27a..b4ea7dc 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectOrg.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectOrg.cs @@ -63,7 +63,7 @@ { gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain, gridView1); diff --git a/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.cs b/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.cs index 4280c61..3989857 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectShuoTuiSq.cs @@ -105,7 +105,7 @@ gcMain.BindingContext = new BindingContext(); gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); var dddd = dd.rtnData.pages; //鎬婚〉 pageBar1.TotalPages = dddd; pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟 diff --git a/DevApp/Gs.DevApp/UserControl/SelectWompba.cs b/DevApp/Gs.DevApp/UserControl/SelectWompba.cs index 58684c1..cc8c5c7 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectWompba.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectWompba.cs @@ -81,7 +81,7 @@ gcMain.BindingContext = new BindingContext(); gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); var dddd = dd.rtnData.pages; //鎬婚〉 pageBar1.TotalPages = dddd; pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟 diff --git a/DevApp/Gs.DevApp/UserControl/SelectWwPc.cs b/DevApp/Gs.DevApp/UserControl/SelectWwPc.cs index 140e41f..aa6f7b4 100644 --- a/DevApp/Gs.DevApp/UserControl/SelectWwPc.cs +++ b/DevApp/Gs.DevApp/UserControl/SelectWwPc.cs @@ -87,7 +87,7 @@ gcMain.BindingContext = new BindingContext(); gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); var dddd = dd.rtnData.pages; //鎬婚〉 pageBar1.TotalPages = dddd; pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟 diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs index 714348b..144a47a 100644 --- a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs +++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs @@ -64,7 +64,7 @@ gcMain.BindingContext = new BindingContext(); gcMain.DataSource = dt; gcMain.ForceInitialize(); - gridView1.BestFitColumns(); + gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); int dddd = dd.rtnData.pages;//鎬婚〉 pageBar1.TotalPages = dddd; pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟 -- Gitblit v1.9.3