From 800f1652b2ed0473850975efe5028685bcd605c4 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 20 九月 2025 14:42:40 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs | 191 +++++++++++++++++++++++------------------------
1 files changed, 94 insertions(+), 97 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs
index e02be5b..fab4d5b 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.Designer.cs
@@ -60,7 +60,6 @@
this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -76,6 +75,7 @@
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -382,7 +382,6 @@
this.gv_boardStyle,
this.gridColumn14,
this.gv_fcovertQty,
- this.gv_fbatchQty,
this.gv_fcheckResu,
this.gv_remarks,
this.gv_fcheckBy,
@@ -397,7 +396,8 @@
this.gridColumn13,
this.gridColumn17,
this.gridColumn5,
- this.gridColumn6});
+ this.gridColumn6,
+ this.gridColumn7});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -517,19 +517,6 @@
this.gv_fcovertQty.VisibleIndex = 10;
this.gv_fcovertQty.Width = 60;
//
- // gv_fbatchQty
- //
- this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
- this.gv_fbatchQty.Caption = "鎶芥鏁伴噺";
- this.gv_fbatchQty.FieldName = "fbatchQty";
- this.gv_fbatchQty.MinWidth = 30;
- 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 = 11;
- this.gv_fbatchQty.Width = 80;
- //
// gv_fcheckResu
//
this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
@@ -553,7 +540,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 12;
+ this.gv_remarks.VisibleIndex = 11;
this.gv_remarks.Width = 100;
//
// gv_fcheckBy
@@ -566,7 +553,7 @@
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 13;
+ this.gv_fcheckBy.VisibleIndex = 12;
this.gv_fcheckBy.Width = 118;
//
// gv_fcheckDate
@@ -579,7 +566,7 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 14;
+ this.gv_fcheckDate.VisibleIndex = 13;
this.gv_fcheckDate.Width = 182;
//
// gv_createBy
@@ -592,7 +579,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 15;
+ this.gv_createBy.VisibleIndex = 14;
this.gv_createBy.Width = 67;
//
// gridColumn15
@@ -602,7 +589,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 16;
+ this.gridColumn15.VisibleIndex = 15;
this.gridColumn15.Width = 94;
//
// gv_lastupdateBy
@@ -615,7 +602,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 17;
+ this.gv_lastupdateBy.VisibleIndex = 16;
this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
@@ -628,7 +615,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 18;
+ this.gv_lastupdateDate.VisibleIndex = 17;
this.gv_lastupdateDate.Width = 120;
//
// gridColumn18
@@ -638,7 +625,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 19;
+ this.gridColumn18.VisibleIndex = 18;
this.gridColumn18.Width = 94;
//
// gridColumn19
@@ -648,7 +635,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 20;
+ this.gridColumn19.VisibleIndex = 19;
this.gridColumn19.Width = 94;
//
// gridColumn30
@@ -678,7 +665,7 @@
// gridColumn5
//
this.gridColumn5.Caption = "妫�楠岀姸鎬�";
- this.gridColumn5.FieldName = "checkStates";
+ this.gridColumn5.FieldName = "txtColor";
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
@@ -694,6 +681,16 @@
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 2;
this.gridColumn6.Width = 94;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鐢熶骇缁勭粐";
+ this.gridColumn7.FieldName = "fSubsidiary";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 20;
+ this.gridColumn7.Width = 94;
//
// pageBar1
//
@@ -785,17 +782,17 @@
this.txt_remarks.Location = new System.Drawing.Point(84, 124);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(574, 24);
+ this.txt_remarks.Size = new System.Drawing.Size(584, 24);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 797;
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(734, 124);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(744, 124);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fcheckResu.Size = new System.Drawing.Size(249, 24);
+ this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
this.txt_fcheckResu.StyleController = this.layoutMx1;
this.txt_fcheckResu.TabIndex = 798;
this.txt_fcheckResu.Tag = "readonly";
@@ -805,94 +802,94 @@
this.txt_releaseNo.Location = new System.Drawing.Point(84, 12);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(249, 24);
+ this.txt_releaseNo.Size = new System.Drawing.Size(254, 24);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
this.txt_releaseNo.Tag = "readonly";
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(734, 40);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(744, 40);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(249, 24);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
this.txt_fcheckDate.StyleController = this.layoutMx1;
this.txt_fcheckDate.TabIndex = 216;
this.txt_fcheckDate.Tag = "readonly";
//
// txt_lotNo1
//
- this.txt_lotNo1.Location = new System.Drawing.Point(734, 12);
+ this.txt_lotNo1.Location = new System.Drawing.Point(744, 12);
this.txt_lotNo1.Name = "txt_lotNo1";
this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo1.Size = new System.Drawing.Size(249, 24);
+ this.txt_lotNo1.Size = new System.Drawing.Size(254, 24);
this.txt_lotNo1.StyleController = this.layoutMx1;
this.txt_lotNo1.TabIndex = 262;
this.txt_lotNo1.Tag = "";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(409, 68);
+ this.txt_itemNo.Location = new System.Drawing.Point(414, 68);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(249, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(254, 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(409, 96);
+ this.txt_itemModel.Location = new System.Drawing.Point(414, 96);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(249, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 801;
this.txt_itemModel.Tag = "readonly";
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(734, 68);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(744, 68);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckBy.Size = new System.Drawing.Size(249, 24);
+ this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
this.txt_fcheckBy.StyleController = this.layoutMx1;
this.txt_fcheckBy.TabIndex = 217;
this.txt_fcheckBy.Tag = "readonly";
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(409, 12);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(414, 12);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fbatchQty.Size = new System.Drawing.Size(249, 24);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 222;
this.txt_fbatchQty.Tag = "";
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1059, 96);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 96);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
- this.txt_fsubmitBy.Size = new System.Drawing.Size(250, 24);
+ this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
this.txt_fsubmitBy.TabIndex = 804;
this.txt_fsubmitBy.Tag = "readonly";
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1059, 68);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 68);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
- this.txt_fsubmitDate.Size = new System.Drawing.Size(250, 24);
+ this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
this.txt_fsubmitDate.TabIndex = 805;
this.txt_fsubmitDate.Tag = "readonly";
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(987, 124);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1002, 124);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fsubmit.Size = new System.Drawing.Size(322, 24);
+ this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
this.txt_fsubmit.StyleController = this.layoutMx1;
this.txt_fsubmit.TabIndex = 806;
this.txt_fsubmit.Tag = "readonly";
@@ -910,36 +907,36 @@
//
this.txt_lotNo.Location = new System.Drawing.Point(84, 40);
this.txt_lotNo.Name = "txt_lotNo";
- this.txt_lotNo.Size = new System.Drawing.Size(249, 24);
+ this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
this.txt_lotNo.StyleController = this.layoutMx1;
this.txt_lotNo.TabIndex = 815;
this.txt_lotNo.Tag = "readonly";
//
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(734, 96);
+ this.txt_checkStates.Location = new System.Drawing.Point(744, 96);
this.txt_checkStates.Name = "txt_checkStates";
this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
- this.txt_checkStates.Size = new System.Drawing.Size(249, 24);
+ this.txt_checkStates.Size = new System.Drawing.Size(254, 24);
this.txt_checkStates.StyleController = this.layoutMx1;
this.txt_checkStates.TabIndex = 819;
this.txt_checkStates.Tag = "readonly";
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(1059, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(1074, 12);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(250, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(256, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 822;
this.txt_createBy.Tag = "readonly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(1059, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(1074, 40);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(250, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(256, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 823;
this.txt_createDate.Tag = "readonly";
@@ -948,16 +945,16 @@
//
this.txt_itemName.Location = new System.Drawing.Point(84, 96);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(249, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(254, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 825;
this.txt_itemName.Tag = "readonly";
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(409, 40);
+ this.txt_lineName.Location = new System.Drawing.Point(414, 40);
this.txt_lineName.Name = "txt_lineName";
- this.txt_lineName.Size = new System.Drawing.Size(249, 24);
+ this.txt_lineName.Size = new System.Drawing.Size(254, 24);
this.txt_lineName.StyleController = this.layoutMx1;
this.txt_lineName.TabIndex = 826;
//
@@ -965,7 +962,7 @@
//
this.txt_itemId.Location = new System.Drawing.Point(84, 68);
this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(249, 24);
+ this.txt_itemId.Size = new System.Drawing.Size(254, 24);
this.txt_itemId.StyleController = this.layoutMx1;
this.txt_itemId.TabIndex = 827;
//
@@ -973,7 +970,7 @@
//
this.txt_fngDesc.Location = new System.Drawing.Point(84, 152);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(574, 24);
+ this.txt_fngDesc.Size = new System.Drawing.Size(584, 24);
this.txt_fngDesc.StyleController = this.layoutMx1;
this.txt_fngDesc.TabIndex = 828;
//
@@ -1059,70 +1056,70 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1321, 188);
+ this.Root.Size = new System.Drawing.Size(1342, 188);
this.Root.TextVisible = false;
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(325, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(330, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem9.Text = "鎶芥鏁伴噺";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.txt_createBy;
- this.layoutControlItem31.Location = new System.Drawing.Point(975, 0);
+ this.layoutControlItem31.Location = new System.Drawing.Point(990, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem31.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem31.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_createDate;
- this.layoutControlItem33.Location = new System.Drawing.Point(975, 28);
+ this.layoutControlItem33.Location = new System.Drawing.Point(990, 28);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem33.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem33.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(975, 56);
+ this.layoutControlItem16.Location = new System.Drawing.Point(990, 56);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(975, 84);
+ this.layoutControlItem15.Location = new System.Drawing.Point(990, 84);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(975, 112);
+ this.layoutControlItem14.Location = new System.Drawing.Point(990, 112);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem14.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1132,7 +1129,7 @@
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, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1142,72 +1139,72 @@
this.layoutControlItem28.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem28.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem28.Text = "鐢熶骇宸ュ崟";
this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_lotNo1;
- this.layoutControlItem3.Location = new System.Drawing.Point(650, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(660, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(650, 28);
+ this.layoutControlItem2.Location = new System.Drawing.Point(660, 28);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(650, 56);
+ this.layoutControlItem8.Location = new System.Drawing.Point(660, 56);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_checkStates;
- this.layoutControlItem32.Location = new System.Drawing.Point(650, 84);
+ this.layoutControlItem32.Location = new System.Drawing.Point(660, 84);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem32.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem32.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(650, 112);
+ this.layoutControlItem10.Location = new System.Drawing.Point(660, 112);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_lineName;
- this.layoutControlItem7.Location = new System.Drawing.Point(325, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(330, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem7.Text = "浜х嚎鍚嶇О";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1217,7 +1214,7 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem4.Text = "浜у搧ID";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1225,11 +1222,11 @@
//
this.layoutControlItem5.Control = this.txt_itemNo;
this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
- this.layoutControlItem5.Location = new System.Drawing.Point(325, 56);
+ this.layoutControlItem5.Location = new System.Drawing.Point(330, 56);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1239,7 +1236,7 @@
this.layoutControlItem34.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem34.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem34.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem34.Text = "浜у搧鍚嶇О";
this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1247,11 +1244,11 @@
//
this.layoutControlItem6.Control = this.txt_itemModel;
this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
- this.layoutControlItem6.Location = new System.Drawing.Point(325, 84);
+ this.layoutControlItem6.Location = new System.Drawing.Point(330, 84);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1262,7 +1259,7 @@
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem12.Size = new System.Drawing.Size(650, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(660, 28);
this.layoutControlItem12.Text = "澶囨敞璇存槑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1273,7 +1270,7 @@
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem13.Size = new System.Drawing.Size(650, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(660, 28);
this.layoutControlItem13.Text = "寮傚父澶囨敞";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1946,7 +1943,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_XunJianDetect01";
- this.Text = "ipqc棣栨";
+ this.Text = "ipqc宸℃";
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
@@ -2069,7 +2066,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_boardStyle;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fbatchQty;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckResu;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcovertQty;
private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
@@ -2192,5 +2188,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
}
}
\ No newline at end of file
--
Gitblit v1.9.3