From 0d47c140ab1b6f396c194e0f1a63e8cbb1508cf4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 17 一月 2025 22:10:38 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs | 16 +-
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 56 +++++++
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 18 +-
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 31 ++-
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 294 ++++++++++++++++++++++--------------
DevApp/Gs.DevApp/DevFrm/FrmMain.resx | 3
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | 2
8 files changed, 287 insertions(+), 137 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
index c8583c8..ec31df2 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -321,6 +321,10 @@
//
// acrd
//
+ this.acrd.Appearance.Item.Hovered.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.acrd.Appearance.Item.Hovered.ForeColor = System.Drawing.Color.Blue;
+ this.acrd.Appearance.Item.Hovered.Options.UseFont = true;
+ this.acrd.Appearance.Item.Hovered.Options.UseForeColor = true;
this.acrd.Dock = System.Windows.Forms.DockStyle.Left;
this.acrd.FilterText = "鏌ユ壘";
this.acrd.Location = new System.Drawing.Point(0, 39);
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index 75f3b53..3d76dde 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -24,7 +24,6 @@
{
private static readonly Dictionary<string, XtraTabPage> TabPageDic =
new Dictionary<string, XtraTabPage>();
-
public FrmMain()
{
InitializeComponent();
@@ -77,15 +76,16 @@
}
var _obj = new
{
+ edtUserGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
- ortFids = _val,
+ userOrgFids = _val,
};
try
{
- var strJson = UtilityHelper.HttpPost("", "User/UserOrg",
+ var strJson = UtilityHelper.HttpPost("", "User/SetUserOrg",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
}
catch (Exception ex)
{
@@ -371,7 +371,6 @@
MsgHelper.ShowError("璇锋鏌ユ槸鍚﹀紑閫氫簡璇ユā鍧楋紒");
return null;
}
-
newForm.FormBorderStyle = FormBorderStyle.None;
newForm.TopLevel = false;
newForm.ControlBox = false;
@@ -411,16 +410,19 @@
}
private void GetOrg()
{
- var pgq = new PageQueryModel(1, 999999, "FID", "asc", "", " and IS_STATUS=1");
+ 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;
+ 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;
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.resx b/DevApp/Gs.DevApp/DevFrm/FrmMain.resx
index 35e4e5a..8332948 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.resx
+++ b/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="DevExpress.Data.v22.2" name="DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="barSubItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index 1d9b506..376dfa1 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -125,19 +125,26 @@
this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx1flevelS1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx1flevelS2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx1flevelS3 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx1flevelS4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.repositoryItemComboBox5 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx1flevelI = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.repositoryItemComboBox6 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx1flevelIi = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.repositoryItemComboBox7 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx1flevelIii = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ this.repositoryItemComboBox8 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gvMx1memo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
@@ -204,6 +211,13 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckdate.Properties)).BeginInit();
@@ -235,27 +249,6 @@
this.repositoryItemComboBox1.AutoHeight = false;
this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox1.Items.AddRange(new object[] {
- "A",
- "B",
- "C",
- "D",
- "E",
- "F",
- "G",
- "H",
- "I",
- "J",
- "K",
- "L",
- "M",
- "N",
- "O",
- "P",
- "Q",
- "R",
- "S",
- "T"});
this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
//
// tabMxPage2
@@ -330,7 +323,7 @@
this.gridBand19.Columns.Add(this.gvMx2aql1Id);
this.gridBand19.Name = "gridBand19";
this.gridBand19.VisibleIndex = 0;
- this.gridBand19.Width = 81;
+ this.gridBand19.Width = 114;
//
// gvMx2fsampleSizeWord
//
@@ -338,11 +331,11 @@
this.gvMx2fsampleSizeWord.AppearanceCell.Options.UseFont = true;
this.gvMx2fsampleSizeWord.Caption = "鏍锋湰澶у皬";
this.gvMx2fsampleSizeWord.FieldName = "fsampleSizeWord";
- this.gvMx2fsampleSizeWord.MinWidth = 50;
+ this.gvMx2fsampleSizeWord.MinWidth = 80;
this.gvMx2fsampleSizeWord.Name = "gvMx2fsampleSizeWord";
this.gvMx2fsampleSizeWord.Tag = "yz_quantity_0_edit";
this.gvMx2fsampleSizeWord.Visible = true;
- this.gvMx2fsampleSizeWord.Width = 81;
+ this.gvMx2fsampleSizeWord.Width = 114;
//
// gvMx2guid
//
@@ -374,7 +367,7 @@
this.gridBand20.Columns.Add(this.gvMx2sampleSizeWord);
this.gridBand20.Name = "gridBand20";
this.gridBand20.VisibleIndex = 1;
- this.gridBand20.Width = 100;
+ this.gridBand20.Width = 110;
//
// gvMx2sampleSizeWord
//
@@ -387,7 +380,7 @@
this.gvMx2sampleSizeWord.Name = "gvMx2sampleSizeWord";
this.gvMx2sampleSizeWord.Tag = "edit";
this.gvMx2sampleSizeWord.Visible = true;
- this.gvMx2sampleSizeWord.Width = 100;
+ this.gvMx2sampleSizeWord.Width = 110;
//
// gridBand21
//
@@ -414,7 +407,7 @@
this.gridBand21.ImageOptions.Alignment = System.Drawing.StringAlignment.Center;
this.gridBand21.Name = "gridBand21";
this.gridBand21.VisibleIndex = 2;
- this.gridBand21.Width = 800;
+ this.gridBand21.Width = 1280;
//
// gridBand30
//
@@ -422,7 +415,7 @@
this.gridBand30.Columns.Add(this.gvMx2aql00010);
this.gridBand30.Name = "gridBand30";
this.gridBand30.VisibleIndex = 0;
- this.gridBand30.Width = 50;
+ this.gridBand30.Width = 80;
//
// gvMx2aql00010
//
@@ -434,7 +427,7 @@
this.gvMx2aql00010.Name = "gvMx2aql00010";
this.gvMx2aql00010.Tag = "yz_quantity_0_edit";
this.gvMx2aql00010.Visible = true;
- this.gvMx2aql00010.Width = 50;
+ this.gvMx2aql00010.Width = 80;
//
// gridBand29
//
@@ -442,7 +435,7 @@
this.gridBand29.Columns.Add(this.gvMx2aql00015);
this.gridBand29.Name = "gridBand29";
this.gridBand29.VisibleIndex = 1;
- this.gridBand29.Width = 50;
+ this.gridBand29.Width = 80;
//
// gvMx2aql00015
//
@@ -454,7 +447,7 @@
this.gvMx2aql00015.Name = "gvMx2aql00015";
this.gvMx2aql00015.Tag = "yz_quantity_0_edit";
this.gvMx2aql00015.Visible = true;
- this.gvMx2aql00015.Width = 50;
+ this.gvMx2aql00015.Width = 80;
//
// gridBand28
//
@@ -462,7 +455,7 @@
this.gridBand28.Columns.Add(this.gvMx2aql00025);
this.gridBand28.Name = "gridBand28";
this.gridBand28.VisibleIndex = 2;
- this.gridBand28.Width = 50;
+ this.gridBand28.Width = 80;
//
// gvMx2aql00025
//
@@ -474,7 +467,7 @@
this.gvMx2aql00025.Name = "gvMx2aql00025";
this.gvMx2aql00025.Tag = "yz_quantity_0_edit";
this.gvMx2aql00025.Visible = true;
- this.gvMx2aql00025.Width = 50;
+ this.gvMx2aql00025.Width = 80;
//
// gridBand27
//
@@ -482,7 +475,7 @@
this.gridBand27.Columns.Add(this.gvMx2aql00040);
this.gridBand27.Name = "gridBand27";
this.gridBand27.VisibleIndex = 3;
- this.gridBand27.Width = 50;
+ this.gridBand27.Width = 80;
//
// gvMx2aql00040
//
@@ -494,7 +487,7 @@
this.gvMx2aql00040.Name = "gvMx2aql00040";
this.gvMx2aql00040.Tag = "yz_quantity_0_edit";
this.gvMx2aql00040.Visible = true;
- this.gvMx2aql00040.Width = 50;
+ this.gvMx2aql00040.Width = 80;
//
// gridBand26
//
@@ -502,7 +495,7 @@
this.gridBand26.Columns.Add(this.gvMx2aql00065);
this.gridBand26.Name = "gridBand26";
this.gridBand26.VisibleIndex = 4;
- this.gridBand26.Width = 50;
+ this.gridBand26.Width = 80;
//
// gvMx2aql00065
//
@@ -514,7 +507,7 @@
this.gvMx2aql00065.Name = "gvMx2aql00065";
this.gvMx2aql00065.Tag = "yz_quantity_0_edit";
this.gvMx2aql00065.Visible = true;
- this.gvMx2aql00065.Width = 50;
+ this.gvMx2aql00065.Width = 80;
//
// gridBand25
//
@@ -522,7 +515,7 @@
this.gridBand25.Columns.Add(this.gvMx2aql0010);
this.gridBand25.Name = "gridBand25";
this.gridBand25.VisibleIndex = 5;
- this.gridBand25.Width = 50;
+ this.gridBand25.Width = 80;
//
// gvMx2aql0010
//
@@ -534,7 +527,7 @@
this.gvMx2aql0010.Name = "gvMx2aql0010";
this.gvMx2aql0010.Tag = "yz_quantity_0_edit";
this.gvMx2aql0010.Visible = true;
- this.gvMx2aql0010.Width = 50;
+ this.gvMx2aql0010.Width = 80;
//
// gridBand33
//
@@ -542,7 +535,7 @@
this.gridBand33.Columns.Add(this.gvMx2aql0015);
this.gridBand33.Name = "gridBand33";
this.gridBand33.VisibleIndex = 6;
- this.gridBand33.Width = 50;
+ this.gridBand33.Width = 80;
//
// gvMx2aql0015
//
@@ -554,7 +547,7 @@
this.gvMx2aql0015.Name = "gvMx2aql0015";
this.gvMx2aql0015.Tag = "yz_quantity_0_edit";
this.gvMx2aql0015.Visible = true;
- this.gvMx2aql0015.Width = 50;
+ this.gvMx2aql0015.Width = 80;
//
// gridBand32
//
@@ -562,7 +555,7 @@
this.gridBand32.Columns.Add(this.gvMx2aql0025);
this.gridBand32.Name = "gridBand32";
this.gridBand32.VisibleIndex = 7;
- this.gridBand32.Width = 50;
+ this.gridBand32.Width = 80;
//
// gvMx2aql0025
//
@@ -574,7 +567,7 @@
this.gvMx2aql0025.Name = "gvMx2aql0025";
this.gvMx2aql0025.Tag = "yz_quantity_0_edit";
this.gvMx2aql0025.Visible = true;
- this.gvMx2aql0025.Width = 50;
+ this.gvMx2aql0025.Width = 80;
//
// gridBand31
//
@@ -582,7 +575,7 @@
this.gridBand31.Columns.Add(this.gvMx2aql0040);
this.gridBand31.Name = "gridBand31";
this.gridBand31.VisibleIndex = 8;
- this.gridBand31.Width = 50;
+ this.gridBand31.Width = 80;
//
// gvMx2aql0040
//
@@ -594,7 +587,7 @@
this.gvMx2aql0040.Name = "gvMx2aql0040";
this.gvMx2aql0040.Tag = "yz_quantity_0_edit";
this.gvMx2aql0040.Visible = true;
- this.gvMx2aql0040.Width = 50;
+ this.gvMx2aql0040.Width = 80;
//
// gridBand36
//
@@ -602,7 +595,7 @@
this.gridBand36.Columns.Add(this.gvMx2aql0065);
this.gridBand36.Name = "gridBand36";
this.gridBand36.VisibleIndex = 9;
- this.gridBand36.Width = 50;
+ this.gridBand36.Width = 80;
//
// gvMx2aql0065
//
@@ -614,7 +607,7 @@
this.gvMx2aql0065.Name = "gvMx2aql0065";
this.gvMx2aql0065.Tag = "yz_quantity_0_edit";
this.gvMx2aql0065.Visible = true;
- this.gvMx2aql0065.Width = 50;
+ this.gvMx2aql0065.Width = 80;
//
// gridBand35
//
@@ -622,7 +615,7 @@
this.gridBand35.Columns.Add(this.gvMx2aql0100);
this.gridBand35.Name = "gridBand35";
this.gridBand35.VisibleIndex = 10;
- this.gridBand35.Width = 50;
+ this.gridBand35.Width = 80;
//
// gvMx2aql0100
//
@@ -634,7 +627,7 @@
this.gvMx2aql0100.Name = "gvMx2aql0100";
this.gvMx2aql0100.Tag = "yz_quantity_0_edit";
this.gvMx2aql0100.Visible = true;
- this.gvMx2aql0100.Width = 50;
+ this.gvMx2aql0100.Width = 80;
//
// gridBand38
//
@@ -642,7 +635,7 @@
this.gridBand38.Columns.Add(this.gvMx2aql0150);
this.gridBand38.Name = "gridBand38";
this.gridBand38.VisibleIndex = 11;
- this.gridBand38.Width = 50;
+ this.gridBand38.Width = 80;
//
// gvMx2aql0150
//
@@ -654,7 +647,7 @@
this.gvMx2aql0150.Name = "gvMx2aql0150";
this.gvMx2aql0150.Tag = "yz_quantity_0_edit";
this.gvMx2aql0150.Visible = true;
- this.gvMx2aql0150.Width = 50;
+ this.gvMx2aql0150.Width = 80;
//
// gridBand34
//
@@ -662,7 +655,7 @@
this.gridBand34.Columns.Add(this.gvMx2aql0250);
this.gridBand34.Name = "gridBand34";
this.gridBand34.VisibleIndex = 12;
- this.gridBand34.Width = 50;
+ this.gridBand34.Width = 80;
//
// gvMx2aql0250
//
@@ -674,7 +667,7 @@
this.gvMx2aql0250.Name = "gvMx2aql0250";
this.gvMx2aql0250.Tag = "yz_quantity_0_edit";
this.gvMx2aql0250.Visible = true;
- this.gvMx2aql0250.Width = 50;
+ this.gvMx2aql0250.Width = 80;
//
// gridBand37
//
@@ -682,7 +675,7 @@
this.gridBand37.Columns.Add(this.gvMx2aql0400);
this.gridBand37.Name = "gridBand37";
this.gridBand37.VisibleIndex = 13;
- this.gridBand37.Width = 50;
+ this.gridBand37.Width = 80;
//
// gvMx2aql0400
//
@@ -694,7 +687,7 @@
this.gvMx2aql0400.Name = "gvMx2aql0400";
this.gvMx2aql0400.Tag = "yz_quantity_0_edit";
this.gvMx2aql0400.Visible = true;
- this.gvMx2aql0400.Width = 50;
+ this.gvMx2aql0400.Width = 80;
//
// gridBand24
//
@@ -702,7 +695,7 @@
this.gridBand24.Columns.Add(this.gvMx2aql0650);
this.gridBand24.Name = "gridBand24";
this.gridBand24.VisibleIndex = 14;
- this.gridBand24.Width = 50;
+ this.gridBand24.Width = 80;
//
// gvMx2aql0650
//
@@ -714,7 +707,7 @@
this.gvMx2aql0650.Name = "gvMx2aql0650";
this.gvMx2aql0650.Tag = "yz_quantity_0_edit";
this.gvMx2aql0650.Visible = true;
- this.gvMx2aql0650.Width = 50;
+ this.gvMx2aql0650.Width = 80;
//
// gridBand39
//
@@ -722,7 +715,7 @@
this.gridBand39.Columns.Add(this.gvMx2aql1000);
this.gridBand39.Name = "gridBand39";
this.gridBand39.VisibleIndex = 15;
- this.gridBand39.Width = 50;
+ this.gridBand39.Width = 80;
//
// gvMx2aql1000
//
@@ -730,11 +723,11 @@
this.gvMx2aql1000.AppearanceCell.Options.UseFont = true;
this.gvMx2aql1000.Caption = "10";
this.gvMx2aql1000.FieldName = "aql1000";
- this.gvMx2aql1000.MinWidth = 50;
+ this.gvMx2aql1000.MinWidth = 80;
this.gvMx2aql1000.Name = "gvMx2aql1000";
this.gvMx2aql1000.Tag = "yz_quantity_0_edit";
this.gvMx2aql1000.Visible = true;
- this.gvMx2aql1000.Width = 50;
+ this.gvMx2aql1000.Width = 80;
//
// gridBand22
//
@@ -742,7 +735,7 @@
this.gridBand22.Columns.Add(this.gvMx2memo);
this.gridBand22.Name = "gridBand22";
this.gridBand22.VisibleIndex = 3;
- this.gridBand22.Width = 100;
+ this.gridBand22.Width = 110;
//
// gvMx2memo
//
@@ -750,11 +743,11 @@
this.gvMx2memo.AppearanceCell.Options.UseFont = true;
this.gvMx2memo.Caption = "澶囨敞";
this.gvMx2memo.FieldName = "memo";
- this.gvMx2memo.MinWidth = 50;
+ this.gvMx2memo.MinWidth = 80;
this.gvMx2memo.Name = "gvMx2memo";
this.gvMx2memo.Tag = "edit";
this.gvMx2memo.Visible = true;
- this.gvMx2memo.Width = 100;
+ this.gvMx2memo.Width = 110;
//
// gridBand23
//
@@ -762,7 +755,7 @@
this.gridBand23.Columns.Add(this.gvMxDel2);
this.gridBand23.Name = "gridBand23";
this.gridBand23.VisibleIndex = 4;
- this.gridBand23.Width = 100;
+ this.gridBand23.Width = 113;
//
// gvMxDel2
//
@@ -771,7 +764,7 @@
this.gvMxDel2.MinWidth = 50;
this.gvMxDel2.Name = "gvMxDel2";
this.gvMxDel2.Visible = true;
- this.gvMxDel2.Width = 100;
+ this.gvMxDel2.Width = 113;
//
// repositoryItemButtonEdit2
//
@@ -1157,7 +1150,14 @@
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit1});
+ this.repositoryItemButtonEdit1,
+ this.repositoryItemComboBox2,
+ this.repositoryItemComboBox3,
+ this.repositoryItemComboBox4,
+ this.repositoryItemComboBox5,
+ this.repositoryItemComboBox6,
+ this.repositoryItemComboBox7,
+ this.repositoryItemComboBox8});
this.gcMx1.Size = new System.Drawing.Size(1124, 410);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1203,7 +1203,7 @@
this.gridBand2.Columns.Add(this.gvMx1lotFrom);
this.gridBand2.Name = "gridBand2";
this.gridBand2.VisibleIndex = 0;
- this.gridBand2.Width = 104;
+ this.gridBand2.Width = 113;
//
// gvMx1lotFrom
//
@@ -1211,11 +1211,11 @@
this.gvMx1lotFrom.AppearanceCell.Options.UseFont = true;
this.gvMx1lotFrom.Caption = "鎵归噺寮�濮�";
this.gvMx1lotFrom.FieldName = "lotFrom";
- this.gvMx1lotFrom.MinWidth = 50;
+ this.gvMx1lotFrom.MinWidth = 80;
this.gvMx1lotFrom.Name = "gvMx1lotFrom";
this.gvMx1lotFrom.Tag = "yz_quantity_0_edit";
this.gvMx1lotFrom.Visible = true;
- this.gvMx1lotFrom.Width = 104;
+ this.gvMx1lotFrom.Width = 113;
//
// gridBand3
//
@@ -1223,7 +1223,7 @@
this.gridBand3.Columns.Add(this.gvMx1lotTo);
this.gridBand3.Name = "gridBand3";
this.gridBand3.VisibleIndex = 1;
- this.gridBand3.Width = 104;
+ this.gridBand3.Width = 109;
//
// gvMx1lotTo
//
@@ -1231,11 +1231,11 @@
this.gvMx1lotTo.AppearanceCell.Options.UseFont = true;
this.gvMx1lotTo.Caption = "鎵归噺缁撴潫";
this.gvMx1lotTo.FieldName = "lotTo";
- this.gvMx1lotTo.MinWidth = 50;
+ this.gvMx1lotTo.MinWidth = 80;
this.gvMx1lotTo.Name = "gvMx1lotTo";
this.gvMx1lotTo.Tag = "yz_quantity_0_edit";
this.gvMx1lotTo.Visible = true;
- this.gvMx1lotTo.Width = 104;
+ this.gvMx1lotTo.Width = 109;
//
// gridBand4
//
@@ -1264,12 +1264,20 @@
this.gvMx1flevelS1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1flevelS1.AppearanceCell.Options.UseFont = true;
this.gvMx1flevelS1.Caption = "鐗规畩妫�楠屾按骞硘S-1";
+ this.gvMx1flevelS1.ColumnEdit = this.repositoryItemComboBox2;
this.gvMx1flevelS1.FieldName = "flevelS1";
- this.gvMx1flevelS1.MinWidth = 50;
+ this.gvMx1flevelS1.MinWidth = 80;
this.gvMx1flevelS1.Name = "gvMx1flevelS1";
this.gvMx1flevelS1.Tag = "edit";
this.gvMx1flevelS1.Visible = true;
this.gvMx1flevelS1.Width = 104;
+ //
+ // repositoryItemComboBox2
+ //
+ this.repositoryItemComboBox2.AutoHeight = false;
+ this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
//
// gridBand6
//
@@ -1284,12 +1292,20 @@
this.gvMx1flevelS2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1flevelS2.AppearanceCell.Options.UseFont = true;
this.gvMx1flevelS2.Caption = "鐗规畩妫�楠屾按骞硘S-2";
+ this.gvMx1flevelS2.ColumnEdit = this.repositoryItemComboBox3;
this.gvMx1flevelS2.FieldName = "flevelS2";
- this.gvMx1flevelS2.MinWidth = 50;
+ this.gvMx1flevelS2.MinWidth = 80;
this.gvMx1flevelS2.Name = "gvMx1flevelS2";
this.gvMx1flevelS2.Tag = "edit";
this.gvMx1flevelS2.Visible = true;
this.gvMx1flevelS2.Width = 104;
+ //
+ // repositoryItemComboBox3
+ //
+ this.repositoryItemComboBox3.AutoHeight = false;
+ this.repositoryItemComboBox3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox3.Name = "repositoryItemComboBox3";
//
// gridBand7
//
@@ -1304,12 +1320,20 @@
this.gvMx1flevelS3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1flevelS3.AppearanceCell.Options.UseFont = true;
this.gvMx1flevelS3.Caption = "鐗规畩妫�楠屾按骞硘S-3";
+ this.gvMx1flevelS3.ColumnEdit = this.repositoryItemComboBox4;
this.gvMx1flevelS3.FieldName = "flevelS3";
- this.gvMx1flevelS3.MinWidth = 50;
+ this.gvMx1flevelS3.MinWidth = 80;
this.gvMx1flevelS3.Name = "gvMx1flevelS3";
this.gvMx1flevelS3.Tag = "edit";
this.gvMx1flevelS3.Visible = true;
this.gvMx1flevelS3.Width = 104;
+ //
+ // repositoryItemComboBox4
+ //
+ this.repositoryItemComboBox4.AutoHeight = false;
+ this.repositoryItemComboBox4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox4.Name = "repositoryItemComboBox4";
//
// gridBand8
//
@@ -1324,12 +1348,20 @@
this.gvMx1flevelS4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1flevelS4.AppearanceCell.Options.UseFont = true;
this.gvMx1flevelS4.Caption = "鐗规畩妫�楠屾按骞硘S-4";
+ this.gvMx1flevelS4.ColumnEdit = this.repositoryItemComboBox5;
this.gvMx1flevelS4.FieldName = "flevelS4";
- this.gvMx1flevelS4.MinWidth = 50;
+ this.gvMx1flevelS4.MinWidth = 80;
this.gvMx1flevelS4.Name = "gvMx1flevelS4";
this.gvMx1flevelS4.Tag = "edit";
this.gvMx1flevelS4.Visible = true;
this.gvMx1flevelS4.Width = 104;
+ //
+ // repositoryItemComboBox5
+ //
+ this.repositoryItemComboBox5.AutoHeight = false;
+ this.repositoryItemComboBox5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox5.Name = "repositoryItemComboBox5";
//
// gridBand9
//
@@ -1357,12 +1389,20 @@
this.gvMx1flevelI.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1flevelI.AppearanceCell.Options.UseFont = true;
this.gvMx1flevelI.Caption = "涓�鑸楠屾按骞硘I";
+ this.gvMx1flevelI.ColumnEdit = this.repositoryItemComboBox6;
this.gvMx1flevelI.FieldName = "flevelI";
- this.gvMx1flevelI.MinWidth = 50;
+ this.gvMx1flevelI.MinWidth = 80;
this.gvMx1flevelI.Name = "gvMx1flevelI";
this.gvMx1flevelI.Tag = "edit";
this.gvMx1flevelI.Visible = true;
this.gvMx1flevelI.Width = 104;
+ //
+ // repositoryItemComboBox6
+ //
+ this.repositoryItemComboBox6.AutoHeight = false;
+ this.repositoryItemComboBox6.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox6.Name = "repositoryItemComboBox6";
//
// gridBand11
//
@@ -1377,12 +1417,20 @@
this.gvMx1flevelIi.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1flevelIi.AppearanceCell.Options.UseFont = true;
this.gvMx1flevelIi.Caption = "涓�鑸楠屾按骞硘II";
+ this.gvMx1flevelIi.ColumnEdit = this.repositoryItemComboBox7;
this.gvMx1flevelIi.FieldName = "flevelIi";
- this.gvMx1flevelIi.MinWidth = 50;
+ this.gvMx1flevelIi.MinWidth = 80;
this.gvMx1flevelIi.Name = "gvMx1flevelIi";
this.gvMx1flevelIi.Tag = "edit";
this.gvMx1flevelIi.Visible = true;
this.gvMx1flevelIi.Width = 104;
+ //
+ // repositoryItemComboBox7
+ //
+ this.repositoryItemComboBox7.AutoHeight = false;
+ this.repositoryItemComboBox7.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox7.Name = "repositoryItemComboBox7";
//
// gridBand12
//
@@ -1397,12 +1445,20 @@
this.gvMx1flevelIii.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1flevelIii.AppearanceCell.Options.UseFont = true;
this.gvMx1flevelIii.Caption = "涓�鑸楠屾按骞硘III";
+ this.gvMx1flevelIii.ColumnEdit = this.repositoryItemComboBox8;
this.gvMx1flevelIii.FieldName = "flevelIii";
- this.gvMx1flevelIii.MinWidth = 50;
+ this.gvMx1flevelIii.MinWidth = 80;
this.gvMx1flevelIii.Name = "gvMx1flevelIii";
this.gvMx1flevelIii.Tag = "edit";
this.gvMx1flevelIii.Visible = true;
this.gvMx1flevelIii.Width = 104;
+ //
+ // repositoryItemComboBox8
+ //
+ this.repositoryItemComboBox8.AutoHeight = false;
+ this.repositoryItemComboBox8.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox8.Name = "repositoryItemComboBox8";
//
// gridBand13
//
@@ -1418,7 +1474,7 @@
this.gvMx1memo.AppearanceCell.Options.UseFont = true;
this.gvMx1memo.Caption = "澶囨敞";
this.gvMx1memo.FieldName = "memo";
- this.gvMx1memo.MinWidth = 50;
+ this.gvMx1memo.MinWidth = 80;
this.gvMx1memo.Name = "gvMx1memo";
this.gvMx1memo.Tag = "edit";
this.gvMx1memo.Visible = true;
@@ -1430,7 +1486,7 @@
this.gridBand14.Columns.Add(this.gvMxDel);
this.gridBand14.Name = "gridBand14";
this.gridBand14.VisibleIndex = 5;
- this.gridBand14.Width = 100;
+ this.gridBand14.Width = 116;
//
// gvMxDel
//
@@ -1439,7 +1495,7 @@
this.gvMxDel.MinWidth = 50;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.Width = 100;
+ this.gvMxDel.Width = 116;
//
// repositoryItemButtonEdit1
//
@@ -1502,7 +1558,7 @@
//
this.lb_fversion.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fversion.Appearance.Options.UseFont = true;
- this.lb_fversion.Location = new System.Drawing.Point(286, 88);
+ this.lb_fversion.Location = new System.Drawing.Point(289, 88);
this.lb_fversion.Name = "lb_fversion";
this.lb_fversion.Size = new System.Drawing.Size(51, 21);
this.lb_fversion.TabIndex = 273;
@@ -1514,7 +1570,7 @@
this.txt_fversion.Name = "txt_fversion";
this.txt_fversion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fversion.Properties.Appearance.Options.UseFont = true;
- this.txt_fversion.Size = new System.Drawing.Size(180, 28);
+ this.txt_fversion.Size = new System.Drawing.Size(190, 28);
this.txt_fversion.TabIndex = 273;
//
// gv_fversion
@@ -1535,7 +1591,7 @@
//
this.lb_ftwoCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoCheckdate.Appearance.Options.UseFont = true;
- this.lb_ftwoCheckdate.Location = new System.Drawing.Point(538, 54);
+ this.lb_ftwoCheckdate.Location = new System.Drawing.Point(540, 54);
this.lb_ftwoCheckdate.Name = "lb_ftwoCheckdate";
this.lb_ftwoCheckdate.Size = new System.Drawing.Size(68, 21);
this.lb_ftwoCheckdate.TabIndex = 262;
@@ -1569,7 +1625,7 @@
//
this.lb_ftwoCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoCheckor.Appearance.Options.UseFont = true;
- this.lb_ftwoCheckor.Location = new System.Drawing.Point(555, 20);
+ this.lb_ftwoCheckor.Location = new System.Drawing.Point(557, 20);
this.lb_ftwoCheckor.Name = "lb_ftwoCheckor";
this.lb_ftwoCheckor.Size = new System.Drawing.Size(51, 21);
this.lb_ftwoCheckor.TabIndex = 258;
@@ -1603,7 +1659,7 @@
//
this.lb_ftwoChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftwoChecked.Appearance.Options.UseFont = true;
- this.lb_ftwoChecked.Location = new System.Drawing.Point(538, 88);
+ this.lb_ftwoChecked.Location = new System.Drawing.Point(540, 88);
this.lb_ftwoChecked.Name = "lb_ftwoChecked";
this.lb_ftwoChecked.Size = new System.Drawing.Size(68, 21);
this.lb_ftwoChecked.TabIndex = 252;
@@ -1719,7 +1775,7 @@
//
this.lb_memo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_memo.Appearance.Options.UseFont = true;
- this.lb_memo.Location = new System.Drawing.Point(11, 88);
+ this.lb_memo.Location = new System.Drawing.Point(13, 88);
this.lb_memo.Name = "lb_memo";
this.lb_memo.Size = new System.Drawing.Size(73, 21);
this.lb_memo.TabIndex = 231;
@@ -1731,7 +1787,7 @@
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_memo.Properties.Appearance.Options.UseFont = true;
- this.txt_memo.Size = new System.Drawing.Size(150, 28);
+ this.txt_memo.Size = new System.Drawing.Size(177, 28);
this.txt_memo.TabIndex = 231;
//
// gv_memo
@@ -1752,7 +1808,7 @@
//
this.lb_sampleSizeName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_sampleSizeName.Appearance.Options.UseFont = true;
- this.lb_sampleSizeName.Location = new System.Drawing.Point(11, 54);
+ this.lb_sampleSizeName.Location = new System.Drawing.Point(13, 54);
this.lb_sampleSizeName.Name = "lb_sampleSizeName";
this.lb_sampleSizeName.Size = new System.Drawing.Size(73, 21);
this.lb_sampleSizeName.TabIndex = 228;
@@ -1764,7 +1820,7 @@
this.txt_sampleSizeName.Name = "txt_sampleSizeName";
this.txt_sampleSizeName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_sampleSizeName.Properties.Appearance.Options.UseFont = true;
- this.txt_sampleSizeName.Size = new System.Drawing.Size(150, 28);
+ this.txt_sampleSizeName.Size = new System.Drawing.Size(177, 28);
this.txt_sampleSizeName.TabIndex = 228;
//
// gv_sampleSizeName
@@ -1785,7 +1841,7 @@
//
this.lb_sampleSizeNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_sampleSizeNo.Appearance.Options.UseFont = true;
- this.lb_sampleSizeNo.Location = new System.Drawing.Point(11, 20);
+ this.lb_sampleSizeNo.Location = new System.Drawing.Point(13, 20);
this.lb_sampleSizeNo.Name = "lb_sampleSizeNo";
this.lb_sampleSizeNo.Size = new System.Drawing.Size(73, 21);
this.lb_sampleSizeNo.TabIndex = 226;
@@ -1797,7 +1853,7 @@
this.txt_sampleSizeNo.Name = "txt_sampleSizeNo";
this.txt_sampleSizeNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_sampleSizeNo.Properties.Appearance.Options.UseFont = true;
- this.txt_sampleSizeNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_sampleSizeNo.Size = new System.Drawing.Size(177, 28);
this.txt_sampleSizeNo.TabIndex = 226;
//
// gv_sampleSizeNo
@@ -1818,7 +1874,7 @@
//
this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createDate.Appearance.Options.UseFont = true;
- this.lb_createDate.Location = new System.Drawing.Point(269, 54);
+ this.lb_createDate.Location = new System.Drawing.Point(272, 54);
this.lb_createDate.Name = "lb_createDate";
this.lb_createDate.Size = new System.Drawing.Size(68, 21);
this.lb_createDate.TabIndex = 216;
@@ -1830,7 +1886,7 @@
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(180, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(190, 28);
this.txt_createDate.TabIndex = 216;
this.txt_createDate.Tag = "readOnly";
//
@@ -1838,11 +1894,11 @@
//
this.lb_createName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createName.Appearance.Options.UseFont = true;
- this.lb_createName.Location = new System.Drawing.Point(252, 20);
+ this.lb_createName.Location = new System.Drawing.Point(289, 20);
this.lb_createName.Name = "lb_createName";
- this.lb_createName.Size = new System.Drawing.Size(85, 21);
+ this.lb_createName.Size = new System.Drawing.Size(51, 21);
this.lb_createName.TabIndex = 213;
- this.lb_createName.Text = "鍒朵綔浜哄鍚�";
+ this.lb_createName.Text = "鍒朵綔浜�";
//
// txt_createBy
//
@@ -1850,7 +1906,7 @@
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(180, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(190, 28);
this.txt_createBy.TabIndex = 213;
this.txt_createBy.Tag = "readOnly";
//
@@ -2086,6 +2142,13 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckdate.Properties)).EndInit();
@@ -2199,19 +2262,6 @@
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx1flevelIii;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx1memo;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMxDel;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand8;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand9;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand11;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand12;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14;
private DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView advBandedGridView1;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
@@ -2263,6 +2313,19 @@
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql1000;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2memo;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMxDel2;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand8;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand9;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand11;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand12;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand19;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand20;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand21;
@@ -2284,5 +2347,12 @@
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand39;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand22;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand23;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox4;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox5;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox6;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox7;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox8;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index 71bacbd..2dbb895 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -20,6 +20,34 @@
public Frm_MesQmAql1()
{
InitializeComponent();
+ object[] _objAry = { "A",
+ "B",
+ "C",
+ "D",
+ "E",
+ "F",
+ "G",
+ "H",
+ "I",
+ "J",
+ "K",
+ "L",
+ "M",
+ "N",
+ "O",
+ "P",
+ "Q",
+ "R",
+ "S",
+ "T"};
+ this.repositoryItemComboBox1.Items.AddRange(_objAry);
+ this.repositoryItemComboBox2.Items.AddRange(_objAry);
+ this.repositoryItemComboBox3.Items.AddRange(_objAry);
+ this.repositoryItemComboBox4.Items.AddRange(_objAry);
+ this.repositoryItemComboBox5.Items.AddRange(_objAry);
+ this.repositoryItemComboBox6.Items.AddRange(_objAry);
+ this.repositoryItemComboBox7.Items.AddRange(_objAry);
+ this.repositoryItemComboBox8.Items.AddRange(_objAry);
this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
@@ -279,6 +307,17 @@
{
var row = gvMx1.GetDataRow(i);
if (row != null)
+ {
+ if (string.IsNullOrEmpty(row["LotFrom"].ToString()))
+ {
+ MsgHelper.ShowError("鎵归噺寮�濮嬩笉鑳戒负绌猴紒");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["LotTo"].ToString()))
+ {
+ MsgHelper.ShowError("鎵归噺缁撴潫涓嶈兘涓虹┖锛�");
+ return;
+ }
qmaql2.Add(new MesQmAql2
{
Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
@@ -293,12 +332,24 @@
FlevelIii = row["FlevelIii"].ToString(),
Memo = row["Memo"].ToString()
});
+ }
}
var qmaql3 = new List<MesQmAql3>();
for (var i = 0; i < gvMx2.DataRowCount; i++)
{
var row = gvMx2.GetDataRow(i);
if (row != null)
+ {
+ if (string.IsNullOrEmpty(row["FsampleSizeWord"].ToString()))
+ {
+ MsgHelper.ShowError("鏍锋湰澶у皬涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["SampleSizeWord"].ToString()))
+ {
+ MsgHelper.ShowError("鏍锋湰瀛楃爜涓嶈兘涓虹┖锛�");
+ return;
+ }
qmaql3.Add(new MesQmAql3
{
Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
@@ -322,6 +373,7 @@
Aql1000 = Convert.ToInt32(row["Aql1000"].ToString()),
Memo = row["Memo"].ToString()
});
+ }
}
if (qmaql2.Count <= 0)
{
@@ -398,6 +450,7 @@
{
gcMain.DataSource = dt;
gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -455,6 +508,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
}
else
{
@@ -470,6 +524,7 @@
gcMx2.BindingContext = new BindingContext();
gcMx2.DataSource = dt1;
gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
}
else
{
@@ -608,6 +663,7 @@
getModel(lbGuid.Text.Trim());
else
getPageList(this.pageBar1.CurrentPage);
+ UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
index 224bf5a..11ce707 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
@@ -84,7 +84,7 @@
//
this.gvMx1lookupName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1lookupName.AppearanceCell.Options.UseFont = true;
- this.gvMx1lookupName.Caption = "绯荤粺蹇爜鏄剧ず鍊�";
+ this.gvMx1lookupName.Caption = "鏄剧ず鍊�";
this.gvMx1lookupName.FieldName = "lookupName";
this.gvMx1lookupName.MinWidth = 50;
this.gvMx1lookupName.Name = "gvMx1lookupName";
@@ -159,16 +159,16 @@
//
this.lb_lookupTypeName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lookupTypeName.Appearance.Options.UseFont = true;
- this.lb_lookupTypeName.Location = new System.Drawing.Point(414, 21);
+ this.lb_lookupTypeName.Location = new System.Drawing.Point(261, 21);
this.lb_lookupTypeName.Name = "lb_lookupTypeName";
- this.lb_lookupTypeName.Size = new System.Drawing.Size(141, 21);
+ this.lb_lookupTypeName.Size = new System.Drawing.Size(73, 21);
this.lb_lookupTypeName.TabIndex = 213;
- this.lb_lookupTypeName.Text = "绯荤粺蹇爜绫诲瀷鍚嶇О ";
+ this.lb_lookupTypeName.Text = "绫诲瀷鍚嶇О ";
//
// txt_lookupTypeName
//
this.txt_lookupTypeName.Enabled = false;
- this.txt_lookupTypeName.Location = new System.Drawing.Point(561, 18);
+ this.txt_lookupTypeName.Location = new System.Drawing.Point(340, 17);
this.txt_lookupTypeName.Name = "txt_lookupTypeName";
this.txt_lookupTypeName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lookupTypeName.Properties.Appearance.Options.UseFont = true;
@@ -195,14 +195,14 @@
this.lb_lookupTypeCode.Appearance.Options.UseFont = true;
this.lb_lookupTypeCode.Location = new System.Drawing.Point(26, 21);
this.lb_lookupTypeCode.Name = "lb_lookupTypeCode";
- this.lb_lookupTypeCode.Size = new System.Drawing.Size(141, 21);
+ this.lb_lookupTypeCode.Size = new System.Drawing.Size(73, 21);
this.lb_lookupTypeCode.TabIndex = 211;
- this.lb_lookupTypeCode.Text = "绯荤粺蹇爜绫诲瀷缂栫爜 ";
+ this.lb_lookupTypeCode.Text = "绫诲瀷缂栫爜 ";
//
// txt_lookupTypeCode
//
this.txt_lookupTypeCode.Enabled = false;
- this.txt_lookupTypeCode.Location = new System.Drawing.Point(173, 18);
+ this.txt_lookupTypeCode.Location = new System.Drawing.Point(105, 17);
this.txt_lookupTypeCode.Name = "txt_lookupTypeCode";
this.txt_lookupTypeCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lookupTypeCode.Properties.Appearance.Options.UseFont = true;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
index 8a89a78..dcc907f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -385,6 +385,8 @@
getModel(lbGuid.Text.Trim());
else
getPageList(this.pageBar1.CurrentPage);
+
+ UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 73ab96a..12d3c03 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -141,6 +141,7 @@
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
+ this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -270,6 +271,7 @@
this.gridColumn17,
this.gridColumn22,
this.gridColumn23,
+ this.gridColumn24,
this.gvBtnAlawys});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
@@ -365,16 +367,16 @@
this.gvBtnAlawys.MinWidth = 25;
this.gvBtnAlawys.Name = "gvBtnAlawys";
this.gvBtnAlawys.Visible = true;
- this.gvBtnAlawys.VisibleIndex = 11;
+ this.gvBtnAlawys.VisibleIndex = 12;
this.gvBtnAlawys.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1419,6 +1421,16 @@
this.txt_billNo.Size = new System.Drawing.Size(234, 28);
this.txt_billNo.TabIndex = 211;
//
+ // gridColumn24
+ //
+ this.gridColumn24.Caption = "鍏ュ簱浣�";
+ this.gridColumn24.FieldName = "rkPositon";
+ this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.Visible = true;
+ this.gridColumn24.VisibleIndex = 11;
+ this.gridColumn24.Width = 94;
+ //
// Frm_ArrivalBarcode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1580,5 +1592,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
}
}
\ No newline at end of file
--
Gitblit v1.9.3