From 92c2fea9ee96b545e4760de721c08a3d90115a06 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 01 四月 2025 10:43:44 +0800
Subject: [PATCH] iqc
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 18 ++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs | 50 +++---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 340 +++++++++++++++++++++---------------------------
3 files changed, 189 insertions(+), 219 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 43ca365..394d9ad 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -61,7 +61,6 @@
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_ftype = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -174,7 +173,7 @@
this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.tabMxPage3 = new DevExpress.XtraTab.XtraTabPage();
+ this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx4 = new DevExpress.XtraGrid.GridControl();
this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -191,6 +190,7 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -275,7 +275,7 @@
this.groupControl2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
- this.tabMxPage3.SuspendLayout();
+ this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
@@ -295,7 +295,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1344, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1188, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -306,7 +306,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1344, 720);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1188, 720);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -316,7 +316,7 @@
//
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1342, 688);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1186, 688);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -335,18 +335,17 @@
// split1.Panel2
//
this.split1.Panel2.Text = "Panel2";
- this.split1.Size = new System.Drawing.Size(1342, 688);
+ this.split1.Size = new System.Drawing.Size(1186, 688);
this.split1.SplitterPosition = 623;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1342, 584);
+ this.gcMain1.Size = new System.Drawing.Size(1186, 584);
this.gcMain1.TabIndex = 5;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -355,12 +354,10 @@
//
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn19,
- this.gv_ftype,
this.gridColumn12,
this.gridColumn13,
this.gv_fcheckResu,
@@ -385,7 +382,8 @@
this.gridColumn17,
this.gridColumn15,
this.gridColumn20,
- this.gridColumn31});
+ this.gridColumn31,
+ this.gridColumn32});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -404,21 +402,6 @@
this.gridColumn19.VisibleIndex = 0;
this.gridColumn19.Width = 250;
//
- // gv_ftype
- //
-
- this.gv_ftype.AppearanceCell.Options.UseFont = true;
- this.gv_ftype.Caption = "绫诲瀷";
- this.gv_ftype.FieldName = "ftypeTxt";
- this.gv_ftype.MaxWidth = 50;
- this.gv_ftype.MinWidth = 50;
- this.gv_ftype.Name = "gv_ftype";
- this.gv_ftype.OptionsColumn.AllowEdit = false;
- this.gv_ftype.Tag = "query_a.ftype";
- this.gv_ftype.Visible = true;
- this.gv_ftype.VisibleIndex = 1;
- this.gv_ftype.Width = 50;
- //
// gridColumn12
//
this.gridColumn12.Caption = "瀹℃牳鏍囪瘑";
@@ -428,7 +411,7 @@
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Tag = "query_a.quality_audit";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 2;
+ this.gridColumn12.VisibleIndex = 1;
this.gridColumn12.Width = 50;
//
// gridColumn13
@@ -441,12 +424,11 @@
this.gridColumn13.OptionsColumn.ReadOnly = true;
this.gridColumn13.Tag = "query_a.fsubmit";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 3;
+ this.gridColumn13.VisibleIndex = 2;
this.gridColumn13.Width = 50;
//
// gv_fcheckResu
//
-
this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gv_fcheckResu.FieldName = "fcheckResu";
@@ -456,12 +438,11 @@
this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
- this.gv_fcheckResu.VisibleIndex = 4;
+ this.gv_fcheckResu.VisibleIndex = 3;
this.gv_fcheckResu.Width = 70;
//
// gv_lotNo
//
-
this.gv_lotNo.AppearanceCell.Options.UseFont = true;
this.gv_lotNo.Caption = "閫佹鎵规";
this.gv_lotNo.FieldName = "lotNo";
@@ -470,12 +451,11 @@
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
- this.gv_lotNo.VisibleIndex = 5;
+ this.gv_lotNo.VisibleIndex = 4;
this.gv_lotNo.Width = 150;
//
// gv_releaseNo
//
-
this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
this.gv_releaseNo.FieldName = "releaseNo";
@@ -484,26 +464,24 @@
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
- this.gv_releaseNo.VisibleIndex = 6;
+ this.gv_releaseNo.VisibleIndex = 5;
this.gv_releaseNo.Width = 150;
//
// gv_itemNo
//
-
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
- this.gv_itemNo.FieldName = "itemNo2";
+ this.gv_itemNo.FieldName = "itemNo";
this.gv_itemNo.MinWidth = 50;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 7;
+ this.gv_itemNo.VisibleIndex = 6;
this.gv_itemNo.Width = 100;
//
// gv_boardStyle
//
-
this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О";
this.gv_boardStyle.FieldName = "itemName";
@@ -512,7 +490,7 @@
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
- this.gv_boardStyle.VisibleIndex = 8;
+ this.gv_boardStyle.VisibleIndex = 7;
this.gv_boardStyle.Width = 200;
//
// gridColumn14
@@ -523,26 +501,24 @@
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 9;
+ this.gridColumn14.VisibleIndex = 8;
this.gridColumn14.Width = 200;
//
// gv_fbatchQty
//
-
this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
- this.gv_fbatchQty.Caption = "閲囪喘鏁伴噺";
+ this.gv_fbatchQty.Caption = "鍒拌揣鏁伴噺";
this.gv_fbatchQty.FieldName = "fbatchQty";
this.gv_fbatchQty.MinWidth = 50;
this.gv_fbatchQty.Name = "gv_fbatchQty";
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
this.gv_fbatchQty.Visible = true;
- this.gv_fbatchQty.VisibleIndex = 10;
+ this.gv_fbatchQty.VisibleIndex = 9;
this.gv_fbatchQty.Width = 80;
//
// gv_fcovertQty
//
-
this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
this.gv_fcovertQty.Caption = "杞崲鏁伴噺";
this.gv_fcovertQty.FieldName = "fcovertQty";
@@ -552,12 +528,11 @@
this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
this.gv_fcovertQty.Visible = true;
- this.gv_fcovertQty.VisibleIndex = 11;
+ this.gv_fcovertQty.VisibleIndex = 10;
this.gv_fcovertQty.Width = 100;
//
// gv_lifnr
//
-
this.gv_lifnr.AppearanceCell.Options.UseFont = true;
this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
this.gv_lifnr.FieldName = "suppName";
@@ -566,12 +541,11 @@
this.gv_lifnr.OptionsColumn.AllowEdit = false;
this.gv_lifnr.Tag = "query_a.lifnr";
this.gv_lifnr.Visible = true;
- this.gv_lifnr.VisibleIndex = 12;
+ this.gv_lifnr.VisibleIndex = 11;
this.gv_lifnr.Width = 250;
//
// gv_remarks
//
-
this.gv_remarks.AppearanceCell.Options.UseFont = true;
this.gv_remarks.Caption = "澶囨敞璇存槑";
this.gv_remarks.FieldName = "remarks";
@@ -580,12 +554,11 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 13;
+ this.gv_remarks.VisibleIndex = 12;
this.gv_remarks.Width = 150;
//
// gv_createBy
//
-
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createBy";
@@ -594,12 +567,11 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 14;
+ this.gv_createBy.VisibleIndex = 13;
this.gv_createBy.Width = 100;
//
// gv_fcheckBy
//
-
this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
this.gv_fcheckBy.FieldName = "fcheckBy";
@@ -608,12 +580,11 @@
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 15;
+ this.gv_fcheckBy.VisibleIndex = 14;
this.gv_fcheckBy.Width = 100;
//
// gv_fcheckDate
//
-
this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
this.gv_fcheckDate.FieldName = "fcheckDate";
@@ -622,12 +593,11 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 16;
+ this.gv_fcheckDate.VisibleIndex = 15;
this.gv_fcheckDate.Width = 180;
//
// gv_createDate
//
-
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃ユ湡";
this.gv_createDate.FieldName = "createDate";
@@ -636,12 +606,11 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 17;
+ this.gv_createDate.VisibleIndex = 16;
this.gv_createDate.Width = 180;
//
// gv_lastupdateBy
//
-
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏇存柊浜�";
this.gv_lastupdateBy.FieldName = "lastupdateBy";
@@ -650,12 +619,11 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 18;
+ this.gv_lastupdateBy.VisibleIndex = 17;
this.gv_lastupdateBy.Width = 100;
//
// gv_lastupdateDate
//
-
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏇存柊鏃ユ湡";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
@@ -664,12 +632,11 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 19;
+ this.gv_lastupdateDate.VisibleIndex = 18;
this.gv_lastupdateDate.Width = 180;
//
// gv_fngHandle
//
-
this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
this.gv_fngHandle.Caption = "涓嶈壇澶勭悊鏂规硶";
this.gv_fngHandle.FieldName = "fngHandle";
@@ -678,12 +645,11 @@
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
- this.gv_fngHandle.VisibleIndex = 20;
+ this.gv_fngHandle.VisibleIndex = 19;
this.gv_fngHandle.Width = 100;
//
// gv_iqcDate
//
-
this.gv_iqcDate.AppearanceCell.Options.UseFont = true;
this.gv_iqcDate.Caption = "IQC鎻愪氦鏃堕棿";
this.gv_iqcDate.FieldName = "iqcDate";
@@ -692,7 +658,7 @@
this.gv_iqcDate.OptionsColumn.AllowEdit = false;
this.gv_iqcDate.Tag = "query_a.iqc_date";
this.gv_iqcDate.Visible = true;
- this.gv_iqcDate.VisibleIndex = 21;
+ this.gv_iqcDate.VisibleIndex = 20;
this.gv_iqcDate.Width = 180;
//
// gridColumn18
@@ -702,7 +668,7 @@
this.gridColumn18.MinWidth = 50;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 22;
+ this.gridColumn18.VisibleIndex = 21;
this.gridColumn18.Width = 50;
//
// gridColumn17
@@ -712,7 +678,7 @@
this.gridColumn17.MinWidth = 50;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 23;
+ this.gridColumn17.VisibleIndex = 22;
this.gridColumn17.Width = 180;
//
// gridColumn15
@@ -722,7 +688,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 24;
+ this.gridColumn15.VisibleIndex = 23;
this.gridColumn15.Width = 94;
//
// gridColumn20
@@ -740,7 +706,7 @@
this.gridColumn31.MinWidth = 25;
this.gridColumn31.Name = "gridColumn31";
this.gridColumn31.Visible = true;
- this.gridColumn31.VisibleIndex = 25;
+ this.gridColumn31.VisibleIndex = 24;
this.gridColumn31.Width = 94;
//
// pageBar1
@@ -751,7 +717,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1342, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1186, 39);
this.pageBar1.TabIndex = 6;
this.pageBar1.TotalPages = 0;
//
@@ -759,7 +725,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1342, 688);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1186, 688);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -778,7 +744,8 @@
//
this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2);
this.splitMx1.Panel2.Text = "Panel2";
- this.splitMx1.Size = new System.Drawing.Size(1342, 688);
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Size = new System.Drawing.Size(1186, 688);
this.splitMx1.SplitterPosition = 179;
this.splitMx1.TabIndex = 0;
//
@@ -812,7 +779,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(940, 345, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1342, 179);
+ this.layoutMx1.Size = new System.Drawing.Size(1186, 179);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -828,7 +795,7 @@
// txt_fmrmode
//
this.txt_fmrmode.EditValue = "-璇烽�夋嫨-";
- this.txt_fmrmode.Location = new System.Drawing.Point(739, 108);
+ this.txt_fmrmode.Location = new System.Drawing.Point(671, 107);
this.txt_fmrmode.Name = "txt_fmrmode";
this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -837,17 +804,16 @@
"閫�鏂欒ˉ鏂�",
"閫�鏂欏苟鎵f"});
this.txt_fmrmode.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fmrmode.Size = new System.Drawing.Size(244, 24);
+ this.txt_fmrmode.Size = new System.Drawing.Size(210, 24);
this.txt_fmrmode.StyleController = this.layoutMx1;
this.txt_fmrmode.TabIndex = 795;
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(414, 140);
+ this.txt_remarks.Location = new System.Drawing.Point(380, 139);
this.txt_remarks.Name = "txt_remarks";
-
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(569, 28);
+ this.txt_remarks.Size = new System.Drawing.Size(501, 24);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 810;
this.txt_remarks.Tag = "readonly";
@@ -855,7 +821,7 @@
// txt_fngHandle
//
this.txt_fngHandle.EditValue = "-璇烽�夋嫨-";
- this.txt_fngHandle.Location = new System.Drawing.Point(414, 108);
+ this.txt_fngHandle.Location = new System.Drawing.Point(380, 107);
this.txt_fngHandle.Name = "txt_fngHandle";
this.txt_fngHandle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -864,16 +830,16 @@
"閫�璐�",
"鐗归噰鐩存帴浣跨敤"});
this.txt_fngHandle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fngHandle.Size = new System.Drawing.Size(244, 24);
+ this.txt_fngHandle.Size = new System.Drawing.Size(210, 24);
this.txt_fngHandle.StyleController = this.layoutMx1;
this.txt_fngHandle.TabIndex = 793;
//
// txt_suppName
//
this.txt_suppName.EnterMoveNextControl = true;
- this.txt_suppName.Location = new System.Drawing.Point(1064, 12);
+ this.txt_suppName.Location = new System.Drawing.Point(962, 12);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(245, 24);
+ this.txt_suppName.Size = new System.Drawing.Size(212, 24);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 802;
this.txt_suppName.Tag = "readonly";
@@ -883,9 +849,8 @@
this.txt_releaseNo.EnterMoveNextControl = true;
this.txt_releaseNo.Location = new System.Drawing.Point(89, 12);
this.txt_releaseNo.Name = "txt_releaseNo";
-
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(244, 28);
+ this.txt_releaseNo.Size = new System.Drawing.Size(210, 24);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
this.txt_releaseNo.Tag = "readonly";
@@ -893,11 +858,10 @@
// txt_fcovertQty
//
this.txt_fcovertQty.EnterMoveNextControl = true;
- this.txt_fcovertQty.Location = new System.Drawing.Point(414, 44);
+ this.txt_fcovertQty.Location = new System.Drawing.Point(380, 43);
this.txt_fcovertQty.Name = "txt_fcovertQty";
-
this.txt_fcovertQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fcovertQty.Size = new System.Drawing.Size(244, 28);
+ this.txt_fcovertQty.Size = new System.Drawing.Size(210, 24);
this.txt_fcovertQty.StyleController = this.layoutMx1;
this.txt_fcovertQty.TabIndex = 804;
this.txt_fcovertQty.Tag = "readonly";
@@ -905,22 +869,20 @@
// txt_fbatchQty
//
this.txt_fbatchQty.EnterMoveNextControl = true;
- this.txt_fbatchQty.Location = new System.Drawing.Point(414, 12);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(380, 12);
this.txt_fbatchQty.Name = "txt_fbatchQty";
-
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fbatchQty.Size = new System.Drawing.Size(244, 28);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(210, 24);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 222;
this.txt_fbatchQty.Tag = "readonly";
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(739, 12);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(671, 12);
this.txt_fcheckBy.Name = "txt_fcheckBy";
-
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckBy.Size = new System.Drawing.Size(244, 28);
+ this.txt_fcheckBy.Size = new System.Drawing.Size(210, 24);
this.txt_fcheckBy.StyleController = this.layoutMx1;
this.txt_fcheckBy.TabIndex = 217;
this.txt_fcheckBy.Tag = "readonly";
@@ -928,33 +890,30 @@
// txt_itemName
//
this.txt_itemName.EnterMoveNextControl = true;
- this.txt_itemName.Location = new System.Drawing.Point(89, 44);
+ this.txt_itemName.Location = new System.Drawing.Point(89, 43);
this.txt_itemName.Name = "txt_itemName";
-
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(244, 28);
+ this.txt_itemName.Size = new System.Drawing.Size(210, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 801;
this.txt_itemName.Tag = "readonly";
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(739, 44);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(671, 43);
this.txt_fcheckDate.Name = "txt_fcheckDate";
-
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(244, 28);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(210, 24);
this.txt_fcheckDate.StyleController = this.layoutMx1;
this.txt_fcheckDate.TabIndex = 216;
this.txt_fcheckDate.Tag = "readonly";
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(739, 76);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(671, 75);
this.txt_fcheckResu.Name = "txt_fcheckResu";
-
this.txt_fcheckResu.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckResu.Size = new System.Drawing.Size(244, 28);
+ this.txt_fcheckResu.Size = new System.Drawing.Size(210, 24);
this.txt_fcheckResu.StyleController = this.layoutMx1;
this.txt_fcheckResu.TabIndex = 235;
this.txt_fcheckResu.Tag = "readonly";
@@ -962,20 +921,19 @@
// txt_itemNo
//
this.txt_itemNo.EnterMoveNextControl = true;
- this.txt_itemNo.Location = new System.Drawing.Point(89, 76);
+ this.txt_itemNo.Location = new System.Drawing.Point(89, 75);
this.txt_itemNo.Name = "txt_itemNo";
-
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(244, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(210, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 789;
this.txt_itemNo.Tag = "readonly";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(89, 108);
+ this.txt_itemModel.Location = new System.Drawing.Point(89, 107);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(244, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(210, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 802;
this.txt_itemModel.Tag = "readonly";
@@ -983,48 +941,47 @@
// txt_lotNo
//
this.txt_lotNo.EnterMoveNextControl = true;
- this.txt_lotNo.Location = new System.Drawing.Point(414, 76);
+ this.txt_lotNo.Location = new System.Drawing.Point(380, 75);
this.txt_lotNo.Name = "txt_lotNo";
-
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo.Size = new System.Drawing.Size(244, 28);
+ this.txt_lotNo.Size = new System.Drawing.Size(210, 24);
this.txt_lotNo.StyleController = this.layoutMx1;
this.txt_lotNo.TabIndex = 262;
this.txt_lotNo.Tag = "readonly";
//
// txt_modify1Flag
//
- this.txt_modify1Flag.Location = new System.Drawing.Point(987, 108);
+ this.txt_modify1Flag.Location = new System.Drawing.Point(885, 107);
this.txt_modify1Flag.Name = "txt_modify1Flag";
this.txt_modify1Flag.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_modify1Flag.Size = new System.Drawing.Size(322, 24);
+ this.txt_modify1Flag.Size = new System.Drawing.Size(289, 24);
this.txt_modify1Flag.StyleController = this.layoutMx1;
this.txt_modify1Flag.TabIndex = 811;
this.txt_modify1Flag.Tag = "readonly";
//
// txt_slOrg
//
- this.txt_slOrg.Location = new System.Drawing.Point(89, 140);
+ this.txt_slOrg.Location = new System.Drawing.Point(89, 139);
this.txt_slOrg.Name = "txt_slOrg";
- this.txt_slOrg.Size = new System.Drawing.Size(244, 24);
+ this.txt_slOrg.Size = new System.Drawing.Size(210, 24);
this.txt_slOrg.StyleController = this.layoutMx1;
this.txt_slOrg.TabIndex = 812;
this.txt_slOrg.Tag = "readonly";
//
// txt_modify1Date
//
- this.txt_modify1Date.Location = new System.Drawing.Point(1064, 76);
+ this.txt_modify1Date.Location = new System.Drawing.Point(962, 75);
this.txt_modify1Date.Name = "txt_modify1Date";
- this.txt_modify1Date.Size = new System.Drawing.Size(245, 24);
+ this.txt_modify1Date.Size = new System.Drawing.Size(212, 24);
this.txt_modify1Date.StyleController = this.layoutMx1;
this.txt_modify1Date.TabIndex = 813;
this.txt_modify1Date.Tag = "readonly";
//
// txt_modify1By
//
- this.txt_modify1By.Location = new System.Drawing.Point(1064, 44);
+ this.txt_modify1By.Location = new System.Drawing.Point(962, 43);
this.txt_modify1By.Name = "txt_modify1By";
- this.txt_modify1By.Size = new System.Drawing.Size(245, 24);
+ this.txt_modify1By.Size = new System.Drawing.Size(212, 24);
this.txt_modify1By.StyleController = this.layoutMx1;
this.txt_modify1By.TabIndex = 814;
this.txt_modify1By.Tag = "readonly";
@@ -1115,7 +1072,7 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1321, 180);
+ this.Root.Size = new System.Drawing.Size(1186, 179);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1123,188 +1080,188 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(291, 31);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fbatchQty;
- this.layoutControlItem2.Location = new System.Drawing.Point(325, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(291, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(325, 32);
- this.layoutControlItem2.Text = "鏉ユ枡鏁伴噺";
+ this.layoutControlItem2.Size = new System.Drawing.Size(291, 31);
+ this.layoutControlItem2.Text = "鍒拌揣鏁伴噺";
this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_fcheckBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(650, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(582, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(291, 31);
this.layoutControlItem3.Text = "妫�楠屼汉鍛� ";
this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_fcheckDate;
- this.layoutControlItem4.Location = new System.Drawing.Point(650, 32);
+ this.layoutControlItem4.Location = new System.Drawing.Point(582, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(291, 32);
this.layoutControlItem4.Text = "妫�楠屾棩鏈�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_fcheckResu;
- this.layoutControlItem5.Location = new System.Drawing.Point(650, 64);
+ this.layoutControlItem5.Location = new System.Drawing.Point(582, 63);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(291, 32);
this.layoutControlItem5.Text = "妫�楠岀粨鏋�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemName;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem6.Size = new System.Drawing.Size(291, 32);
this.layoutControlItem6.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem6.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_itemNo;
- this.layoutControlItem7.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem7.Location = new System.Drawing.Point(0, 63);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(291, 32);
this.layoutControlItem7.Text = "鐗╂枡缂栫爜";
this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_itemModel;
- this.layoutControlItem8.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem8.Location = new System.Drawing.Point(0, 95);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem8.Size = new System.Drawing.Size(291, 32);
this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem8.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_suppName;
- this.layoutControlItem12.Location = new System.Drawing.Point(975, 0);
+ this.layoutControlItem12.Location = new System.Drawing.Point(873, 0);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(326, 32);
+ this.layoutControlItem12.Size = new System.Drawing.Size(293, 31);
this.layoutControlItem12.Text = "渚涘簲鍟�";
this.layoutControlItem12.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcovertQty;
- this.layoutControlItem10.Location = new System.Drawing.Point(325, 32);
+ this.layoutControlItem10.Location = new System.Drawing.Point(291, 31);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(291, 32);
this.layoutControlItem10.Text = "杞崲鏁伴噺";
this.layoutControlItem10.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_slOrg;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 128);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 127);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem17.Size = new System.Drawing.Size(291, 32);
this.layoutControlItem17.Text = "鏀舵枡缁勭粐";
this.layoutControlItem17.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fngHandle;
- this.layoutControlItem14.Location = new System.Drawing.Point(325, 96);
+ this.layoutControlItem14.Location = new System.Drawing.Point(291, 95);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(291, 32);
this.layoutControlItem14.Text = "澶勭悊鏂瑰紡";
this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_lotNo;
- this.layoutControlItem9.Location = new System.Drawing.Point(325, 64);
+ this.layoutControlItem9.Location = new System.Drawing.Point(291, 63);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(291, 32);
this.layoutControlItem9.Text = "鎵规鍙�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_remarks;
- this.layoutControlItem11.Location = new System.Drawing.Point(325, 128);
+ this.layoutControlItem11.Location = new System.Drawing.Point(291, 127);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem11.Size = new System.Drawing.Size(650, 32);
+ this.layoutControlItem11.Size = new System.Drawing.Size(582, 32);
this.layoutControlItem11.Text = "澶囨敞璇存槑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fmrmode;
- this.layoutControlItem15.Location = new System.Drawing.Point(650, 96);
+ this.layoutControlItem15.Location = new System.Drawing.Point(582, 95);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(291, 32);
this.layoutControlItem15.Text = "閫�鏂欐柟寮�";
this.layoutControlItem15.TextSize = new System.Drawing.Size(65, 18);
//
// modify1By
//
this.modify1By.Control = this.txt_modify1By;
- this.modify1By.Location = new System.Drawing.Point(975, 32);
+ this.modify1By.Location = new System.Drawing.Point(873, 31);
this.modify1By.Name = "modify1By";
this.modify1By.OptionsTableLayoutItem.ColumnIndex = 3;
this.modify1By.OptionsTableLayoutItem.RowIndex = 1;
- this.modify1By.Size = new System.Drawing.Size(326, 32);
+ this.modify1By.Size = new System.Drawing.Size(293, 32);
this.modify1By.Text = "瀹℃牳浜�";
this.modify1By.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_modify1Date;
- this.layoutControlItem18.Location = new System.Drawing.Point(975, 64);
+ this.layoutControlItem18.Location = new System.Drawing.Point(873, 63);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(326, 32);
+ this.layoutControlItem18.Size = new System.Drawing.Size(293, 32);
this.layoutControlItem18.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem18.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_modify1Flag;
- this.layoutControlItem13.Location = new System.Drawing.Point(975, 96);
+ this.layoutControlItem13.Location = new System.Drawing.Point(873, 95);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(326, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(293, 32);
this.layoutControlItem13.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
@@ -1315,17 +1272,17 @@
this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1342, 497);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1186, 497);
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
- this.tabMxPage3});
+ this.tabMxPage2});
//
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.splitMx2);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1340, 465);
+ this.tabMxPage1.Size = new System.Drawing.Size(1184, 465);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitMx2
@@ -1344,7 +1301,8 @@
//
this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
this.splitMx2.Panel2.Text = "Panel2";
- this.splitMx2.Size = new System.Drawing.Size(1340, 465);
+ this.splitMx2.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx2.Size = new System.Drawing.Size(1184, 465);
this.splitMx2.SplitterPosition = 241;
this.splitMx2.TabIndex = 3;
//
@@ -1354,7 +1312,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1340, 241);
+ this.gcMx1.Size = new System.Drawing.Size(1184, 241);
this.gcMx1.TabIndex = 2;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1390,7 +1348,6 @@
//
// gvMx1guid
//
-
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
this.gvMx1guid.FieldName = "guid";
@@ -1401,7 +1358,6 @@
//
// gvMx1fcheckItem
//
-
this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.FieldName = "fcheckItem";
@@ -1414,7 +1370,6 @@
//
// gvMx1fcheckTool
//
-
this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
this.gvMx1fcheckTool.FieldName = "fcheckTool";
@@ -1427,7 +1382,6 @@
//
// gvMx1fcheckItemDesc
//
-
this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
@@ -1440,7 +1394,6 @@
//
// gvMx1fspecRequ
//
-
this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
this.gvMx1fspecRequ.FieldName = "fspecRequ";
@@ -1453,7 +1406,6 @@
//
// gvMx1fupAllow
//
-
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
@@ -1466,7 +1418,6 @@
//
// gvMx1fstand
//
-
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
@@ -1479,7 +1430,6 @@
//
// gvMx1fdownAllow
//
-
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
@@ -1492,7 +1442,6 @@
//
// gvMx1freQty
//
-
this.gvMx1freQty.AppearanceCell.Options.UseFont = true;
this.gvMx1freQty.Caption = "RE鏁伴噺";
this.gvMx1freQty.FieldName = "freQty";
@@ -1505,7 +1454,6 @@
//
// gvMx1checkQyt
//
-
this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
this.gvMx1checkQyt.FieldName = "checkQyt";
@@ -1518,7 +1466,6 @@
//
// gvMx1fenterQty
//
-
this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
this.gvMx1fenterQty.FieldName = "fenterQty";
@@ -1531,7 +1478,6 @@
//
// gvMx1fcheckResu
//
-
this.gvMx1fcheckResu.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.gvMx1fcheckResu.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckResu.AppearanceCell.Options.UseForeColor = true;
@@ -1548,7 +1494,6 @@
//
// gvMx1fngRate
//
-
this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
this.gvMx1fngRate.FieldName = "fngRateName";
@@ -1561,7 +1506,6 @@
//
// gvMx1fngQty
//
-
this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
this.gvMx1fngQty.FieldName = "fngQty";
@@ -1574,7 +1518,6 @@
//
// gvMx1sampleSizeNo
//
-
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
@@ -1587,7 +1530,6 @@
//
// gvMx1fcheckLevel
//
-
this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
@@ -1600,7 +1542,6 @@
//
// gvMx1facLevel
//
-
this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
this.gvMx1facLevel.FieldName = "facLevel";
@@ -1626,7 +1567,7 @@
//
this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
this.splitYangLi.Panel2.Text = "Panel2";
- this.splitYangLi.Size = new System.Drawing.Size(1340, 212);
+ this.splitYangLi.Size = new System.Drawing.Size(1184, 212);
this.splitYangLi.SplitterPosition = 583;
this.splitYangLi.TabIndex = 0;
//
@@ -1730,7 +1671,7 @@
this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl2.Location = new System.Drawing.Point(0, 0);
this.groupControl2.Name = "groupControl2";
- this.groupControl2.Size = new System.Drawing.Size(745, 212);
+ this.groupControl2.Size = new System.Drawing.Size(589, 212);
this.groupControl2.TabIndex = 5;
this.groupControl2.Text = "鏍锋湰缁撴灉";
//
@@ -1740,7 +1681,7 @@
this.gcMx3.Location = new System.Drawing.Point(2, 28);
this.gcMx3.MainView = this.gvMx3;
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(741, 182);
+ this.gcMx3.Size = new System.Drawing.Size(585, 182);
this.gcMx3.TabIndex = 0;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -1817,13 +1758,13 @@
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.Width = 94;
//
- // tabMxPage3
+ // tabMxPage2
//
- this.tabMxPage3.Controls.Add(this.gcMx4);
- this.tabMxPage3.Controls.Add(this.ucUpFile1);
- this.tabMxPage3.Name = "tabMxPage3";
- this.tabMxPage3.Size = new System.Drawing.Size(1340, 465);
- this.tabMxPage3.Text = "闄勪欢淇℃伅";
+ this.tabMxPage2.Controls.Add(this.gcMx4);
+ this.tabMxPage2.Controls.Add(this.ucUpFile1);
+ this.tabMxPage2.Name = "tabMxPage2";
+ this.tabMxPage2.Size = new System.Drawing.Size(1184, 465);
+ this.tabMxPage2.Text = "闄勪欢淇℃伅";
//
// gcMx4
//
@@ -1835,7 +1776,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemButtonEdit2,
this.repositoryItemButtonEdit3});
- this.gcMx4.Size = new System.Drawing.Size(1340, 408);
+ this.gcMx4.Size = new System.Drawing.Size(1184, 408);
this.gcMx4.TabIndex = 1;
this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx4});
@@ -1937,6 +1878,7 @@
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.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
//
// gridColumn16
//
@@ -1957,6 +1899,7 @@
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)});
this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
//
// gridColumn9
//
@@ -1977,6 +1920,7 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍒犻櫎", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
// ucUpFile1
//
@@ -1984,7 +1928,7 @@
this.ucUpFile1.Location = new System.Drawing.Point(0, 0);
this.ucUpFile1.Name = "ucUpFile1";
this.ucUpFile1.parentGuid = null;
- this.ucUpFile1.Size = new System.Drawing.Size(1340, 57);
+ this.ucUpFile1.Size = new System.Drawing.Size(1184, 57);
this.ucUpFile1.TabIndex = 0;
//
// picCheckBox
@@ -1998,11 +1942,21 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // gridColumn32
+ //
+ this.gridColumn32.Caption = "绫诲瀷";
+ this.gridColumn32.FieldName = "orderType";
+ this.gridColumn32.MinWidth = 25;
+ this.gridColumn32.Name = "gridColumn32";
+ this.gridColumn32.Visible = true;
+ this.gridColumn32.VisibleIndex = 25;
+ this.gridColumn32.Width = 94;
+ //
// Frm_MesQaItemsDetect01Check
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1344, 800);
+ this.ClientSize = new System.Drawing.Size(1188, 800);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
@@ -2091,7 +2045,7 @@
this.groupControl2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
- this.tabMxPage3.ResumeLayout(false);
+ this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
@@ -2157,7 +2111,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1sampleSizeNo;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckLevel;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1facLevel;
- private DevExpress.XtraTab.XtraTabPage tabMxPage3;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.GridControl gcMx4;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
@@ -2190,7 +2144,6 @@
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
- private DevExpress.XtraGrid.Columns.GridColumn gv_ftype;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckResu;
@@ -2239,5 +2192,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
private DevExpress.XtraEditors.TextEdit txt_guid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index c76420e..d2ae726 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -386,7 +386,7 @@
/// <param name="e"></param>
private void XtraTabControl2_SelectedPageChanged(object sender, DevExpress.XtraTab.TabPageChangedEventArgs e)
{
- if (e.Page.Name == "tabMxPage3")
+ if (e.Page.Name == "tabMxPage2")
{
getFileList();
}
@@ -468,6 +468,11 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx4.FocusedRowHandle;
@@ -496,6 +501,11 @@
}
}
}
+ /// <summary>
+ /// 娴忚
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx4.FocusedRowHandle;
@@ -516,7 +526,11 @@
}
}
}
-
+ /// <summary>
+ /// 涓嬭浇
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx4.FocusedRowHandle;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
index 8cd2a90..70f8b1c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
@@ -61,31 +61,32 @@
private void GvMx1_CellValueChanged(object sender, DevExpress.XtraGrid.Views.Base.CellValueChangedEventArgs e)
{
- // 鑾峰彇琛屽彞鏌�
- int rowHandle = e.RowHandle;
- // 鑾峰彇鍒�
- // GridColumn col = gvMx1.Columns[e.Column.Name];
- // 鑾峰彇鏂板��
- object newValue = e.Value;
- // 鑾峰彇鏃у��
- // object oldValue = gvMx1.GetRowCellValue(rowHandle, col);
- // MessageBox.Show(newValue.ToString());
- // getModel();
- // 鍦ㄨ繖閲屾墽琛屼綘鐨勯�昏緫锛屼緥濡傦細
- // MessageBox.Show($"琛� {rowHandle}锛屽垪 {col.FieldName} 鐨勫�煎凡浠� {oldValue} 鏀逛负 {newValue}");
- string dt05Guid = gvMx1.GetRowCellValue(e.RowHandle, "guid").ToString();
- string dtCol = e.Column.FieldName;
- gvMx1.CloseEditor();
- gvMx1.PostEditor();
- gvMx1.UpdateCurrentRow();
- var _obj = new
- {
- dt05Guid = dt05Guid,
- fSeq = dtCol,
- fVal = newValue,
- };
try
{
+ // 鑾峰彇琛屽彞鏌�
+ int rowHandle = e.RowHandle;
+ // 鑾峰彇鍒�
+ // GridColumn col = gvMx1.Columns[e.Column.Name];
+ // 鑾峰彇鏂板��
+ object newValue = e.Value;
+ if (newValue == null || string.IsNullOrEmpty(newValue.ToString())) { return; }
+ // 鑾峰彇鏃у��
+ // object oldValue = gvMx1.GetRowCellValue(rowHandle, col);
+ // MessageBox.Show(newValue.ToString());
+ // getModel();
+ // 鍦ㄨ繖閲屾墽琛屼綘鐨勯�昏緫锛屼緥濡傦細
+ // MessageBox.Show($"琛� {rowHandle}锛屽垪 {col.FieldName} 鐨勫�煎凡浠� {oldValue} 鏀逛负 {newValue}");
+ string dt05Guid = gvMx1.GetRowCellValue(e.RowHandle, "guid").ToString();
+ string dtCol = e.Column.FieldName;
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ var _obj = new
+ {
+ dt05Guid = dt05Guid,
+ fSeq = dtCol,
+ fVal = newValue,
+ };
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditYangLi", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
@@ -95,7 +96,8 @@
string _outSum = _rtn.rtnData.outSum;
if (string.IsNullOrEmpty(_outSum)) _outSum = "-1";
if (int.Parse(_outSum) < 0) {
- MessageBox.Show(_outMsg);
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(_outMsg);
+ gvMx1.SetRowCellValue(rowHandle, dtCol,"");
}
if (_strYbNo == "鏍锋湰鏁�")
getModel();
--
Gitblit v1.9.3