dev前台代码
上一版本: 550cb684 | 补丁 | 提交 | 忽略空白
bug
lu
4 天以前 b23c90642c7504631343aec8ddc4319275cc4212 
bug
已修改2个文件
159 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs 148 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs


@@ -31,27 +31,27 @@


        {


            this.components = new System.ComponentModel.Container();


            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemQt));


            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.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition7 = 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();


            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 rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();


            DevExpress.XtraLayout.RowDefinition rowDefinition14 = 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();


            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();


            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();


            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();


@@ -381,8 +381,6 @@


            this.gridColumn3.FieldName = "qt019";


            this.gridColumn3.MinWidth = 25;


            this.gridColumn3.Name = "gridColumn3";


            this.gridColumn3.Visible = true;


            this.gridColumn3.VisibleIndex = 5;


            this.gridColumn3.Width = 94;


            // 


            // gv_qt020


@@ -395,7 +393,7 @@


            this.gv_qt020.OptionsColumn.AllowEdit = false;


            this.gv_qt020.Tag = "query_a.qt020";


            this.gv_qt020.Visible = true;


            this.gv_qt020.VisibleIndex = 6;


            this.gv_qt020.VisibleIndex = 5;


            this.gv_qt020.Width = 94;


            // 


            // gridColumn4


@@ -405,7 +403,7 @@


            this.gridColumn4.MinWidth = 25;


            this.gridColumn4.Name = "gridColumn4";


            this.gridColumn4.Visible = true;


            this.gridColumn4.VisibleIndex = 12;


            this.gridColumn4.VisibleIndex = 11;


            this.gridColumn4.Width = 94;


            // 


            // gv_qt005


@@ -418,7 +416,7 @@


            this.gv_qt005.OptionsColumn.AllowEdit = false;


            this.gv_qt005.Tag = "query_a.qt005";


            this.gv_qt005.Visible = true;


            this.gv_qt005.VisibleIndex = 7;


            this.gv_qt005.VisibleIndex = 6;


            this.gv_qt005.Width = 94;


            // 


            // gv_qt001


@@ -431,7 +429,7 @@


            this.gv_qt001.OptionsColumn.AllowEdit = false;


            this.gv_qt001.Tag = "query_a.qt001";


            this.gv_qt001.Visible = true;


            this.gv_qt001.VisibleIndex = 8;


            this.gv_qt001.VisibleIndex = 7;


            this.gv_qt001.Width = 180;


            // 


            // gv_qt010


@@ -444,7 +442,7 @@


            this.gv_qt010.OptionsColumn.AllowEdit = false;


            this.gv_qt010.Tag = "query_a.qt010";


            this.gv_qt010.Visible = true;


            this.gv_qt010.VisibleIndex = 9;


            this.gv_qt010.VisibleIndex = 8;


            this.gv_qt010.Width = 94;


            // 


            // gv_qt016


@@ -457,7 +455,7 @@


            this.gv_qt016.OptionsColumn.AllowEdit = false;


            this.gv_qt016.Tag = "query_a.qt016";


            this.gv_qt016.Visible = true;


            this.gv_qt016.VisibleIndex = 10;


            this.gv_qt016.VisibleIndex = 9;


            this.gv_qt016.Width = 94;


            // 


            // gv_qt002


@@ -470,7 +468,7 @@


            this.gv_qt002.OptionsColumn.AllowEdit = false;


            this.gv_qt002.Tag = "query_a.qt002";


            this.gv_qt002.Visible = true;


            this.gv_qt002.VisibleIndex = 11;


            this.gv_qt002.VisibleIndex = 10;


            this.gv_qt002.Width = 94;


            // 


            // gridColumn5


@@ -480,7 +478,7 @@


            this.gridColumn5.MinWidth = 25;


            this.gridColumn5.Name = "gridColumn5";


            this.gridColumn5.Visible = true;


            this.gridColumn5.VisibleIndex = 13;


            this.gridColumn5.VisibleIndex = 12;


            this.gridColumn5.Width = 94;


            // 


            // gridColumn6


