DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -357,7 +357,7 @@ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) { toolBarMenu1.isSetBtn = false; if (txt_fcheckResu.Text.Trim() == "N:ä¸åæ ¼" && string.IsNullOrEmpty(txt_fngDesc.Text.Trim())) if (txt_fcheckResu.Text.Trim() == "N:ä¸åæ ¼" && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("å½æ£éªç»æä¸åæ ¼æ¶ï¼è¯·å¡«åå¤æ³¨è¯´æï¼"); txt_fngDesc.Focus(); @@ -366,7 +366,7 @@ var _obj = new { guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建 fngDesc = txt_fngDesc.Text.Trim(), fngDesc = txt_fngDesc.TextTxt.Trim(), }; try { DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -59,7 +59,6 @@ this.gv_fType = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -286,7 +285,6 @@ this.gv_fType, this.gv_urgentFlag, this.gv_fstatus, this.gridColumn2, this.gv_billNo, this.gv_createBy, this.gv_createDate, @@ -360,18 +358,6 @@ this.gv_fstatus.VisibleIndex = 3; this.gv_fstatus.Width = 68; // // gridColumn2 // this.gridColumn2.Caption = "å ¥åº"; this.gridColumn2.FieldName = "ckStatus"; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.OptionsColumn.AllowEdit = false; this.gridColumn2.Tag = "query_a.ckStatus"; this.gridColumn2.UnboundDataType = typeof(bool); this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 4; this.gridColumn2.Width = 68; // // gv_billNo // this.gv_billNo.AppearanceCell.Options.UseFont = true; @@ -381,7 +367,7 @@ this.gv_billNo.OptionsColumn.AllowEdit = false; this.gv_billNo.Tag = "query_a.bill_no"; this.gv_billNo.Visible = true; this.gv_billNo.VisibleIndex = 5; this.gv_billNo.VisibleIndex = 4; this.gv_billNo.Width = 68; // // gv_createBy @@ -393,7 +379,7 @@ this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.create_by"; this.gv_createBy.Visible = true; this.gv_createBy.VisibleIndex = 6; this.gv_createBy.VisibleIndex = 5; this.gv_createBy.Width = 89; // // gv_createDate @@ -405,7 +391,7 @@ this.gv_createDate.OptionsColumn.AllowEdit = false; this.gv_createDate.Tag = "query_a.create_date"; this.gv_createDate.Visible = true; this.gv_createDate.VisibleIndex = 7; this.gv_createDate.VisibleIndex = 6; this.gv_createDate.Width = 193; // // gv_checkUser @@ -417,7 +403,7 @@ this.gv_checkUser.OptionsColumn.AllowEdit = false; this.gv_checkUser.Tag = "query_a.check_user"; this.gv_checkUser.Visible = true; this.gv_checkUser.VisibleIndex = 8; this.gv_checkUser.VisibleIndex = 7; this.gv_checkUser.Width = 100; // // gv_checkDate @@ -429,7 +415,7 @@ 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.VisibleIndex = 8; this.gv_checkDate.Width = 64; // // gv_depotsCode @@ -441,7 +427,7 @@ this.gv_depotsCode.OptionsColumn.AllowEdit = false; this.gv_depotsCode.Tag = "query_a.depots_code"; this.gv_depotsCode.Visible = true; this.gv_depotsCode.VisibleIndex = 10; this.gv_depotsCode.VisibleIndex = 9; this.gv_depotsCode.Width = 87; // // gridColumn4 @@ -451,7 +437,7 @@ this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.OptionsColumn.AllowEdit = false; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 11; this.gridColumn4.VisibleIndex = 10; this.gridColumn4.Width = 128; // // gv_suppNo @@ -463,7 +449,7 @@ this.gv_suppNo.OptionsColumn.AllowEdit = false; this.gv_suppNo.Tag = "query_a.supp_no"; this.gv_suppNo.Visible = true; this.gv_suppNo.VisibleIndex = 12; this.gv_suppNo.VisibleIndex = 11; this.gv_suppNo.Width = 69; // // gridColumn5 @@ -473,7 +459,7 @@ this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.OptionsColumn.AllowEdit = false; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 13; this.gridColumn5.VisibleIndex = 12; this.gridColumn5.Width = 70; // // gv_remark @@ -485,7 +471,7 @@ this.gv_remark.OptionsColumn.AllowEdit = false; this.gv_remark.Tag = "query_a.remark"; this.gv_remark.Visible = true; this.gv_remark.VisibleIndex = 14; this.gv_remark.VisibleIndex = 13; this.gv_remark.Width = 90; // // gridColumn11 @@ -1509,7 +1495,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_fType; private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag; private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraGrid.Columns.GridColumn gv_billNo; private DevExpress.XtraGrid.Columns.GridColumn gv_createBy; private DevExpress.XtraGrid.Columns.GridColumn gv_createDate; DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -60,7 +60,6 @@ this.gv_paperBillNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_iqcReleaseNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.bandedGridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -111,7 +110,6 @@ this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2ebeln = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2workNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx2lineK3id = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -281,7 +279,6 @@ this.gv_paperBillNo, this.gv_checkUser, this.gv_checkDate, this.gv_iqcReleaseNo, this.gridColumn3, this.bandedGridColumn2, this.gv_guid}); @@ -480,18 +477,6 @@ this.gv_checkDate.VisibleIndex = 15; this.gv_checkDate.Width = 180; // // gv_iqcReleaseNo // this.gv_iqcReleaseNo.AppearanceCell.Options.UseFont = true; this.gv_iqcReleaseNo.Caption = "IQCæ£éªåå· "; this.gv_iqcReleaseNo.FieldName = "iqcReleaseNo"; this.gv_iqcReleaseNo.Name = "gv_iqcReleaseNo"; this.gv_iqcReleaseNo.OptionsColumn.AllowEdit = false; this.gv_iqcReleaseNo.Tag = "query_a.IQC_RELEASE_NO"; this.gv_iqcReleaseNo.Visible = true; this.gv_iqcReleaseNo.VisibleIndex = 16; this.gv_iqcReleaseNo.Width = 64; // // gridColumn3 // this.gridColumn3.Caption = "å ¥åºç±»å«"; @@ -499,7 +484,7 @@ this.gridColumn3.MinWidth = 25; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 17; this.gridColumn3.VisibleIndex = 16; this.gridColumn3.Width = 94; // // bandedGridColumn2 @@ -509,7 +494,7 @@ this.bandedGridColumn2.Name = "bandedGridColumn2"; this.bandedGridColumn2.Tag = "org.fnamber"; this.bandedGridColumn2.Visible = true; this.bandedGridColumn2.VisibleIndex = 18; this.bandedGridColumn2.VisibleIndex = 17; this.bandedGridColumn2.Width = 250; // // gv_guid @@ -977,7 +962,6 @@ this.gvMx2quantity, this.gvMx2unit, this.gvMx2ebeln, this.gvMx2workNo, this.gvMx2ebelnK3id, this.gvMx2lineK3id, this.gridColumn10, @@ -1069,17 +1053,6 @@ this.gvMx2ebeln.Visible = true; this.gvMx2ebeln.VisibleIndex = 5; this.gvMx2ebeln.Width = 94; // // gvMx2workNo // this.gvMx2workNo.AppearanceCell.Options.UseFont = true; this.gvMx2workNo.Caption = "ä»»å¡åè¡å·"; this.gvMx2workNo.FieldName = "workLine"; this.gvMx2workNo.Name = "gvMx2workNo"; this.gvMx2workNo.Tag = "query_a.WORK_NO"; this.gvMx2workNo.Visible = true; this.gvMx2workNo.VisibleIndex = 6; this.gvMx2workNo.Width = 94; // // gvMx2ebelnK3id // @@ -1453,7 +1426,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate; private DevExpress.XtraGrid.Columns.GridColumn gv_taskNo; private DevExpress.XtraGrid.Columns.GridColumn gv_ischeck; private DevExpress.XtraGrid.Columns.GridColumn gv_iqcReleaseNo; private DevExpress.XtraGrid.Columns.GridColumn gv_suppId; private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo; private DevExpress.XtraGrid.Columns.GridColumn gv_depotsId; @@ -1500,7 +1472,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity; private DevExpress.XtraGrid.Columns.GridColumn gvMx2unit; private DevExpress.XtraGrid.Columns.GridColumn gvMx2ebeln; private DevExpress.XtraGrid.Columns.GridColumn gvMx2workNo; private DevExpress.XtraGrid.Columns.GridColumn gvMx2ebelnK3id; private DevExpress.XtraGrid.Columns.GridColumn gvMx2lineK3id; private DevExpress.XtraTab.XtraTabPage xtraTabPage3; DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -70,10 +70,12 @@ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.txt_qt003 = new Gs.DevApp.UserControl.UcDictionaryComBox(); this.lbGuid = new System.Windows.Forms.Label(); this.txt_qt010 = new DevExpress.XtraEditors.TextEdit(); this.ucLookHuoZhu1 = new Gs.DevApp.UserControl.UcLookHuoZhu(); @@ -84,7 +86,6 @@ this.txt_qt009 = new Gs.DevApp.UserControl.UcLookDepartment(); this.txt_qtck = new DevExpress.XtraEditors.TextEdit(); this.txt_qt002 = new DevExpress.XtraEditors.TextEdit(); this.txt_qt003 = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_qt019 = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_qt015 = new DevExpress.XtraEditors.CheckEdit(); this.txt_qt005 = new DevExpress.XtraEditors.TextEdit(); @@ -194,7 +195,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qtck.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt003.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt005.Properties)).BeginInit(); @@ -327,7 +327,8 @@ this.gridColumn21, this.gridColumn22, this.gridColumn23, this.gridColumn24}); this.gridColumn24, this.gridColumn25}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -525,6 +526,14 @@ this.gridColumn24.VisibleIndex = 14; this.gridColumn24.Width = 94; // // gridColumn25 // this.gridColumn25.Caption = "主é®Guid"; this.gridColumn25.FieldName = "guid"; this.gridColumn25.MinWidth = 25; this.gridColumn25.Name = "gridColumn25"; this.gridColumn25.Width = 94; // // pageBar1 // this.pageBar1.CurrentPage = 1; @@ -567,6 +576,7 @@ // // layoutMx1 // this.layoutMx1.Controls.Add(this.txt_qt003); this.layoutMx1.Controls.Add(this.lbGuid); this.layoutMx1.Controls.Add(this.txt_qt010); this.layoutMx1.Controls.Add(this.ucLookHuoZhu1); @@ -577,7 +587,6 @@ this.layoutMx1.Controls.Add(this.txt_qt009); this.layoutMx1.Controls.Add(this.txt_qtck); this.layoutMx1.Controls.Add(this.txt_qt002); this.layoutMx1.Controls.Add(this.txt_qt003); this.layoutMx1.Controls.Add(this.txt_qt019); this.layoutMx1.Controls.Add(this.txt_qt015); this.layoutMx1.Controls.Add(this.txt_qt005); @@ -592,6 +601,15 @@ this.layoutMx1.Size = new System.Drawing.Size(1167, 144); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_qt003 // this.txt_qt003.Location = new System.Drawing.Point(657, 74); this.txt_qt003.Name = "txt_qt003"; this.txt_qt003.Size = new System.Drawing.Size(211, 24); this.txt_qt003.TabIndex = 333; this.txt_qt003.TextTxt = "å ¶å®å ¥åº(QTRKD01_SYS)"; this.txt_qt003.WhereTxt = "s_type=\'å ¶å®å ¥åºåæ®ç±»å\'"; // // lbGuid // @@ -684,20 +702,6 @@ this.txt_qt002.StyleController = this.layoutMx1; this.txt_qt002.TabIndex = 217; this.txt_qt002.Tag = "readonly"; // // txt_qt003 // this.txt_qt003.EditValue = "å ¶å®å ¥åº(QTRKD01_SYS)"; this.txt_qt003.Location = new System.Drawing.Point(657, 74); this.txt_qt003.Name = "txt_qt003"; this.txt_qt003.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_qt003.Properties.Items.AddRange(new object[] { "å ¶å®å ¥åº(QTRKD01_SYS)"}); this.txt_qt003.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_qt003.Size = new System.Drawing.Size(211, 24); this.txt_qt003.StyleController = this.layoutMx1; this.txt_qt003.TabIndex = 305; // // txt_qt019 // @@ -1726,7 +1730,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qtck.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt003.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt019.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt005.Properties)).EndInit(); @@ -1800,7 +1803,6 @@ private DevExpress.XtraEditors.SplitContainerControl splitMx1; private UserControl.UcLookHuoZhu ucLookHuoZhu1; private UserControl.UcLookOrg txt_qt022; private DevExpress.XtraEditors.ComboBoxEdit txt_qt003; private UserControl.UcLookDepartment txt_qt009; private UserControl.UcLookSupplier txt_qt018; private UserControl.UcLookCk txt_qt008; @@ -1897,7 +1899,9 @@ private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraEditors.RadioGroup radOut; private UserControl.UcDictionaryComBox txt_qt003; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraGrid.Columns.GridColumn gridColumn25; } } DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -314,7 +314,7 @@ string kcZz = txt_qt022.GetId();//åºåç»ç» string kcBm = txt_qt009.GetId();//åºåé¨é¨ string kcGys = txt_qt018.GetId();//åºåä¾åºå string djLx = txt_qt003.Text.Trim();//åæ®ç±»å string djLx = txt_qt003.TextTxt.Trim();//åæ®ç±»å string kcfx = txt_qt019.Text.Trim();//åºåæ¹å string inHzlx = ucLookHuoZhu1.GetHzLx();//货主类å string inHz = ucLookHuoZhu1.GetHzId();//货主 @@ -336,7 +336,7 @@ Gs.DevApp.ToolBox.MsgHelper.Warning("请éæ©è´§ä¸»ï¼"); return; } if (txt_qt003.SelectedIndex < 0) if (txt_qt003.TextTxt.Length < 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("请éæ©åæ®ç±»åï¼"); txt_qt003.Focus(); @@ -434,7 +434,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, "qt001", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
@@ -133,10 +133,10 @@ this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -243,6 +243,7 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; @@ -255,7 +256,8 @@ // // split1.Panel2 // this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1346, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; @@ -574,7 +576,7 @@ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx1.Horizontal = false; this.splitMx1.Location = new System.Drawing.Point(0, 0); this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Name = "splitMx1"; // // splitMx1.Panel1 // @@ -585,6 +587,7 @@ // this.splitMx1.Panel2.Controls.Add(this.tabMx); this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1346, 570); this.splitMx1.SplitterPosition = 176; this.splitMx1.TabIndex = 0; @@ -896,7 +899,7 @@ this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem4.Size = new System.Drawing.Size(333, 31); this.layoutControlItem4.Text = "å®¡æ ¸äºº"; this.layoutControlItem4.Text = "å®¡æ ¸äººå"; this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem5 @@ -971,7 +974,7 @@ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem11.Size = new System.Drawing.Size(331, 31); this.layoutControlItem11.Text = "å建人"; this.layoutControlItem11.Text = "å建人å"; this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem12 @@ -1332,17 +1335,6 @@ this.gridColumn6.VisibleIndex = 6; this.gridColumn6.Width = 94; // // picCheckBox // this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; this.picCheckBox.Location = new System.Drawing.Point(909, 55); this.picCheckBox.Name = "picCheckBox"; this.picCheckBox.Size = new System.Drawing.Size(100, 50); this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.picCheckBox.TabIndex = 6; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // // gridColumn11 // this.gridColumn11.Caption = "ç³è¯·å¤æ³¨"; @@ -1363,6 +1355,17 @@ this.gridColumn12.VisibleIndex = 8; this.gridColumn12.Width = 94; // // picCheckBox // this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck; this.picCheckBox.Location = new System.Drawing.Point(909, 55); this.picCheckBox.Name = "picCheckBox"; this.picCheckBox.Size = new System.Drawing.Size(100, 50); this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.picCheckBox.TabIndex = 6; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // // Frm_MesItemQtrkDj // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -755,7 +755,16 @@ txtYdy.Text = row["ydy"].ToString();//å·²æå°æ»é txt_kQty.Text = row["kdy"].ToString();//å¯æå°æ»é } else { lbMxGuid.Text =""; toolBarMenu1.guidKey = ""; txtWlid.Text = ""; txtWlgg.Text = ""; txtWlmc.Text = ""; txtQuantity.Text = ""; txtYdy.Text = ""; txt_kQty.Text = ""; } } } } DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs
@@ -901,6 +901,7 @@ // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_createBy; this.layoutControlItem3.CustomizationFormText = "å建人å"; this.layoutControlItem3.Location = new System.Drawing.Point(662, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; @@ -915,7 +916,7 @@ this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem4.Size = new System.Drawing.Size(333, 28); this.layoutControlItem4.Text = "å®¡æ ¸äºº"; this.layoutControlItem4.Text = "å®¡æ ¸äººå"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem5 DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -807,6 +807,12 @@ <Compile Include="UserControl\SelectCk.Designer.cs"> <DependentUpon>SelectCk.cs</DependentUpon> </Compile> <Compile Include="UserControl\UcDictionaryComBox.cs"> <SubType>UserControl</SubType> </Compile> <Compile Include="UserControl\UcDictionaryComBox.Designer.cs"> <DependentUpon>UcDictionaryComBox.cs</DependentUpon> </Compile> <Compile Include="UserControl\UcDictionarySelect.cs"> <SubType>Form</SubType> </Compile> @@ -1473,6 +1479,9 @@ <EmbeddedResource Include="UserControl\SelectCk.resx"> <DependentUpon>SelectCk.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="UserControl\UcDictionaryComBox.resx"> <DependentUpon>UcDictionaryComBox.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="UserControl\UcDictionarySelect.resx"> <DependentUpon>UcDictionarySelect.cs</DependentUpon> </EmbeddedResource> DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -489,7 +489,6 @@ txt.Text = strVal; } } //èªå®ä¹ä»åº if (colType is UcLookCk) { @@ -631,6 +630,14 @@ if (colType is UcDictionary) { var txt = colType as UcDictionary; txt.TextTxt = (strVal); txt.IsReadly = isEdt; continue; } //èªå®åæ®ç±»åä¸æ if (colType is UcDictionaryComBox) { var txt = colType as UcDictionaryComBox; txt.TextTxt = (strVal); txt.IsReadly = isEdt; continue; @@ -912,6 +919,14 @@ txt.IsReadly = isEdt; continue; } //èªå®ä¹åæ®ç±»åä¸æ if (ctrl is UcDictionaryComBox) { var txt = ctrl as UcDictionaryComBox; //txt.SetIdOrCode("-1"); txt.IsReadly = isEdt; continue; } if (ctrl is SimpleButton) { var txt = ctrl as SimpleButton; @@ -1012,7 +1027,6 @@ ctrl.Enabled = !isEdt; continue; } // if (ctrl is CheckEdit) { var txt = ctrl as CheckEdit; @@ -1096,7 +1110,6 @@ txt.IsReadly = isEdt; continue; } //èªå®é¨é¨ if (ctrl is UcLookDepartment) { @@ -1139,6 +1152,13 @@ txt.IsReadly = isEdt; continue; } //èªå®åæ®ç±»åä¸æ if (ctrl is UcDictionaryComBox) { var txt = ctrl as UcDictionaryComBox; txt.IsReadly = isEdt; continue; } if (ctrl is SimpleButton) { var txt = ctrl as SimpleButton; DevApp/Gs.DevApp/UserControl/UcDictionaryComBox.Designer.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,64 @@ namespace Gs.DevApp.UserControl { partial class UcDictionaryComBox { /// <summary> /// Required designer variable. /// </summary> private System.ComponentModel.IContainer components = null; /// <summary> /// Clean up any resources being used. /// </summary> /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> protected override void Dispose(bool disposing) { if (disposing && (components != null)) { components.Dispose(); } base.Dispose(disposing); } #region Component Designer generated code /// <summary> /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// </summary> private void InitializeComponent() { this.txt_qt003 = new DevExpress.XtraEditors.ComboBoxEdit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt003.Properties)).BeginInit(); this.SuspendLayout(); // // txt_qt003 // this.txt_qt003.Dock = System.Windows.Forms.DockStyle.Fill; this.txt_qt003.EditValue = ""; this.txt_qt003.Location = new System.Drawing.Point(0, 0); this.txt_qt003.Name = "txt_qt003"; this.txt_qt003.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_qt003.Properties.NullText = "-请éæ©-"; this.txt_qt003.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_qt003.Size = new System.Drawing.Size(420, 24); this.txt_qt003.TabIndex = 306; // // UcDictionaryComBox // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.txt_qt003); this.Name = "UcDictionaryComBox"; this.Size = new System.Drawing.Size(420, 24); ((System.ComponentModel.ISupportInitialize)(this.txt_qt003.Properties)).EndInit(); this.ResumeLayout(false); } #endregion private DevExpress.XtraEditors.ComboBoxEdit txt_qt003; } } DevApp/Gs.DevApp/UserControl/UcDictionaryComBox.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,90 @@ using DevExpress.Data.ExpressionEditor; using DevExpress.XtraEditors; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Newtonsoft.Json; using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; using System.Drawing; using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; namespace Gs.DevApp.UserControl { public partial class UcDictionaryComBox : DevExpress.XtraEditors.XtraUserControl { public UcDictionaryComBox() { InitializeComponent(); } /// <summary> /// ææ¬æ¡æå /// </summary> public string TextTxt { get { return txt_qt003.Text.Trim(); } set { this.txt_qt003.Text = value; } } /// <summary> /// æ¥è¯¢æ¡ä»¶ /// </summary> /// string _WhereTxt; public string WhereTxt { get { return _WhereTxt; } set { this._WhereTxt = value; if (!string.IsNullOrEmpty(value)) { getSuppler(value); } } } public bool IsReadly { set { this.txt_qt003.ReadOnly = value; this.txt_qt003.Enabled = !value; } } /// <summary> /// 读åä»åº /// </summary> /// <param name="orgId"></param> /// <param name="_dftVale"></param> public void getSuppler(string strWhere) { txt_qt003.Properties.Items.Clear(); string _where = " and 1=1 and " + strWhere; var pgq = new PageQueryModel(1, 999999, "a.defect_name", "asc", "", _where); var json = JsonConvert.SerializeObject(pgq); try { var strReturn = UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json); var dd = UtilityHelper.ReturnToTablePage(strReturn); var dt = dd.rtnData.list; foreach (DataRow row in dt.Rows) { txt_qt003.Properties.Items.Add(row["defectName"].ToString()); } } catch (Exception ex) { MsgHelper.Warning("æ示ï¼" + ex.Message); } } } } DevApp/Gs.DevApp/UserControl/UcDictionaryComBox.resx
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,120 @@ <?xml version="1.0" encoding="utf-8"?> <root> <!-- Microsoft ResX Schema Version 2.0 The primary goals of this format is to allow a simple XML format that is mostly human readable. The generation and parsing of the various data types are done through the TypeConverter classes associated with the data types. Example: ... ado.net/XML headers & schema ... <resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="version">2.0</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> <value>[base64 mime encoded serialized .NET Framework object]</value> </data> <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> <comment>This is a comment</comment> </data> There are any number of "resheader" rows that contain simple name/value pairs. Each data row contains a name, and value. The row also contains a type or mimetype. Type corresponds to a .NET class that support text/value conversion through the TypeConverter architecture. Classes that don't support this are serialized and stored with the mimetype set. The mimetype is used for serialized objects, and tells the ResXResourceReader how to depersist the object. This is currently not extensible. For a given mimetype the value must be set accordingly: Note - application/x-microsoft.net.object.binary.base64 is the format that the ResXResourceWriter will generate, however the reader can read any of the formats listed below. mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Soap.SoapFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.bytearray.base64 value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> <xsd:choice maxOccurs="unbounded"> <xsd:element name="metadata"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" /> </xsd:sequence> <xsd:attribute name="name" use="required" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string" /> <xsd:attribute name="mimetype" type="xsd:string" /> <xsd:attribute ref="xml:space" /> </xsd:complexType> </xsd:element> <xsd:element name="assembly"> <xsd:complexType> <xsd:attribute name="alias" type="xsd:string" /> <xsd:attribute name="name" type="xsd:string" /> </xsd:complexType> </xsd:element> <xsd:element name="data"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> <xsd:attribute ref="xml:space" /> </xsd:complexType> </xsd:element> <xsd:element name="resheader"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> </xsd:complexType> </xsd:element> </xsd:schema> <resheader name="resmimetype"> <value>text/microsoft-resx</value> </resheader> <resheader name="version"> <value>2.0</value> </resheader> <resheader name="reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> </root>
