From 64a6c4193199d15d7ac5aa67a9677df01a37a50d Mon Sep 17 00:00:00 2001 From: lu <99954486@qq.com> Date: 星期四, 12 六月 2025 08:04:31 +0800 Subject: [PATCH] bug --- DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 167 ++++++-------------- DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 86 ---------- DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 89 ---------- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 27 +-- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 82 ++++++---- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 16 + DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs | 6 7 files changed, 137 insertions(+), 336 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs index b4aa45c..d7decc4 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs +++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs @@ -28,8 +28,8 @@ this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; - toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick; - toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick; + toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; + toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips); @@ -239,119 +239,17 @@ lbGuid, txt_releaseNo, gridView1); toolBarMenu1.guidKey = rowGuid; } - /// <summary> - ///鎻愪氦妫�楠屼簨浠� - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - /// <exception cref="NotImplementedException"></exception> - private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e) - { - toolBarMenu1.guidKey = ""; - string rowGuid, rowName; - (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, - lbGuid, txt_releaseNo, gridView1, "releaseNo"); - toolBarMenu1.guidKey = rowGuid; - if (string.IsNullOrEmpty(rowGuid)) - { - MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - return; - } - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎻愬鏍稿悧锛�")) - return; - if (txt_fcheckResu.Text.Trim() == _strTag) - { - if (string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim())) - { - MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰~鍐欏紓甯稿娉ㄨ鏄庯紒"); - return; - } - }; - var _obj = new - { - guid = rowGuid, - }; - try - { - var strJson = UtilityHelper.HttpPost("", - _webServiceName + "EditModelSubmit", - JsonConvert.SerializeObject(_obj)); - var _rtn = UtilityHelper.ReturnToDynamic(strJson); - if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) - { - MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg); - if (xtraTabControl1.SelectedTabPageIndex == 1) - { - getModel(lbGuid.Text.Trim(), "0"); - } - int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); - gridView1.FocusedRowHandle = rowHandle; - int _inFieldValue = 1; - UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString()); - } - else { - MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg); - } - } - catch (Exception ex) - { - MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); - } + + private void ToolBarMenu1_btnChkClick(object sender, EventArgs e) + { + _toolCk("EditModelSubmit"); + } + private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e) + { + _toolCk("EditModelSubmitZhiLiang"); } - /// <summary> - /// 鎻愪氦鍙嶆楠� - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - /// <exception cref="NotImplementedException"></exception> - private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e) - { - toolBarMenu1.guidKey = ""; - string rowGuid, rowName; - (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, - lbGuid, txt_releaseNo, gridView1, "releaseNo"); - toolBarMenu1.guidKey = rowGuid; - if (string.IsNullOrEmpty(rowGuid)) - { - MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - return; - } - if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍙嶅鏍稿悧锛�")) - return; - var _obj = new - { - guid = rowGuid, - }; - try - { - var strJson = UtilityHelper.HttpPost("", - _webServiceName + "EditModelSubmitZhiLiang", - JsonConvert.SerializeObject(_obj)); - var _rtn = UtilityHelper.ReturnToDynamic(strJson); - - if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) - { - MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg); - if (xtraTabControl1.SelectedTabPageIndex == 1) - { - getModel(lbGuid.Text.Trim(), "0"); - } - int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); - gridView1.FocusedRowHandle = rowHandle; - int _inFieldValue = 1; - UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString()); - } - else { - MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg); - } - } - catch (Exception ex) - { - MsgHelper.ShowError("鎻愮ず锛�" + ex.Message); - } - } /// <summary> /// 鍙栨秷浜嬩欢 /// </summary> @@ -714,5 +612,50 @@ } #endregion + + /// <summary> + /// 妫�楠屽拰鍙嶆楠� + /// </summary> + /// <param name="inFieldValue"></param> + private void _toolCk(string _meth) + { + string rowGuid, rowName; + (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo"); + if (string.IsNullOrEmpty(rowGuid)) + { + MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); + return; + } + if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎿嶄綔鍚楋紵")) + return; + var _obj = new + { + guid = rowGuid, + }; + try + { + var strJson = UtilityHelper.HttpPost("", + _webServiceName + _meth, + JsonConvert.SerializeObject(_obj)); + var _rtn = UtilityHelper.ReturnToDynamic(strJson); + MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg); + if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) + { + if (xtraTabControl1.SelectedTabPageIndex == 1) + { + getModel(lbGuid.Text.Trim(), "0"); + } + int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); + gridView1.FocusedRowHandle = rowHandle; + int _inFieldValue = (_meth == "EditModelSubmit" ? 1 : -1); + UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString()); + } + } + catch (Exception ex) + { + MsgHelper.Warning("鎻愮ず锛�" + ex.Message); + } + } + } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs index ed2f9fd..c9049d0 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs @@ -31,8 +31,8 @@ toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick; toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; - toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick; - toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick; + toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick; + toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); @@ -115,6 +115,8 @@ }; } + + private void GridView1_ColumnFilterChanged(object sender, EventArgs e) { _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1); @@ -171,25 +173,14 @@ toolBarMenu1.guidKey = rowGuid; } - /// <summary> - /// 鍙嶆楠� - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e) - { - _toolCk("EditModelSubmitF"); - } - - /// <summary> - /// 妫�楠� - /// </summary> - /// <param name="sender"></param> - /// <param name="e"></param> - private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e) + private void ToolBarMenu1_btnChkClick(object sender, EventArgs e) { _toolCk("EditModelSubmit"); } + private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e) + { + _toolCk("EditModelSubmitF"); + } /// <summary> /// 鍙栨秷浜嬩欢 /// </summary> diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs index 3e8cec5..acd3a78 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs @@ -145,6 +145,7 @@ this.txt_kQty = new DevExpress.XtraEditors.TextEdit(); this.txtQuantity = new DevExpress.XtraEditors.TextEdit(); this.txtYdy = new DevExpress.XtraEditors.TextEdit(); + this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -153,7 +154,6 @@ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -174,6 +174,7 @@ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); + this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx2 = new DevExpress.XtraGrid.GridControl(); this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -274,6 +275,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit(); @@ -282,7 +284,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); @@ -1193,7 +1194,7 @@ // this.layoutControl1.Controls.Add(this.txt_iCount_1); this.layoutControl1.Controls.Add(this.txt_yuliang_1); - this.layoutControl1.Location = new System.Drawing.Point(692, 50); + this.layoutControl1.Location = new System.Drawing.Point(692, 82); this.layoutControl1.Name = "layoutControl1"; this.layoutControl1.Root = this.layoutControlGroup2; this.layoutControl1.Size = new System.Drawing.Size(336, 31); @@ -1264,7 +1265,7 @@ // // radOut // - this.radOut.Location = new System.Drawing.Point(1033, -22); + this.radOut.Location = new System.Drawing.Point(1033, 10); this.radOut.Margin = new System.Windows.Forms.Padding(0); this.radOut.Name = "radOut"; this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near; @@ -1279,7 +1280,7 @@ // ucBtnPrint1 // this.ucBtnPrint1.guidKey = null; - this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 15); + this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 47); this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint1.Name = "ucBtnPrint1"; this.ucBtnPrint1.rptParameter = null; @@ -1298,7 +1299,7 @@ // // txtWlid // - this.txtWlid.Location = new System.Drawing.Point(114, -20); + this.txtWlid.Location = new System.Drawing.Point(114, 12); this.txtWlid.Name = "txtWlid"; this.txtWlid.Properties.Appearance.Options.UseFont = true; this.txtWlid.Properties.ReadOnly = true; @@ -1308,7 +1309,7 @@ // // txt_psnQty_1 // - this.txt_psnQty_1.Location = new System.Drawing.Point(794, 15); + this.txt_psnQty_1.Location = new System.Drawing.Point(794, 47); this.txt_psnQty_1.Name = "txt_psnQty_1"; this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true; this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24); @@ -1317,7 +1318,7 @@ // // txtWlmc // - this.txtWlmc.Location = new System.Drawing.Point(114, 15); + this.txtWlmc.Location = new System.Drawing.Point(114, 47); this.txtWlmc.Name = "txtWlmc"; this.txtWlmc.Properties.Appearance.Options.UseFont = true; this.txtWlmc.Properties.ReadOnly = true; @@ -1327,7 +1328,7 @@ // // txtWlgg // - this.txtWlgg.Location = new System.Drawing.Point(114, 50); + this.txtWlgg.Location = new System.Drawing.Point(114, 82); this.txtWlgg.Name = "txtWlgg"; this.txtWlgg.Properties.Appearance.Options.UseFont = true; this.txtWlgg.Properties.ReadOnly = true; @@ -1337,7 +1338,7 @@ // // txt_kQty // - this.txt_kQty.Location = new System.Drawing.Point(794, -20); + this.txt_kQty.Location = new System.Drawing.Point(794, 12); this.txt_kQty.Name = "txt_kQty"; this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_kQty.Properties.Appearance.Options.UseFont = true; @@ -1349,7 +1350,7 @@ // // txtQuantity // - this.txtQuantity.Location = new System.Drawing.Point(454, -20); + this.txtQuantity.Location = new System.Drawing.Point(454, 12); this.txtQuantity.Name = "txtQuantity"; this.txtQuantity.Properties.Appearance.Options.UseFont = true; this.txtQuantity.Properties.ReadOnly = true; @@ -1359,13 +1360,25 @@ // // txtYdy // - this.txtYdy.Location = new System.Drawing.Point(454, 15); + this.txtYdy.Location = new System.Drawing.Point(454, 47); this.txtYdy.Name = "txtYdy"; this.txtYdy.Properties.Appearance.Options.UseFont = true; this.txtYdy.Properties.ReadOnly = true; this.txtYdy.Size = new System.Drawing.Size(234, 24); this.txtYdy.StyleController = this.layout99; this.txtYdy.TabIndex = 222; + // + // layoutControlItem26 + // + this.layoutControlItem26.Control = this.lbMxGuid; + this.layoutControlItem26.Location = new System.Drawing.Point(1020, 70); + this.layoutControlItem26.Name = "layoutControlItem26"; + this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; + this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 2; + this.layoutControlItem26.Size = new System.Drawing.Size(340, 35); + this.layoutControlItem26.Text = "lbMxGuid"; + this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem26.TextVisible = false; // // layoutControlGroup1 // @@ -1481,18 +1494,6 @@ this.layoutControlItem25.Text = "姣忓紶鏉$爜鏁伴噺"; this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18); // - // layoutControlItem26 - // - this.layoutControlItem26.Control = this.lbMxGuid; - this.layoutControlItem26.Location = new System.Drawing.Point(1020, 70); - this.layoutControlItem26.Name = "layoutControlItem26"; - this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; - this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 2; - this.layoutControlItem26.Size = new System.Drawing.Size(340, 35); - this.layoutControlItem26.Text = "lbMxGuid"; - this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem26.TextVisible = false; - // // layoutControlItem27 // this.layoutControlItem27.Control = this.ucBtnPrint1; @@ -1562,7 +1563,8 @@ this.gvMx1tld009, this.gridColumn1, this.gridColumn2, - this.gvMxDel}); + this.gvMxDel, + this.gridColumn18}); this.gvMx1.GridControl = this.gcMx1; this.gvMx1.Name = "gvMx1"; this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True; @@ -1658,7 +1660,7 @@ this.gridColumn13.MinWidth = 25; this.gridColumn13.Name = "gridColumn13"; this.gridColumn13.Visible = true; - this.gridColumn13.VisibleIndex = 5; + this.gridColumn13.VisibleIndex = 6; this.gridColumn13.Width = 94; // // gvMx1tld006 @@ -1670,7 +1672,7 @@ this.gvMx1tld006.Name = "gvMx1tld006"; this.gvMx1tld006.Tag = "query_a.tld006"; this.gvMx1tld006.Visible = true; - this.gvMx1tld006.VisibleIndex = 6; + this.gvMx1tld006.VisibleIndex = 7; this.gvMx1tld006.Width = 94; // // gvMx1tld007 @@ -1682,7 +1684,7 @@ this.gvMx1tld007.Name = "gvMx1tld007"; this.gvMx1tld007.Tag = "query_a.tld007"; this.gvMx1tld007.Visible = true; - this.gvMx1tld007.VisibleIndex = 7; + this.gvMx1tld007.VisibleIndex = 8; this.gvMx1tld007.Width = 94; // // gvMx1tld009 @@ -1702,7 +1704,7 @@ this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 8; + this.gridColumn1.VisibleIndex = 9; this.gridColumn1.Width = 94; // // gridColumn2 @@ -1712,7 +1714,7 @@ this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 9; + this.gridColumn2.VisibleIndex = 10; this.gridColumn2.Width = 94; // // gvMxDel @@ -1722,7 +1724,7 @@ this.gvMxDel.MinWidth = 25; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; - this.gvMxDel.VisibleIndex = 10; + this.gvMxDel.VisibleIndex = 11; this.gvMxDel.Width = 94; // // repositoryItemButtonEdit1 @@ -1735,6 +1737,21 @@ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); + // + // gridColumn18 + // + this.gridColumn18.AppearanceCell.ForeColor = System.Drawing.Color.Blue; + this.gridColumn18.AppearanceCell.Options.UseForeColor = true; + this.gridColumn18.AppearanceHeader.ForeColor = System.Drawing.Color.Blue; + this.gridColumn18.AppearanceHeader.Options.UseForeColor = true; + this.gridColumn18.Caption = "澶囨敞"; + this.gridColumn18.FieldName = "tld014"; + this.gridColumn18.MinWidth = 25; + this.gridColumn18.Name = "gridColumn18"; + this.gridColumn18.Tag = "edit"; + this.gridColumn18.Visible = true; + this.gridColumn18.VisibleIndex = 5; + this.gridColumn18.Width = 94; // // xtraTabPage3 // @@ -2040,6 +2057,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit(); @@ -2048,7 +2066,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); @@ -2199,5 +2216,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; private DevExpress.XtraEditors.TextEdit txt_yuliang_1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31; + private DevExpress.XtraGrid.Columns.GridColumn gridColumn18; } } \ No newline at end of file diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs index 51b47ef..f53b016 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs @@ -451,11 +451,18 @@ MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�"); return; } + _sl = row["tld014"].ToString(); + if (string.IsNullOrEmpty(_sl)) + { + MsgHelper.ShowError("閫�鏂欏娉ㄤ笉鑳戒负绌猴紒"); + return; + } _obj.list.Add(new { Guid = _guid, AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()), - Sl = _sl //鐢宠鏁伴噺 + Sl = _sl, //鐢宠鏁伴噺 + Remark = row["tld014"].ToString() }); } } @@ -490,7 +497,7 @@ /// <param name="pageSize">姣忛〉鍑犳潯</param> private void getPageList(int curPage) { - gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); + gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try @@ -756,8 +763,9 @@ txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺 txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺 } - else { - lbMxGuid.Text =""; + else + { + lbMxGuid.Text = ""; toolBarMenu1.guidKey = ""; txtWlid.Text = ""; txtWlgg.Text = ""; diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs index dd8582d..a600953 100644 --- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs +++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs @@ -382,6 +382,12 @@ MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�"); return; } + _sl = row["tld014"].ToString(); + if (string.IsNullOrEmpty(_sl)) + { + MsgHelper.ShowError("閫�鏂欏娉ㄤ笉鑳戒负绌猴紒"); + return; + } _obj.list.Add(new { Guid = _guid, diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs index 57536c9..8a12050 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs @@ -47,12 +47,7 @@ this.btnOut = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnReport = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnDesign = new DevExpress.XtraBars.BarLargeButtonItem(); - this.btnJianYan = new DevExpress.XtraBars.BarLargeButtonItem(); - this.btnFjianYan = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnPiZhun = new DevExpress.XtraBars.BarLargeButtonItem(); - this.btnZhiLiangChk = new DevExpress.XtraBars.BarLargeButtonItem(); - this.btnZhiLiangFchk = new DevExpress.XtraBars.BarLargeButtonItem(); - this.btnBoHui = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnCaiGouChk = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnCaiGouFchk = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnLog = new DevExpress.XtraBars.BarLargeButtonItem(); @@ -63,7 +58,6 @@ this.btnZhongTai = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnJieAn = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnFjieAn = new DevExpress.XtraBars.BarLargeButtonItem(); - this.btnOa = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnShouHouChk = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnShouHouFchk = new DevExpress.XtraBars.BarLargeButtonItem(); this.btnCaiWuChk = new DevExpress.XtraBars.BarLargeButtonItem(); @@ -106,14 +100,9 @@ this.btnReport, this.btnQuery, this.btnDesign, - this.btnJianYan, - this.btnFjianYan, this.btnPiZhun, - this.btnZhiLiangChk, - this.btnZhiLiangFchk, this.btnCaiGouChk, this.btnCaiGouFchk, - this.btnBoHui, this.btnJieAn, this.btnFjieAn, this.btnTzbl, @@ -122,7 +111,6 @@ this.btnWg, this.btnHelp, this.btnLayout, - this.btnOa, this.btnFont, this.btnShouJian, this.btnCaiWuChk, @@ -157,12 +145,7 @@ new DevExpress.XtraBars.LinkPersistInfo(this.btnOut), new DevExpress.XtraBars.LinkPersistInfo(this.btnReport), new DevExpress.XtraBars.LinkPersistInfo(this.btnDesign), - new DevExpress.XtraBars.LinkPersistInfo(this.btnJianYan), - new DevExpress.XtraBars.LinkPersistInfo(this.btnFjianYan), new DevExpress.XtraBars.LinkPersistInfo(this.btnPiZhun), - new DevExpress.XtraBars.LinkPersistInfo(this.btnZhiLiangChk), - new DevExpress.XtraBars.LinkPersistInfo(this.btnZhiLiangFchk), - new DevExpress.XtraBars.LinkPersistInfo(this.btnBoHui), new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiGouChk), new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiGouFchk), new DevExpress.XtraBars.LinkPersistInfo(this.btnLog), @@ -173,7 +156,6 @@ new DevExpress.XtraBars.LinkPersistInfo(this.btnZhongTai), new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnJieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph), new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnFjieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph), - new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnOa, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph), new DevExpress.XtraBars.LinkPersistInfo(this.btnShouHouChk), new DevExpress.XtraBars.LinkPersistInfo(this.btnShouHouFchk), new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuChk), @@ -331,26 +313,6 @@ this.btnDesign.Name = "btnDesign"; this.btnDesign.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; // - // btnJianYan - // - this.btnJianYan.Caption = "QC瀹℃牳"; - this.btnJianYan.Id = 27; - this.btnJianYan.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x16; - this.btnJianYan.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbuttons_32x32; - this.btnJianYan.ItemAppearance.Normal.Options.UseFont = true; - this.btnJianYan.Name = "btnJianYan"; - this.btnJianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; - // - // btnFjianYan - // - this.btnFjianYan.Caption = "QC鍙嶅鏍�"; - this.btnFjianYan.Id = 28; - this.btnFjianYan.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.radiobuttons_16x16; - this.btnFjianYan.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.radiobuttons_32x32; - this.btnFjianYan.ItemAppearance.Normal.Options.UseFont = true; - this.btnFjianYan.Name = "btnFjianYan"; - this.btnFjianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; - // // btnPiZhun // this.btnPiZhun.Caption = "鎵瑰噯"; @@ -360,36 +322,7 @@ this.btnPiZhun.ItemAppearance.Normal.Options.UseFont = true; this.btnPiZhun.Name = "btnPiZhun"; this.btnPiZhun.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; - // - // btnZhiLiangChk - // - this.btnZhiLiangChk.Caption = "璐ㄩ噺瀹℃牳"; - this.btnZhiLiangChk.Id = 31; - this.btnZhiLiangChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x162; - this.btnZhiLiangChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbuttons_32x321; - this.btnZhiLiangChk.ItemAppearance.Normal.Options.UseFont = true; - this.btnZhiLiangChk.Name = "btnZhiLiangChk"; - this.btnZhiLiangChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; - // - // btnZhiLiangFchk - // - this.btnZhiLiangFchk.Caption = "璐ㄩ噺鍙嶅鏍�"; - this.btnZhiLiangFchk.Id = 33; - this.btnZhiLiangFchk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.forcetesting_16x161; - this.btnZhiLiangFchk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.forcetesting_32x321; - this.btnZhiLiangFchk.ItemAppearance.Normal.Options.UseFont = true; - this.btnZhiLiangFchk.Name = "btnZhiLiangFchk"; - this.btnZhiLiangFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; - // - // btnBoHui - // - this.btnBoHui.Caption = "椹冲洖閲嶆"; - this.btnBoHui.Id = 37; - this.btnBoHui.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.updatetableofcontents_16x16; - this.btnBoHui.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.updatetableofcontents_32x32; - this.btnBoHui.ItemAppearance.Normal.Options.UseFont = true; - this.btnBoHui.Name = "btnBoHui"; - this.btnBoHui.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; + // // btnCaiGouChk // @@ -486,16 +419,7 @@ this.btnFjieAn.ItemAppearance.Normal.Options.UseFont = true; this.btnFjieAn.Name = "btnFjieAn"; this.btnFjieAn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; - // - // btnOa - // - this.btnOa.Caption = "鎻愪氦OA"; - this.btnOa.Id = 54; - this.btnOa.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.meeting_16x16; - this.btnOa.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.meeting_32x321; - this.btnOa.ItemAppearance.Normal.Options.UseFont = true; - this.btnOa.Name = "btnOa"; - this.btnOa.Visibility = DevExpress.XtraBars.BarItemVisibility.Never; + // // btnShouHouChk // @@ -628,14 +552,9 @@ private DevExpress.XtraBars.BarLargeButtonItem btnReport; private DevExpress.XtraBars.BarLargeButtonItem btnQuery; private DevExpress.XtraBars.BarLargeButtonItem btnDesign; - private DevExpress.XtraBars.BarLargeButtonItem btnJianYan; - private DevExpress.XtraBars.BarLargeButtonItem btnFjianYan; private DevExpress.XtraBars.BarLargeButtonItem btnPiZhun; - private DevExpress.XtraBars.BarLargeButtonItem btnZhiLiangChk; - private DevExpress.XtraBars.BarLargeButtonItem btnZhiLiangFchk; private DevExpress.XtraBars.BarLargeButtonItem btnCaiGouChk; private DevExpress.XtraBars.BarLargeButtonItem btnCaiGouFchk; - private DevExpress.XtraBars.BarLargeButtonItem btnBoHui; private DevExpress.XtraBars.BarDockControl barDockControlTop; private DevExpress.XtraBars.BarDockControl barDockControlBottom; private DevExpress.XtraBars.BarDockControl barDockControlLeft; @@ -648,7 +567,6 @@ private DevExpress.XtraBars.BarLargeButtonItem btnWg; private DevExpress.XtraBars.BarLargeButtonItem btnHelp; private DevExpress.XtraBars.BarLargeButtonItem btnLayout; - private DevExpress.XtraBars.BarLargeButtonItem btnOa; private DevExpress.XtraBars.BarLargeButtonItem btnFont; private DevExpress.XtraBars.BarLargeButtonItem btnShouJian; private DevExpress.XtraBars.BarLargeButtonItem btnCaiWuChk; diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs index c8cdce5..f8c63f9 100644 --- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs +++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs @@ -39,15 +39,10 @@ btnIn.ItemClick += BtnIn_ItemClick; btnChk.ItemClick += BtnChk_ItemClick; btnFchk.ItemClick += BtnFchk_ItemClick; - btnJianYan.ItemClick += BtnJianYan_ItemClick; - btnFjianYan.ItemClick += BtnFjianYan_ItemClick; btnPiZhun.ItemClick += BtnPiZhun_ItemClick; btnLog.ItemClick += BtnLog_ItemClick; - btnZhiLiangChk.ItemClick += BtnZhiLiangChk_ItemClick; - btnZhiLiangFchk.ItemClick += BtnZhiLiangFchk_ItemClick; btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick; btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick; - btnBoHui.ItemClick += BtnBoHui_ItemClick; btnJieAn.ItemClick += BtnJieAn_ItemClick; btnFjieAn.ItemClick += BtnFjieAn_ItemClick; btnTzbl.ItemClick += BtnTzbl_ItemClick; @@ -62,7 +57,6 @@ btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick; btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick; btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick; - btnOa.ItemClick += BtnOa_ItemClick; var lst = new List<string>(); foreach (BarItem item in barManager1.Items) if (item is BarLargeButtonItem largeButtonItem) @@ -116,27 +110,7 @@ } return false; } - - private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e) - { - if (btnBoHuiClick != null) - btnBoHuiClick(this, e); - //if (string.IsNullOrEmpty(guidKey)) - //{ - // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - // return; - //} - - //if (string.IsNullOrEmpty(chkParameter)) - //{ - // MsgHelper.ShowError("娌℃湁鎸囧畾椹冲洖鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); - // return; - //} - - //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾椹冲洖閲嶆鍚楋紵")) - // return; - //_ckService("5"); - } + private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e) { if (btnCaiGouFchkClick != null) @@ -172,33 +146,9 @@ btnShouHouChkClick(this, e); } - private void BtnZhiLiangFchk_ItemClick(object sender, ItemClickEventArgs e) - { - if (btnZhiLiangFchkClick != null) - btnZhiLiangFchkClick(this, e); - } + - private void BtnZhiLiangChk_ItemClick(object sender, ItemClickEventArgs e) - { - if (btnZhiLiangChkClick != null) - btnZhiLiangChkClick(this, e); - //if (string.IsNullOrEmpty(guidKey)) - //{ - // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�"); - // return; - //} - - //if (string.IsNullOrEmpty(chkParameter)) - //{ - // MsgHelper.ShowError("娌℃湁鎸囧畾瀹℃牳鍙傛暟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒"); - // return; - //} - - //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾璐ㄩ噺瀹℃牳鍚楋紵")) - // return; - //_ckService("3"); - } - + private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e) { bool bl = _isCk(0); @@ -256,25 +206,6 @@ if (btnPiZhunClick != null) btnPiZhunClick(this, e); } - private void BtnFjianYan_ItemClick(object sender, ItemClickEventArgs e) - { - bool bl = _isCk(0); - if (bl) return; - if (btnFjianYanClick != null) - btnFjianYanClick(this, e); - else - return; - } - - private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e) - { - bool bl = _isCk(1); - if (bl) return; - if (btnJianYanClick != null) - btnJianYanClick(this, e); - else - return; - } private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e) { if (btnShouJianClick != null) @@ -430,11 +361,6 @@ if (btnQueryClick != null) btnQueryClick(this, e); } - private void BtnOa_ItemClick(object sender, ItemClickEventArgs e) - { - if (btnOaClick != null) btnOaClick(this, e); - } - /// <summary> /// 鍙栨秷鏃讹紝杩樺師鎸夐挳鍙敤鎬� /// </summary> @@ -454,8 +380,6 @@ lst.Add(btnDesign.Name); lst.Add(btnChk.Name); lst.Add(btnFchk.Name); - lst.Add(btnJianYan.Name); - lst.Add(btnFjianYan.Name); lst.Add(btnOut.Name); lst.Add(btnIn.Name); lst.Add(btnLog.Name); @@ -463,7 +387,6 @@ lst.Add(btnHelp.Name); lst.Add(btnLayout.Name); lst.Add(btnFont.Name); - lst.Add(btnBoHui.Name); lst.Add(btnTzbl.Name); lst.Add(btnKg.Name); lst.Add(btnWg.Name); @@ -499,14 +422,9 @@ lst.Add(btnChk.Name); lst.Add(btnFchk.Name); lst.Add(btnDel.Name); - lst.Add(btnJianYan.Name); - lst.Add(btnFjianYan.Name); lst.Add(btnQuery.Name); lst.Add(btnLog.Name); - lst.Add(btnZhiLiangChk.Name); - lst.Add(btnZhiLiangFchk.Name); lst.Add(btnPiZhun.Name); - lst.Add(btnBoHui.Name); lst.Add(btnDesign.Name); lst.Add(btnReport.Name); lst.Add(btnKg.Name); @@ -551,7 +469,6 @@ lst.Add(btnLayout.Name); lst.Add(btnFont.Name); lst.Add(btnFont.Name); - lst.Add(btnJianYan.Name); lst.Add(btnLog.Name); _enabledBtn(lst); this.currentAction = "edit"; -- Gitblit v1.9.3