@@ -490,7 +488,7 @@


            this.gridColumn6.MinWidth = 25;


            this.gridColumn6.Name = "gridColumn6";


            this.gridColumn6.Visible = true;


            this.gridColumn6.VisibleIndex = 14;


            this.gridColumn6.VisibleIndex = 13;


            this.gridColumn6.Width = 94;


            // 


            // gridColumn13


@@ -908,41 +906,41 @@


            this.layoutControlItem25});


            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;


            this.Root.Name = "Root";


            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;


            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;


            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {


            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;


            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;


            rowDefinition7.Height = 100D;


            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;


            columnDefinition5,


            columnDefinition6,


            columnDefinition7,


            columnDefinition8});


            rowDefinition8.Height = 100D;


            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition9.Height = 100D;


            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition10.Height = 100D;


            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition11.Height = 100D;


            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition12.Height = 100D;


            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition13.Height = 100D;


            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;


            rowDefinition14.Height = 100D;


            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;


            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {


            rowDefinition1,


            rowDefinition2,


            rowDefinition3,


            rowDefinition4,


            rowDefinition5,


            rowDefinition6,


            rowDefinition7});


            rowDefinition8,


            rowDefinition9,


            rowDefinition10,


            rowDefinition11,


            rowDefinition12,


            rowDefinition13,


            rowDefinition14});


            this.Root.Size = new System.Drawing.Size(1105, 237);


            this.Root.TextVisible = false;


            // 


@@ -1359,9 +1357,9 @@


            // 


            // gridColumn19


            // 


            this.gridColumn19.AppearanceCell.ForeColor = System.Drawing.Color.DarkGreen;


            this.gridColumn19.AppearanceCell.ForeColor = System.Drawing.Color.Red;


            this.gridColumn19.AppearanceCell.Options.UseForeColor = true;


            this.gridColumn19.AppearanceHeader.ForeColor = System.Drawing.Color.DarkGreen;


            this.gridColumn19.AppearanceHeader.ForeColor = System.Drawing.Color.Red;


            this.gridColumn19.AppearanceHeader.Options.UseForeColor = true;


            this.gridColumn19.Caption = "Mes/Erp库存";


            this.gridColumn19.FieldName = "kcQty";


@@ -1505,10 +1503,10 @@


            // repositoryItemButtonEdit1


            // 


            this.repositoryItemButtonEdit1.AutoHeight = false;


            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;


            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;


            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;


            editorButtonImageOptions3.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});


            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)});


            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";


            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;


            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);


@@ -1539,10 +1537,10 @@


            // rptCk


            // 


            this.rptCk.AutoHeight = false;


            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;


            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;


            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;


            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;


            this.rptCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            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)});


            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)});


            this.rptCk.Name = "rptCk";


            this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);


            // 


@@ -1556,9 +1554,9 @@


            // 


            // gridColumn18


            // 


            this.gridColumn18.AppearanceCell.ForeColor = System.Drawing.Color.DarkGreen;


            this.gridColumn18.AppearanceCell.ForeColor = System.Drawing.Color.Red;


            this.gridColumn18.AppearanceCell.Options.UseForeColor = true;


            this.gridColumn18.AppearanceHeader.ForeColor = System.Drawing.Color.DarkGreen;


            this.gridColumn18.AppearanceHeader.ForeColor = System.Drawing.Color.Red;


            this.gridColumn18.AppearanceHeader.Options.UseForeColor = true;


            this.gridColumn18.Caption = "Mes/Erp及时库存";


            this.gridColumn18.FieldName = "kcQty";




 DevApp/Gs.DevApp/DevFrm/Rpt/CkKuCun.cs


@@ -27,7 +27,7 @@


            this.toolBarMenu1.getXmlConfig();


            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>


            {


                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);


               // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);


            });


            //Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>


            //{


@@ -96,7 +96,11 @@


        /// <param name="pageSize">每页几条</param>


        private void getPageList(int curPage)


        {


            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);


            gcMain1.DataSource = null; 


            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();


            _sbSqlWhere.Append(" and org.fid in");


            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());


            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));


            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());


            string json = JsonConvert.SerializeObject(pgq);


            try


@@ -112,7 +116,8 @@


                    {


                        gcMain1.DataSource = dt;


                        gcMain1.ForceInitialize();


                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);


                        gridView1.BestFitColumns();


                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);


                    }


                    else


                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);