DevApp/Gs.DevApp/App.config
@@ -28,9 +28,9 @@ </assemblyBinding> </runtime> <appSettings> <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> <add key="WebApiUrl" value="http://192.168.1.145:8081/" /> <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> <add key="WebApiUrl" value="http://localhost:5263/" /> <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />--> <add key="WebApiUrl" value="http://192.168.1.145:81/" /> <add key="LogPath" value="logs" /> <add key="ProductName" value="G-MES V2.0" /> <add key="PageSize" value="50" /> DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
@@ -355,6 +355,12 @@ MsgHelper.ShowError("申请数量不能为空！"); return; } _msl = row["remark"].ToString(); if (string.IsNullOrEmpty(_msl)) { MsgHelper.ShowError("申请备注不能为空！"); return; } _obj.list.Add(new { Guid = _guid, DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -43,6 +43,8 @@ this.barPwd = new DevExpress.XtraBars.BarButtonItem(); this.barMsg = new DevExpress.XtraBars.BarListItem(); this.barMsgXf = new DevExpress.XtraBars.BarButtonItem(); this.barOrg = new DevExpress.XtraBars.BarEditItem(); this.repositoryItemCheckedComboBoxEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit(); this.fdm1 = new DevExpress.XtraBars.FluentDesignSystem.FluentFormDefaultManager(this.components); this.acrd = new DevExpress.XtraBars.Navigation.AccordionControl(); this.cms1 = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -52,6 +54,7 @@ ((System.ComponentModel.ISupportInitialize)(this.tab)).BeginInit(); this.strp1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckedComboBoxEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.fdm1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.acrd)).BeginInit(); this.cms1.SuspendLayout(); @@ -119,16 +122,20 @@ this.barExit, this.barPwd, this.barMsg, this.barMsgXf}); this.barMsgXf, this.barOrg}); this.fluentDesignFormControl1.Location = new System.Drawing.Point(0, 0); this.fluentDesignFormControl1.Manager = this.fdm1; this.fluentDesignFormControl1.Name = "fluentDesignFormControl1"; this.fluentDesignFormControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckedComboBoxEdit1}); this.fluentDesignFormControl1.Size = new System.Drawing.Size(1230, 39); this.fluentDesignFormControl1.TabIndex = 2; this.fluentDesignFormControl1.TabStop = false; this.fluentDesignFormControl1.TitleItemLinks.Add(this.barMy); this.fluentDesignFormControl1.TitleItemLinks.Add(this.barMsgXf); this.fluentDesignFormControl1.TitleItemLinks.Add(this.barMsg); this.fluentDesignFormControl1.TitleItemLinks.Add(this.barOrg); // // barMy // @@ -173,6 +180,24 @@ this.barMsgXf.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barMsgXf.ImageOptions.LargeImage"))); this.barMsgXf.Name = "barMsgXf"; // // barOrg // this.barOrg.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right; this.barOrg.Caption = "切换组织"; this.barOrg.Edit = this.repositoryItemCheckedComboBoxEdit1; this.barOrg.EditWidth = 150; this.barOrg.Id = 37; this.barOrg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.usergroup_16x161; this.barOrg.Name = "barOrg"; this.barOrg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph; // // repositoryItemCheckedComboBoxEdit1 // this.repositoryItemCheckedComboBoxEdit1.AutoHeight = false; this.repositoryItemCheckedComboBoxEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemCheckedComboBoxEdit1.Name = "repositoryItemCheckedComboBoxEdit1"; // // fdm1 // this.fdm1.Form = this; @@ -181,8 +206,11 @@ this.barExit, this.barPwd, this.barMsg, this.barMsgXf}); this.fdm1.MaxItemId = 37; this.barMsgXf, this.barOrg}); this.fdm1.MaxItemId = 38; this.fdm1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckedComboBoxEdit1}); // // acrd // @@ -244,6 +272,7 @@ this.strp1.ResumeLayout(false); this.strp1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.fluentDesignFormControl1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckedComboBoxEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.fdm1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.acrd)).EndInit(); this.cms1.ResumeLayout(false); @@ -269,6 +298,7 @@ private System.Windows.Forms.ToolStripMenuItem tabCloseCurrent; private System.Windows.Forms.ToolStripMenuItem tabCloseAll; private System.Windows.Forms.ToolStripStatusLabel toolZhiChi; private DevExpress.XtraBars.BarEditItem barOrg; private DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit repositoryItemCheckedComboBoxEdit1; } } DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -25,7 +25,7 @@ /// tab临时选项卡 /// </summary> private static readonly Dictionary<string, XtraTabPage> TabPageDic = new Dictionary<string, XtraTabPage>(); private string OldorgFids = ""; public FrmMain() { InitializeComponent(); @@ -59,6 +59,40 @@ catch (Exception) { } } }; GetOrg(); barOrg.EditValueChanged += (s, e) => { if (barOrg.EditValue == null) { Gs.DevApp.ToolBox.MsgHelper.ShowInformation("请选择你需要的组织！"); return; } string _val = barOrg.EditValue.ToString(); if (string.IsNullOrEmpty(_val)) { Gs.DevApp.ToolBox.MsgHelper.ShowInformation("请选择你需要的组织！"); return; } if (OldorgFids == _val) return; var _obj = new { edtUserGuid = LoginInfoModel.CurrentUser.LoginUserGuid, userGuid = LoginInfoModel.CurrentUser.LoginUserGuid, userOrgFids = _val, }; try { var strJson = UtilityHelper.HttpPost("", "User/SetUserOrg", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); MsgHelper.ShowInformation("提示：" + _rtn.rtnData.outMsg); } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); } }; } @@ -448,5 +482,27 @@ } #endregion private void GetOrg() { string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid; var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, " and IS_STATUS=1"); var json = JsonConvert.SerializeObject(pgq); try { var strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json); var _rtn = UtilityHelper.ReturnToTablePage(strReturn); var dt = _rtn.rtnData.list; repositoryItemCheckedComboBoxEdit1.DataSource = dt; repositoryItemCheckedComboBoxEdit1.DisplayMember = "name"; repositoryItemCheckedComboBoxEdit1.ValueMember = "fid"; var _obj = UtilityHelper.ReturnToDynamic(strReturn); barOrg.EditValue = _obj.rtnData.extendText; OldorgFids = _obj.rtnData.extendText; } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); } } } } DevApp/Gs.DevApp/DevFrm/FrmMain.resx
@@ -120,6 +120,9 @@ <metadata name="strp1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>284, 17</value> </metadata> <metadata name="strp1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>284, 17</value> </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="barMy.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -29,6 +29,7 @@ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick; toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick; toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick; toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick; toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick; this.toolBarMenu1.getXmlConfig(); Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips); @@ -54,6 +55,7 @@ btnIpt.Click += BtnIpt_Click; btnYcReport.Click += BtnYcReport_Click; } /// <summary> /// 批量录入 @@ -252,10 +254,10 @@ toolBarMenu1.guidKey = rowGuid; if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("请先选择你要操作的行！"); MsgHelper.ShowError("请先选择你要操作的行！"); return; } if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定提交检验吗？")) if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定提审核吗？")) return; if (txt_fcheckResu.Text.Trim() == _strTag) { @@ -275,9 +277,9 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); MsgHelper.Warning("提示：" + _rtn.rtnData.outMsg); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { MsgHelper.ShowInformation("提示：" + _rtn.rtnData.outMsg); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim(), "0"); @@ -287,14 +289,69 @@ int _inFieldValue = 1; UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString()); } else { MsgHelper.ShowError("提示：" + _rtn.rtnData.outMsg); } } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); MsgHelper.ShowError("提示：" + ex.Message); } } /// <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> @@ -430,7 +487,7 @@ var _obj = new { guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建 fngDesc = txt_fngDesc.TextTxt.Trim(), fngDesc = txt_fngDesc.TextTxt.Trim(), }; try { @@ -461,7 +518,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, "release_no", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
@@ -13,7 +13,7 @@ string _webServiceName = "MesQaItemsDetect01Manager/"; private string dt01Guid = ""; bool isEdit = false; string strBhg = "×"; /// <summary> /// /// </summary> @@ -25,10 +25,13 @@ this.dt01Guid = _dt01Guid; this.isEdit = _blEdit; Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1); getModel(); //编辑事件 gvMx1.CellValueChanged += GvMx1_CellValueChanged; //取消不符合条件的编辑 gvMx1.ShowingEditor += GvMx1_ShowingEditor; //禁用样本数之外的单元格且改变颜色 gvMx1.CustomDrawCell += GvMx1_CustomDrawCell; getModel(); } /// <summary> @@ -44,6 +47,10 @@ return false; if (_FieldName == "样本数") return true; if (_FieldName.Contains("jg")) return false; if (string.IsNullOrEmpty(_maxYbs)) return false; string _seqYb = _FieldName.Replace("样本", ""); @@ -52,25 +59,42 @@ return true; } /// <summary> /// 禁用样本数之外的单元格 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void GvMx1_CustomDrawCell(object sender, DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs e) { // 获取单元格的值 string _maxYbs = (gvMx1.GetRowCellValue(e.RowHandle, "样本数").ToString()); bool _bl = ckCol(e.Column.FieldName, _maxYbs); if (_bl) { e.Appearance.BackColor = Color.Azure; e.Appearance.BackColor = Color.LightBlue; e.Appearance.ForeColor = Color.Blue; e.Column.MinWidth = 50; } else { e.Appearance.BackColor = Color.LightGray; } e.Column.OptionsColumn.ReadOnly = !isEdit; if (e.Column.Name.Contains("样本") && e.Column.Name != "样本数") { object value = gvMx1.GetRowCellValue(e.RowHandle, e.Column + "jg"); if (value != null && value.ToString() == strBhg) { e.Appearance.BackColor = Color.Red; e.Appearance.ForeColor = Color.White; }; } } private void GvMx1_CellValueChanged(object sender, DevExpress.XtraGrid.Views.Base.CellValueChangedEventArgs e) { if (e.Column.FieldName.Contains("jg")) return; try { // 获取行句柄 @@ -110,11 +134,15 @@ Gs.DevApp.ToolBox.MsgHelper.ShowError(_outMsg); gvMx1.SetRowCellValue(rowHandle, dtCol, ""); } else { //如果不合格，存进去 string _outFstand = _rtn.rtnData.outFstand; gvMx1.SetRowCellValue(rowHandle, dtCol + "jg", _outFstand); } //如果是样本数，要重新刷新 if (_strYbNo == "样本数") getModel(); //lbGuid.Text = _rtn.rtnData.outGuid; //txt_hNo.Text = _rtn.rtnData.outNo; //toolBarMenu1.isSetBtn = true; } else ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg); @@ -132,7 +160,6 @@ bool _bl = ckCol(view.FocusedColumn.FieldName, _maxYbs); if (!_bl) e.Cancel = true; } private void getModel() @@ -156,6 +183,14 @@ gcMx1.DataSource = dt; gcMx1.ForceInitialize(); gvMx1.BestFitColumns(); // 隐藏不必要的列,同时把不合格的存进去 foreach (DataColumn col in dt.Columns) { if (col.ColumnName.Contains("jg")) { gvMx1.Columns[col.ColumnName].Visible = false; } } gvMx1.Columns["guid"].Visible = false; gvMx1.Columns["parentGuid"].Visible = false; } DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -246,7 +246,6 @@ this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn(); this.panMx98 = new System.Windows.Forms.Panel(); this.layoutMx98 = new DevExpress.XtraLayout.LayoutControl(); this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint(); this.txt_yQty98 = new DevExpress.XtraEditors.TextEdit(); @@ -272,7 +271,6 @@ this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn(); this.panMx100 = new System.Windows.Forms.Panel(); this.layMx100 = new DevExpress.XtraDataLayout.DataLayoutControl(); this.ucBtnPrint100 = new Gs.DevApp.UserControl.UcBtnPrint(); this.btnIn = new DevExpress.XtraEditors.SimpleButton(); @@ -290,6 +288,8 @@ this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage(); this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl(); this.splitMx100 = new DevExpress.XtraEditors.SplitContainerControl(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -399,7 +399,6 @@ this.xtraTabPage3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit(); this.panMx98.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).BeginInit(); this.layoutMx98.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).BeginInit(); @@ -417,7 +416,6 @@ this.xtraTabPage4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit(); this.panMx100.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layMx100)).BeginInit(); this.layMx100.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txt_zQty100.Properties)).BeginInit(); @@ -432,6 +430,18 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit(); this.xtraTabPage5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).BeginInit(); this.splitMx98.Panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).BeginInit(); this.splitMx98.Panel2.SuspendLayout(); this.splitMx98.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitMx100)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel1)).BeginInit(); this.splitMx100.Panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel2)).BeginInit(); this.splitMx100.Panel2.SuspendLayout(); this.splitMx100.SuspendLayout(); this.SuspendLayout(); // // toolBarMenu1 @@ -2502,8 +2512,7 @@ // // xtraTabPage3 // this.xtraTabPage3.Controls.Add(this.gcMx3); this.xtraTabPage3.Controls.Add(this.panMx98); this.xtraTabPage3.Controls.Add(this.splitMx98); this.xtraTabPage3.Name = "xtraTabPage3"; this.xtraTabPage3.Size = new System.Drawing.Size(1648, 481); this.xtraTabPage3.Text = "追溯码明细"; @@ -2511,10 +2520,10 @@ // gcMx3 // this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill; this.gcMx3.Location = new System.Drawing.Point(0, 54); this.gcMx3.Location = new System.Drawing.Point(0, 0); this.gcMx3.MainView = this.gvMx3; this.gcMx3.Name = "gcMx3"; this.gcMx3.Size = new System.Drawing.Size(1648, 427); this.gcMx3.Size = new System.Drawing.Size(1648, 417); this.gcMx3.TabIndex = 1; this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx3}); @@ -2633,15 +2642,6 @@ this.gridColumn35.VisibleIndex = 6; this.gridColumn35.Width = 94; // // panMx98 // this.panMx98.Controls.Add(this.layoutMx98); this.panMx98.Dock = System.Windows.Forms.DockStyle.Top; this.panMx98.Location = new System.Drawing.Point(0, 0); this.panMx98.Name = "panMx98"; this.panMx98.Size = new System.Drawing.Size(1648, 54); this.panMx98.TabIndex = 0; // // layoutMx98 // this.layoutMx98.Controls.Add(this.ucBtnPrint98); @@ -2655,7 +2655,7 @@ this.layoutMx98.Name = "layoutMx98"; this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(96, 558, 812, 500); this.layoutMx98.Root = this.layoutControlGroup2; this.layoutMx98.Size = new System.Drawing.Size(1648, 54); this.layoutMx98.Size = new System.Drawing.Size(1648, 52); this.layoutMx98.TabIndex = 0; this.layoutMx98.Text = "layoutControl1"; // @@ -2666,7 +2666,7 @@ this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint98.Name = "ucBtnPrint98"; this.ucBtnPrint98.rptParameter = null; this.ucBtnPrint98.Size = new System.Drawing.Size(271, 34); this.ucBtnPrint98.Size = new System.Drawing.Size(271, 32); this.ucBtnPrint98.TabIndex = 8; // // txt_yQty98 @@ -2748,7 +2748,7 @@ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition10}); this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 54); this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 52); this.layoutControlGroup2.TextVisible = false; // // layoutControlItem34 @@ -2758,7 +2758,7 @@ this.layoutControlItem34.Name = "layoutControlItem34"; this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 5; this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0); this.layoutControlItem34.Size = new System.Drawing.Size(273, 34); this.layoutControlItem34.Size = new System.Drawing.Size(273, 32); this.layoutControlItem34.Text = "打印按钮"; this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem34.TextVisible = false; @@ -2769,7 +2769,7 @@ this.layoutControlItem33.Location = new System.Drawing.Point(1084, 0); this.layoutControlItem33.Name = "layoutControlItem33"; this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 4; this.layoutControlItem33.Size = new System.Drawing.Size(271, 34); this.layoutControlItem33.Size = new System.Drawing.Size(271, 32); this.layoutControlItem33.Text = "本次打印张数"; this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18); // @@ -2779,7 +2779,7 @@ this.layoutControlItem32.Location = new System.Drawing.Point(813, 0); this.layoutControlItem32.Name = "layoutControlItem32"; this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem32.Size = new System.Drawing.Size(271, 34); this.layoutControlItem32.Size = new System.Drawing.Size(271, 32); this.layoutControlItem32.Text = "打印备注"; this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18); // @@ -2789,7 +2789,7 @@ this.layoutControlItem31.Location = new System.Drawing.Point(542, 0); this.layoutControlItem31.Name = "layoutControlItem31"; this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem31.Size = new System.Drawing.Size(271, 34); this.layoutControlItem31.Size = new System.Drawing.Size(271, 32); this.layoutControlItem31.Text = "可打印数量"; this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18); // @@ -2799,7 +2799,7 @@ this.layoutControlItem30.Location = new System.Drawing.Point(271, 0); this.layoutControlItem30.Name = "layoutControlItem30"; this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem30.Size = new System.Drawing.Size(271, 34); this.layoutControlItem30.Size = new System.Drawing.Size(271, 32); this.layoutControlItem30.Text = "已打印数量"; this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18); // @@ -2808,14 +2808,13 @@ this.layoutControlItem37.Control = this.txt_zQty98; this.layoutControlItem37.Location = new System.Drawing.Point(0, 0); this.layoutControlItem37.Name = "layoutControlItem37"; this.layoutControlItem37.Size = new System.Drawing.Size(271, 34); this.layoutControlItem37.Size = new System.Drawing.Size(271, 32); this.layoutControlItem37.Text = "工单总量"; this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18); // // xtraTabPage4 // this.xtraTabPage4.Controls.Add(this.gcMx4); this.xtraTabPage4.Controls.Add(this.panMx100); this.xtraTabPage4.Controls.Add(this.splitMx100); this.xtraTabPage4.Name = "xtraTabPage4"; this.xtraTabPage4.Size = new System.Drawing.Size(1648, 481); this.xtraTabPage4.Text = "后盖码明细"; @@ -2823,10 +2822,10 @@ // gcMx4 // this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill; this.gcMx4.Location = new System.Drawing.Point(0, 56); this.gcMx4.Location = new System.Drawing.Point(0, 0); this.gcMx4.MainView = this.gvMx4; this.gcMx4.Name = "gcMx4"; this.gcMx4.Size = new System.Drawing.Size(1648, 425); this.gcMx4.Size = new System.Drawing.Size(1648, 417); this.gcMx4.TabIndex = 2; this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx4}); @@ -2945,15 +2944,6 @@ this.gridColumn48.VisibleIndex = 6; this.gridColumn48.Width = 94; // // panMx100 // this.panMx100.Controls.Add(this.layMx100); this.panMx100.Dock = System.Windows.Forms.DockStyle.Top; this.panMx100.Location = new System.Drawing.Point(0, 0); this.panMx100.Name = "panMx100"; this.panMx100.Size = new System.Drawing.Size(1648, 56); this.panMx100.TabIndex = 0; // // layMx100 // this.layMx100.Controls.Add(this.ucBtnPrint100); @@ -2967,24 +2957,24 @@ this.layMx100.Name = "layMx100"; this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(359, 336, 812, 500); this.layMx100.Root = this.layoutControlGroup4; this.layMx100.Size = new System.Drawing.Size(1648, 56); this.layMx100.Size = new System.Drawing.Size(1648, 52); this.layMx100.TabIndex = 2; this.layMx100.Text = "dataLayoutControl1"; // // ucBtnPrint100 // this.ucBtnPrint100.guidKey = null; this.ucBtnPrint100.Location = new System.Drawing.Point(1154, 12); this.ucBtnPrint100.Location = new System.Drawing.Point(1136, 12); this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0); this.ucBtnPrint100.Name = "ucBtnPrint100"; this.ucBtnPrint100.rptParameter = null; this.ucBtnPrint100.Size = new System.Drawing.Size(282, 32); this.ucBtnPrint100.Size = new System.Drawing.Size(279, 31); this.ucBtnPrint100.TabIndex = 0; // // btnIn // this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16; this.btnIn.Location = new System.Drawing.Point(1440, 12); this.btnIn.Location = new System.Drawing.Point(1419, 12); this.btnIn.Name = "btnIn"; this.btnIn.Size = new System.Drawing.Size(196, 27); this.btnIn.StyleController = this.layMx100; @@ -2996,33 +2986,33 @@ this.txt_zQty100.Location = new System.Drawing.Point(114, 12); this.txt_zQty100.Name = "txt_zQty100"; this.txt_zQty100.Properties.ReadOnly = true; this.txt_zQty100.Size = new System.Drawing.Size(178, 24); this.txt_zQty100.Size = new System.Drawing.Size(175, 24); this.txt_zQty100.StyleController = this.layMx100; this.txt_zQty100.TabIndex = 4; // // txt_yQty100 // this.txt_yQty100.Location = new System.Drawing.Point(398, 12); this.txt_yQty100.Location = new System.Drawing.Point(395, 12); this.txt_yQty100.Name = "txt_yQty100"; this.txt_yQty100.Properties.ReadOnly = true; this.txt_yQty100.Size = new System.Drawing.Size(180, 24); this.txt_yQty100.Size = new System.Drawing.Size(175, 24); this.txt_yQty100.StyleController = this.layMx100; this.txt_yQty100.TabIndex = 5; // // txt_kQty100 // this.txt_kQty100.Location = new System.Drawing.Point(684, 12); this.txt_kQty100.Location = new System.Drawing.Point(676, 12); this.txt_kQty100.Name = "txt_kQty100"; this.txt_kQty100.Properties.ReadOnly = true; this.txt_kQty100.Size = new System.Drawing.Size(180, 24); this.txt_kQty100.Size = new System.Drawing.Size(175, 24); this.txt_kQty100.StyleController = this.layMx100; this.txt_kQty100.TabIndex = 6; // // txt_iCount_100 // this.txt_iCount_100.Location = new System.Drawing.Point(970, 12); this.txt_iCount_100.Location = new System.Drawing.Point(957, 12); this.txt_iCount_100.Name = "txt_iCount_100"; this.txt_iCount_100.Size = new System.Drawing.Size(180, 24); this.txt_iCount_100.Size = new System.Drawing.Size(175, 24); this.txt_iCount_100.StyleController = this.layMx100; this.txt_iCount_100.TabIndex = 7; // @@ -3062,7 +3052,7 @@ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition11}); this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 56); this.layoutControlGroup4.Size = new System.Drawing.Size(1627, 55); this.layoutControlGroup4.TextVisible = false; // // layoutControlItem42 @@ -3070,17 +3060,17 @@ this.layoutControlItem42.Control = this.txt_zQty100; this.layoutControlItem42.Location = new System.Drawing.Point(0, 0); this.layoutControlItem42.Name = "layoutControlItem42"; this.layoutControlItem42.Size = new System.Drawing.Size(284, 36); this.layoutControlItem42.Size = new System.Drawing.Size(281, 35); this.layoutControlItem42.Text = "工单总量"; this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem43 // this.layoutControlItem43.Control = this.txt_yQty100; this.layoutControlItem43.Location = new System.Drawing.Point(284, 0); this.layoutControlItem43.Location = new System.Drawing.Point(281, 0); this.layoutControlItem43.Name = "layoutControlItem43"; this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem43.Size = new System.Drawing.Size(286, 36); this.layoutControlItem43.Size = new System.Drawing.Size(281, 35); this.layoutControlItem43.Text = "已打印数"; this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18); // @@ -3088,20 +3078,20 @@ // this.layoutControlItem44.Control = this.txt_kQty100; this.layoutControlItem44.CustomizationFormText = "可打印数"; this.layoutControlItem44.Location = new System.Drawing.Point(570, 0); this.layoutControlItem44.Location = new System.Drawing.Point(562, 0); this.layoutControlItem44.Name = "layoutControlItem44"; this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem44.Size = new System.Drawing.Size(286, 36); this.layoutControlItem44.Size = new System.Drawing.Size(281, 35); this.layoutControlItem44.Text = "可打印数字"; this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.btnIn; this.layoutControlItem2.Location = new System.Drawing.Point(1428, 0); this.layoutControlItem2.Location = new System.Drawing.Point(1407, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5; this.layoutControlItem2.Size = new System.Drawing.Size(200, 36); this.layoutControlItem2.Size = new System.Drawing.Size(200, 35); this.layoutControlItem2.Text = "导入按钮"; this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem2.TextVisible = false; @@ -3109,10 +3099,10 @@ // layoutControlItem10 // this.layoutControlItem10.Control = this.ucBtnPrint100; this.layoutControlItem10.Location = new System.Drawing.Point(1142, 0); this.layoutControlItem10.Location = new System.Drawing.Point(1124, 0); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4; this.layoutControlItem10.Size = new System.Drawing.Size(286, 36); this.layoutControlItem10.Size = new System.Drawing.Size(283, 35); this.layoutControlItem10.Text = "打印按钮"; this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem10.TextVisible = false; @@ -3120,10 +3110,10 @@ // layoutControlItem45 // this.layoutControlItem45.Control = this.txt_iCount_100; this.layoutControlItem45.Location = new System.Drawing.Point(856, 0); this.layoutControlItem45.Location = new System.Drawing.Point(843, 0); this.layoutControlItem45.Name = "layoutControlItem45"; this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem45.Size = new System.Drawing.Size(286, 36); this.layoutControlItem45.Size = new System.Drawing.Size(281, 35); this.layoutControlItem45.Text = "本次打印张数"; this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18); // @@ -3143,6 +3133,48 @@ this.ucBtnPrint101.rptParameter = null; this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32); this.ucBtnPrint101.TabIndex = 0; // // splitMx98 // this.splitMx98.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx98.Horizontal = false; this.splitMx98.Location = new System.Drawing.Point(0, 0); this.splitMx98.Name = "splitMx98"; // // splitMx98.splitMx98_Panel1 // this.splitMx98.Panel1.Controls.Add(this.layoutMx98); this.splitMx98.Panel1.Text = "Panel1"; // // splitMx98.splitMx98_Panel2 // this.splitMx98.Panel2.Controls.Add(this.gcMx3); this.splitMx98.Panel2.Text = "Panel2"; this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx98.Size = new System.Drawing.Size(1648, 481); this.splitMx98.SplitterPosition = 52; this.splitMx98.TabIndex = 2; // // splitMx100 // this.splitMx100.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx100.Horizontal = false; this.splitMx100.Location = new System.Drawing.Point(0, 0); this.splitMx100.Name = "splitMx100"; // // splitMx100.splitMx100_Panel1 // this.splitMx100.Panel1.Controls.Add(this.layMx100); this.splitMx100.Panel1.Text = "Panel1"; // // splitMx100.splitMx100_Panel2 // this.splitMx100.Panel2.Controls.Add(this.gcMx4); this.splitMx100.Panel2.Text = "Panel2"; this.splitMx100.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx100.Size = new System.Drawing.Size(1648, 481); this.splitMx100.SplitterPosition = 52; this.splitMx100.TabIndex = 3; // // Frm_Womdaa // @@ -3262,7 +3294,6 @@ this.xtraTabPage3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit(); this.panMx98.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).EndInit(); this.layoutMx98.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).EndInit(); @@ -3280,7 +3311,6 @@ this.xtraTabPage4.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit(); this.panMx100.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layMx100)).EndInit(); this.layMx100.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.txt_zQty100.Properties)).EndInit(); @@ -3295,6 +3325,18 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit(); this.xtraTabPage5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).EndInit(); this.splitMx98.Panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).EndInit(); this.splitMx98.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).EndInit(); this.splitMx98.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel1)).EndInit(); this.splitMx100.Panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel2)).EndInit(); this.splitMx100.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitMx100)).EndInit(); this.splitMx100.ResumeLayout(false); this.ResumeLayout(false); } @@ -3437,7 +3479,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn38; private DevExpress.XtraGrid.Columns.GridColumn gridColumn42; private DevExpress.XtraGrid.Columns.GridColumn gridColumn43; private System.Windows.Forms.Panel panMx98; private DevExpress.XtraLayout.LayoutControl layoutMx98; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2; private UserControl.UcBtnPrint ucBtnPrint98; @@ -3455,7 +3496,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; private DevExpress.XtraTab.XtraTabPage xtraTabPage4; private System.Windows.Forms.Panel panMx100; private DevExpress.XtraGrid.GridControl gcMx4; private DevExpress.XtraGrid.Views.Grid.GridView gvMx4; private DevExpress.XtraGrid.Columns.GridColumn gridColumn39; @@ -3520,5 +3560,7 @@ private UserControl.UcBtnPrint ucBtnPrint101; private DevExpress.XtraEditors.CheckEdit txt_isQiTao; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem46; private DevExpress.XtraEditors.SplitContainerControl splitMx98; private DevExpress.XtraEditors.SplitContainerControl splitMx100; } } DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
@@ -410,7 +410,8 @@ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem24, this.layoutControlItem2, this.layoutControlItem16}); this.layoutControlItem16, this.layoutControlItem9}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(168, 334, 812, 500); @@ -704,7 +705,6 @@ this.layoutControlItem23, this.layoutControlItem22, this.layoutControlItem8, this.layoutControlItem9, this.layoutControlItem4, this.layoutControlItem12, this.layoutControlItem15, DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -267,6 +267,7 @@ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("生效日期不能为空！"); txt_fBegDate.Focus(); return; } txt_fEndDate.DateTime= new DateTime(2099, 1, 1); if (txt_fEndDate.Text.Length > 0 && txt_fBegDate.DateTime > txt_fEndDate.DateTime) { Gs.DevApp.ToolBox.MsgHelper.ShowInformation("生效日期不能大于失效日期！"); DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -347,6 +347,12 @@ <Compile Include="DevFrm\FQC\UcChouJianList.Designer.cs"> <DependentUpon>UcChouJianList.cs</DependentUpon> </Compile> <Compile Include="DevFrm\FrmMain.cs"> <SubType>Form</SubType> </Compile> <Compile Include="DevFrm\FrmMain.Designer.cs"> <DependentUpon>FrmMain.cs</DependentUpon> </Compile> <Compile Include="DevFrm\IPQC\Frm_XunJianDetect01Show.cs"> <SubType>Form</SubType> </Compile> @@ -674,12 +680,6 @@ </Compile> <Compile Include="DevFrm\FrmLogin.Designer.cs"> <DependentUpon>FrmLogin.cs</DependentUpon> </Compile> <Compile Include="DevFrm\FrmMain.cs"> <SubType>Form</SubType> </Compile> <Compile Include="DevFrm\FrmMain.Designer.cs"> <DependentUpon>FrmMain.cs</DependentUpon> </Compile> <Compile Include="DevFrm\Sys\DocNoRule.cs"> <SubType>Form</SubType> @@ -2058,6 +2058,8 @@ <None Include="Resources\copy_16x16.png" /> <None Include="Resources\exporttoxls_16x16.png" /> <None Include="Resources\historyitem_16x16.png" /> <None Include="Resources\usergroup_16x16.png" /> <None Include="Resources\usergroup_16x161.png" /> <Content Include="Resources\user_16x16.png" /> </ItemGroup> <ItemGroup /> DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -2673,6 +2673,26 @@ /// <summary> /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// </summary> internal static System.Drawing.Bitmap usergroup_16x16 { get { object obj = ResourceManager.GetObject("usergroup_16x16", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// <summary> /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// </summary> internal static System.Drawing.Bitmap usergroup_16x161 { get { object obj = ResourceManager.GetObject("usergroup_16x161", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// <summary> /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// </summary> internal static System.Drawing.Bitmap usergroup_32x32 { get { object obj = ResourceManager.GetObject("usergroup_32x32", resourceCulture); DevApp/Gs.DevApp/Properties/Resources.resx
@@ -300,10 +300,8 @@ <data name="printarea_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\printarea_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="radiobuttons_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\radiobuttons_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <data name="historyitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\historyitem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="boresume_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\boresume_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -320,9 +318,6 @@ <value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="sendpdf_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\sendpdf_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -413,6 +408,11 @@ </data> <data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="radiobuttons_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\radiobuttons_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="lookup&reference_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\lookup&reference_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -571,6 +571,9 @@ <data name="boperson_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\boperson_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="usergroup_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\usergroup_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="chartswitchrowcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\chartswitchrowcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -586,6 +589,11 @@ </data> <data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\group_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -733,6 +741,9 @@ <data name="defaultprinter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\defaultprinter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="usergroup_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\usergroup_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, @@ -740,9 +751,6 @@ </data> <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> </data> <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -895,10 +903,8 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\group_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="bodetails_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\bodetails_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> @@ -915,6 +921,11 @@ </data> <data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\task_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> @@ -1104,10 +1115,8 @@ System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap, @@ -1121,8 +1130,5 @@ <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="historyitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\historyitem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> </root> DevApp/Gs.DevApp/Resources/usergroup_16x16.png
@@ -333,7 +333,7 @@ // // btnJianYan // this.btnJianYan.Caption = "提交检验"; 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; @@ -343,7 +343,7 @@ // // btnFjianYan // this.btnFjianYan.Caption = "撤回检验"; 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;
