From 061078119e918c8fe4bd205315dfc17401d5a821 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 20 九月 2025 14:42:30 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs | 9
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs | 447 +++++++++++++++++++++++-----------------
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs | 148 ++++++------
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 2
5 files changed, 338 insertions(+), 271 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index ba03d5f..90af3a5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -906,7 +906,8 @@
"4:瀹㈡埛璧犻��",
"5:鎶ュ簾鍑哄簱",
"6:鏍锋満鍑哄簱",
- "7:鏃犳簮鍗曞澶栭��鏂�"});
+ "7:鏃犳簮鍗曞澶栭��鏂�",
+ "8:鐩樹簭"});
this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_qtlx.Size = new System.Drawing.Size(165, 24);
this.txt_qtlx.StyleController = this.layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
index 497a73c..cfe2b81 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
@@ -625,8 +625,6 @@
this.gv_lastupdateBy.Name = "gv_lastupdateBy";
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
- this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 15;
this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
@@ -638,8 +636,6 @@
this.gv_lastupdateDate.Name = "gv_lastupdateDate";
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
- this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 16;
this.gv_lastupdateDate.Width = 120;
//
// gridColumn18
@@ -649,7 +645,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 17;
+ this.gridColumn18.VisibleIndex = 15;
this.gridColumn18.Width = 94;
//
// gridColumn19
@@ -659,7 +655,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 18;
+ this.gridColumn19.VisibleIndex = 16;
this.gridColumn19.Width = 94;
//
// gridColumn30
@@ -724,7 +720,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 19;
+ this.gridColumn7.VisibleIndex = 17;
this.gridColumn7.Width = 94;
//
// pageBar1
@@ -818,17 +814,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";
@@ -838,94 +834,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";
@@ -943,36 +939,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";
@@ -981,16 +977,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;
//
@@ -998,7 +994,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;
//
@@ -1006,7 +1002,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;
//
@@ -1092,70 +1088,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;
@@ -1165,7 +1161,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);
//
@@ -1175,72 +1171,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);
//
@@ -1250,7 +1246,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);
//
@@ -1258,11 +1254,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);
//
@@ -1272,7 +1268,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);
//
@@ -1280,11 +1276,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);
//
@@ -1295,7 +1291,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);
//
@@ -1306,7 +1302,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);
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
index 58da719..1341109 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
@@ -42,9 +42,13 @@
DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ this.lb_color = new DevExpress.XtraEditors.LabelControl();
+ this.lb_colorIng = new DevExpress.XtraEditors.LabelControl();
+ this.lb_colorFinish = new DevExpress.XtraEditors.LabelControl();
this.lb_qtRk = new DevExpress.XtraEditors.LabelControl();
this.lb_FSalesManId = new DevExpress.XtraEditors.LabelControl();
this.lb_sctlbfb = new DevExpress.XtraEditors.LabelControl();
@@ -64,6 +68,9 @@
this.txt_sctlbfb = new DevExpress.XtraEditors.TextEdit();
this.txt_FSalesManId = new DevExpress.XtraEditors.TextEdit();
this.txt_qtRk = new DevExpress.XtraEditors.TextEdit();
+ this.txt_colorFinish = new DevExpress.XtraEditors.TextEdit();
+ this.txt_colorIng = new DevExpress.XtraEditors.TextEdit();
+ this.txt_color = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -71,6 +78,10 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -81,21 +92,15 @@
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_colorFinish = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_colorIng = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_color = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lb_colorFinish = new DevExpress.XtraEditors.LabelControl();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lb_colorIng = new DevExpress.XtraEditors.LabelControl();
- this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lb_color = new DevExpress.XtraEditors.LabelControl();
- this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_OutsXjxc = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.lb_OutsXjxc = new DevExpress.XtraEditors.LabelControl();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
this.splitContainerControl1.Panel1.SuspendLayout();
@@ -114,6 +119,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_sctlbfb.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_FSalesManId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qtRk.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_colorFinish.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_colorIng.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_color.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
@@ -121,6 +129,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -131,18 +143,14 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_colorFinish.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_colorIng.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_color.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OutsXjxc.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
this.SuspendLayout();
//
// splitContainerControl1
@@ -176,6 +184,7 @@
//
// layoutControl1
//
+ this.layoutControl1.Controls.Add(this.lb_OutsXjxc);
this.layoutControl1.Controls.Add(this.lb_color);
this.layoutControl1.Controls.Add(this.lb_colorIng);
this.layoutControl1.Controls.Add(this.lb_colorFinish);
@@ -201,6 +210,7 @@
this.layoutControl1.Controls.Add(this.txt_colorFinish);
this.layoutControl1.Controls.Add(this.txt_colorIng);
this.layoutControl1.Controls.Add(this.txt_color);
+ this.layoutControl1.Controls.Add(this.txt_OutsXjxc);
this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutControl1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem8,
@@ -212,16 +222,44 @@
this.layoutControlItem19,
this.layoutControlItem25,
this.layoutControlItem24,
- this.layoutControlItem17,
this.layoutControlItem23,
- this.layoutControlItem7});
+ this.layoutControlItem7,
+ this.layoutControlItem27,
+ this.layoutControlItem17});
this.layoutControl1.Location = new System.Drawing.Point(2, 28);
this.layoutControl1.Name = "layoutControl1";
- this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(924, 201, 812, 500);
+ this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(924, 201, 812, 623);
this.layoutControl1.Root = this.Root;
this.layoutControl1.Size = new System.Drawing.Size(549, 448);
this.layoutControl1.TabIndex = 0;
this.layoutControl1.Text = "layoutControl1";
+ //
+ // lb_color
+ //
+ this.lb_color.Location = new System.Drawing.Point(440, 374);
+ this.lb_color.Name = "lb_color";
+ this.lb_color.Size = new System.Drawing.Size(30, 18);
+ this.lb_color.StyleController = this.layoutControl1;
+ this.lb_color.TabIndex = 29;
+ this.lb_color.Text = "color";
+ //
+ // lb_colorIng
+ //
+ this.lb_colorIng.Location = new System.Drawing.Point(440, 341);
+ this.lb_colorIng.Name = "lb_colorIng";
+ this.lb_colorIng.Size = new System.Drawing.Size(52, 18);
+ this.lb_colorIng.StyleController = this.layoutControl1;
+ this.lb_colorIng.TabIndex = 28;
+ this.lb_colorIng.Text = "colorIng";
+ //
+ // lb_colorFinish
+ //
+ this.lb_colorFinish.Location = new System.Drawing.Point(440, 308);
+ this.lb_colorFinish.Name = "lb_colorFinish";
+ this.lb_colorFinish.Size = new System.Drawing.Size(65, 18);
+ this.lb_colorFinish.StyleController = this.layoutControl1;
+ this.lb_colorFinish.TabIndex = 27;
+ this.lb_colorFinish.Text = "colorFinish";
//
// lb_qtRk
//
@@ -234,7 +272,7 @@
//
// lb_FSalesManId
//
- this.lb_FSalesManId.Location = new System.Drawing.Point(440, 242);
+ this.lb_FSalesManId.Location = new System.Drawing.Point(454, 223);
this.lb_FSalesManId.Name = "lb_FSalesManId";
this.lb_FSalesManId.Size = new System.Drawing.Size(83, 18);
this.lb_FSalesManId.StyleController = this.layoutControl1;
@@ -306,24 +344,24 @@
//
// txt_qtrkdysy
//
- this.txt_qtrkdysy.Location = new System.Drawing.Point(187, 12);
+ this.txt_qtrkdysy.Location = new System.Drawing.Point(247, 12);
this.txt_qtrkdysy.Name = "txt_qtrkdysy";
- this.txt_qtrkdysy.Size = new System.Drawing.Size(350, 24);
+ this.txt_qtrkdysy.Size = new System.Drawing.Size(290, 24);
this.txt_qtrkdysy.StyleController = this.layoutControl1;
this.txt_qtrkdysy.TabIndex = 4;
//
// txt_qtrkdcgy
//
- this.txt_qtrkdcgy.Location = new System.Drawing.Point(187, 44);
+ this.txt_qtrkdcgy.Location = new System.Drawing.Point(247, 40);
this.txt_qtrkdcgy.Name = "txt_qtrkdcgy";
- this.txt_qtrkdcgy.Size = new System.Drawing.Size(350, 24);
+ this.txt_qtrkdcgy.Size = new System.Drawing.Size(290, 24);
this.txt_qtrkdcgy.StyleController = this.layoutControl1;
this.txt_qtrkdcgy.TabIndex = 5;
//
// btnSave
//
this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x161;
- this.btnSave.Location = new System.Drawing.Point(12, 407);
+ this.btnSave.Location = new System.Drawing.Point(12, 409);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(96, 27);
this.btnSave.StyleController = this.layoutControl1;
@@ -332,7 +370,7 @@
//
// txt_qtkg
//
- this.txt_qtkg.Location = new System.Drawing.Point(12, 77);
+ this.txt_qtkg.Location = new System.Drawing.Point(12, 68);
this.txt_qtkg.Name = "txt_qtkg";
this.txt_qtkg.Properties.Caption = "榻愬寮�宸�";
this.txt_qtkg.Size = new System.Drawing.Size(525, 24);
@@ -341,51 +379,75 @@
//
// txt_qtckdllr
//
- this.txt_qtckdllr.Location = new System.Drawing.Point(187, 110);
+ this.txt_qtckdllr.Location = new System.Drawing.Point(247, 99);
this.txt_qtckdllr.Name = "txt_qtckdllr";
- this.txt_qtckdllr.Size = new System.Drawing.Size(350, 24);
+ this.txt_qtckdllr.Size = new System.Drawing.Size(290, 24);
this.txt_qtckdllr.StyleController = this.layoutControl1;
this.txt_qtckdllr.TabIndex = 9;
//
// txt_qtckdcgy
//
- this.txt_qtckdcgy.Location = new System.Drawing.Point(187, 143);
+ this.txt_qtckdcgy.Location = new System.Drawing.Point(247, 130);
this.txt_qtckdcgy.Name = "txt_qtckdcgy";
- this.txt_qtckdcgy.Size = new System.Drawing.Size(350, 24);
+ this.txt_qtckdcgy.Size = new System.Drawing.Size(290, 24);
this.txt_qtckdcgy.StyleController = this.layoutControl1;
this.txt_qtckdcgy.TabIndex = 10;
//
// txt_cgthsqcgy
//
- this.txt_cgthsqcgy.Location = new System.Drawing.Point(187, 176);
+ this.txt_cgthsqcgy.Location = new System.Drawing.Point(247, 161);
this.txt_cgthsqcgy.Name = "txt_cgthsqcgy";
- this.txt_cgthsqcgy.Size = new System.Drawing.Size(350, 24);
+ this.txt_cgthsqcgy.Size = new System.Drawing.Size(290, 24);
this.txt_cgthsqcgy.StyleController = this.layoutControl1;
this.txt_cgthsqcgy.TabIndex = 16;
//
// txt_sctlbfb
//
- this.txt_sctlbfb.Location = new System.Drawing.Point(187, 209);
+ this.txt_sctlbfb.Location = new System.Drawing.Point(247, 192);
this.txt_sctlbfb.Name = "txt_sctlbfb";
- this.txt_sctlbfb.Size = new System.Drawing.Size(350, 24);
+ this.txt_sctlbfb.Size = new System.Drawing.Size(290, 24);
this.txt_sctlbfb.StyleController = this.layoutControl1;
this.txt_sctlbfb.TabIndex = 18;
//
// txt_FSalesManId
//
- this.txt_FSalesManId.Location = new System.Drawing.Point(187, 242);
+ this.txt_FSalesManId.Location = new System.Drawing.Point(247, 223);
this.txt_FSalesManId.Name = "txt_FSalesManId";
- this.txt_FSalesManId.Size = new System.Drawing.Size(350, 24);
+ this.txt_FSalesManId.Size = new System.Drawing.Size(290, 24);
this.txt_FSalesManId.StyleController = this.layoutControl1;
this.txt_FSalesManId.TabIndex = 20;
//
// txt_qtRk
//
- this.txt_qtRk.Location = new System.Drawing.Point(187, 275);
+ this.txt_qtRk.Location = new System.Drawing.Point(247, 254);
this.txt_qtRk.Name = "txt_qtRk";
- this.txt_qtRk.Size = new System.Drawing.Size(350, 24);
+ this.txt_qtRk.Size = new System.Drawing.Size(290, 24);
this.txt_qtRk.StyleController = this.layoutControl1;
this.txt_qtRk.TabIndex = 22;
+ //
+ // txt_colorFinish
+ //
+ this.txt_colorFinish.Location = new System.Drawing.Point(247, 285);
+ this.txt_colorFinish.Name = "txt_colorFinish";
+ this.txt_colorFinish.Size = new System.Drawing.Size(290, 24);
+ this.txt_colorFinish.StyleController = this.layoutControl1;
+ this.txt_colorFinish.TabIndex = 24;
+ //
+ // txt_colorIng
+ //
+ this.txt_colorIng.Location = new System.Drawing.Point(247, 316);
+ this.txt_colorIng.Name = "txt_colorIng";
+ this.txt_colorIng.Size = new System.Drawing.Size(290, 24);
+ this.txt_colorIng.StyleController = this.layoutControl1;
+ this.txt_colorIng.TabIndex = 25;
+ //
+ // txt_color
+ //
+ this.txt_color.Location = new System.Drawing.Point(247, 347);
+ this.txt_color.Name = "txt_color";
+ this.txt_color.Size = new System.Drawing.Size(290, 24);
+ this.txt_color.StyleController = this.layoutControl1;
+ this.txt_color.TabIndex = 26;
//
// layoutControlItem8
//
@@ -468,6 +530,54 @@
this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem19.TextVisible = false;
//
+ // layoutControlItem25
+ //
+ this.layoutControlItem25.Control = this.lb_color;
+ this.layoutControlItem25.Location = new System.Drawing.Point(428, 362);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 11;
+ this.layoutControlItem25.Size = new System.Drawing.Size(101, 33);
+ this.layoutControlItem25.Text = "榛樿琛岄鑹瞝abel";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem25.TextVisible = false;
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.Control = this.lb_colorIng;
+ this.layoutControlItem24.Location = new System.Drawing.Point(428, 329);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 10;
+ this.layoutControlItem24.Size = new System.Drawing.Size(101, 33);
+ this.layoutControlItem24.Text = "杩涜涓棰滆壊label";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem24.TextVisible = false;
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.lb_colorFinish;
+ this.layoutControlItem23.Location = new System.Drawing.Point(428, 296);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 9;
+ this.layoutControlItem23.Size = new System.Drawing.Size(101, 33);
+ this.layoutControlItem23.Text = "瀹岀粨瀹屾垚琛岄鑹瞝abel";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem23.TextVisible = false;
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.lb_qtrkdysy;
+ this.layoutControlItem7.Location = new System.Drawing.Point(428, 131);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem7.Size = new System.Drawing.Size(101, 33);
+ this.layoutControlItem7.Text = "鍏跺畠鍏ュ簱鍗曢獙鏀跺憳label";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem7.TextVisible = false;
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -482,10 +592,11 @@
this.layoutControlItem14,
this.layoutControlItem16,
this.layoutControlItem18,
- this.layoutControlItem4,
this.layoutControlItem20,
this.layoutControlItem21,
- this.layoutControlItem22});
+ this.layoutControlItem22,
+ this.layoutControlItem4,
+ this.layoutControlItem26});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -518,6 +629,8 @@
rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition13.Height = 100D;
rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 31D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.AutoSize;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
@@ -531,7 +644,8 @@
rowDefinition10,
rowDefinition11,
rowDefinition12,
- rowDefinition13});
+ rowDefinition13,
+ rowDefinition14});
this.Root.Size = new System.Drawing.Size(549, 448);
this.Root.TextVisible = false;
//
@@ -540,27 +654,27 @@
this.layoutControlItem1.Control = this.txt_qtrkdysy;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(529, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(529, 28);
this.layoutControlItem1.Text = "鍏跺畠鍏ュ簱鍗曢獙鏀跺憳";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(163, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(223, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_qtrkdcgy;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem2.Size = new System.Drawing.Size(529, 28);
this.layoutControlItem2.Text = "鍏跺畠鍏ュ簱鍗曚粨绠″憳";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(163, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(223, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_qtkg;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 65);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem3.Size = new System.Drawing.Size(529, 31);
this.layoutControlItem3.Text = "榻愬寮�宸�";
this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem3.TextVisible = false;
@@ -568,218 +682,158 @@
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_qtckdllr;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 98);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 87);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem5.Size = new System.Drawing.Size(529, 31);
this.layoutControlItem5.Text = "鍏跺畠鍑哄簱鍗曢鏂欎汉";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(163, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(223, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_qtckdcgy;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 131);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 118);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem6.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem6.Size = new System.Drawing.Size(529, 31);
this.layoutControlItem6.Text = "鍏跺畠鍑哄簱鍗曚粨绠″憳";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(163, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(223, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_cgthsqcgy;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 164);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 149);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem12.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem12.Size = new System.Drawing.Size(529, 31);
this.layoutControlItem12.Text = "閲囪喘閫�璐х敵璇烽噰璐憳";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(163, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(223, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_sctlbfb;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 197);
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 180);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem14.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem14.Size = new System.Drawing.Size(529, 31);
this.layoutControlItem14.Text = "鐢熶骇閫�鏂欒秴%鍒欒瀹℃牳";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(163, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(223, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_FSalesManId;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 230);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 211);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem16.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem16.Size = new System.Drawing.Size(529, 31);
this.layoutControlItem16.Text = "閿�鍞憳";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(163, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(223, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_qtRk;
- this.layoutControlItem18.Location = new System.Drawing.Point(0, 263);
+ this.layoutControlItem18.Location = new System.Drawing.Point(0, 242);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem18.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem18.Size = new System.Drawing.Size(529, 31);
this.layoutControlItem18.Text = "榻愬鍏ュ簱(1:寮�鍚�,0:鍏抽棴)";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(163, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.btnSave;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 395);
- this.layoutControlItem4.MaxSize = new System.Drawing.Size(100, 31);
- this.layoutControlItem4.MinSize = new System.Drawing.Size(90, 31);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 12;
- this.layoutControlItem4.Size = new System.Drawing.Size(529, 33);
- this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem4.Text = "纭畾淇濆瓨";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem4.TextVisible = false;
- //
- // txt_colorFinish
- //
- this.txt_colorFinish.Location = new System.Drawing.Point(187, 308);
- this.txt_colorFinish.Name = "txt_colorFinish";
- this.txt_colorFinish.Size = new System.Drawing.Size(350, 24);
- this.txt_colorFinish.StyleController = this.layoutControl1;
- this.txt_colorFinish.TabIndex = 24;
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(223, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_colorFinish;
- this.layoutControlItem20.Location = new System.Drawing.Point(0, 296);
+ this.layoutControlItem20.Location = new System.Drawing.Point(0, 273);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 9;
- this.layoutControlItem20.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem20.Size = new System.Drawing.Size(529, 31);
this.layoutControlItem20.Text = "瀹岀粨瀹屾垚琛岄鑹�";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(163, 18);
- //
- // txt_colorIng
- //
- this.txt_colorIng.Location = new System.Drawing.Point(187, 341);
- this.txt_colorIng.Name = "txt_colorIng";
- this.txt_colorIng.Size = new System.Drawing.Size(350, 24);
- this.txt_colorIng.StyleController = this.layoutControl1;
- this.txt_colorIng.TabIndex = 25;
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(223, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_colorIng;
- this.layoutControlItem21.Location = new System.Drawing.Point(0, 329);
+ this.layoutControlItem21.Location = new System.Drawing.Point(0, 304);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 10;
- this.layoutControlItem21.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem21.Size = new System.Drawing.Size(529, 31);
this.layoutControlItem21.Text = "杩涜涓棰滆壊";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(163, 18);
- //
- // txt_color
- //
- this.txt_color.Location = new System.Drawing.Point(187, 374);
- this.txt_color.Name = "txt_color";
- this.txt_color.Size = new System.Drawing.Size(350, 24);
- this.txt_color.StyleController = this.layoutControl1;
- this.txt_color.TabIndex = 26;
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(223, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_color;
- this.layoutControlItem22.Location = new System.Drawing.Point(0, 362);
+ this.layoutControlItem22.Location = new System.Drawing.Point(0, 335);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 11;
- this.layoutControlItem22.Size = new System.Drawing.Size(529, 33);
+ this.layoutControlItem22.Size = new System.Drawing.Size(529, 31);
this.layoutControlItem22.Text = "榛樿琛岄鑹�";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(163, 18);
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(223, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.lb_FSalesManId;
this.layoutControlItem17.CustomizationFormText = "閿�鍞憳label";
- this.layoutControlItem17.Location = new System.Drawing.Point(428, 230);
+ this.layoutControlItem17.Location = new System.Drawing.Point(442, 211);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem17.Size = new System.Drawing.Size(101, 33);
+ this.layoutControlItem17.Size = new System.Drawing.Size(87, 31);
this.layoutControlItem17.Text = "閿�鍞憳";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
//
- // layoutControlItem7
+ // layoutControlItem4
//
- this.layoutControlItem7.Control = this.lb_qtrkdysy;
- this.layoutControlItem7.Location = new System.Drawing.Point(428, 131);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem7.Size = new System.Drawing.Size(101, 33);
- this.layoutControlItem7.Text = "鍏跺畠鍏ュ簱鍗曢獙鏀跺憳label";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem7.TextVisible = false;
+ this.layoutControlItem4.Control = this.btnSave;
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 397);
+ this.layoutControlItem4.MaxSize = new System.Drawing.Size(100, 31);
+ this.layoutControlItem4.MinSize = new System.Drawing.Size(90, 31);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 13;
+ this.layoutControlItem4.Size = new System.Drawing.Size(529, 31);
+ this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem4.Text = "纭畾淇濆瓨";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem4.TextVisible = false;
//
- // lb_colorFinish
+ // txt_OutsXjxc
//
- this.lb_colorFinish.Location = new System.Drawing.Point(440, 308);
- this.lb_colorFinish.Name = "lb_colorFinish";
- this.lb_colorFinish.Size = new System.Drawing.Size(65, 18);
- this.lb_colorFinish.StyleController = this.layoutControl1;
- this.lb_colorFinish.TabIndex = 27;
- this.lb_colorFinish.Text = "colorFinish";
+ this.txt_OutsXjxc.Location = new System.Drawing.Point(247, 378);
+ this.txt_OutsXjxc.Name = "txt_OutsXjxc";
+ this.txt_OutsXjxc.Size = new System.Drawing.Size(290, 24);
+ this.txt_OutsXjxc.StyleController = this.layoutControl1;
+ this.txt_OutsXjxc.TabIndex = 30;
//
- // layoutControlItem23
+ // layoutControlItem26
//
- this.layoutControlItem23.Control = this.lb_colorFinish;
- this.layoutControlItem23.Location = new System.Drawing.Point(428, 296);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 9;
- this.layoutControlItem23.Size = new System.Drawing.Size(101, 33);
- this.layoutControlItem23.Text = "瀹岀粨瀹屾垚琛岄鑹瞝abel";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem23.TextVisible = false;
+ this.layoutControlItem26.Control = this.txt_OutsXjxc;
+ this.layoutControlItem26.Location = new System.Drawing.Point(0, 366);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 12;
+ this.layoutControlItem26.Size = new System.Drawing.Size(529, 31);
+ this.layoutControlItem26.Text = "鐢熶骇棰嗘枡鍏堣繘鍏堝嚭(1:寮�鍚�,0:鍏抽棴)";
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(223, 18);
//
- // lb_colorIng
+ // lb_OutsXjxc
//
- this.lb_colorIng.Location = new System.Drawing.Point(440, 341);
- this.lb_colorIng.Name = "lb_colorIng";
- this.lb_colorIng.Size = new System.Drawing.Size(52, 18);
- this.lb_colorIng.StyleController = this.layoutControl1;
- this.lb_colorIng.TabIndex = 28;
- this.lb_colorIng.Text = "colorIng";
+ this.lb_OutsXjxc.Location = new System.Drawing.Point(454, 378);
+ this.lb_OutsXjxc.Name = "lb_OutsXjxc";
+ this.lb_OutsXjxc.Size = new System.Drawing.Size(59, 18);
+ this.lb_OutsXjxc.StyleController = this.layoutControl1;
+ this.lb_OutsXjxc.TabIndex = 31;
+ this.lb_OutsXjxc.Text = "OutsXjxc";
//
- // layoutControlItem24
+ // layoutControlItem27
//
- this.layoutControlItem24.Control = this.lb_colorIng;
- this.layoutControlItem24.Location = new System.Drawing.Point(428, 329);
- this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 10;
- this.layoutControlItem24.Size = new System.Drawing.Size(101, 33);
- this.layoutControlItem24.Text = "杩涜涓棰滆壊label";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem24.TextVisible = false;
- //
- // lb_color
- //
- this.lb_color.Location = new System.Drawing.Point(440, 374);
- this.lb_color.Name = "lb_color";
- this.lb_color.Size = new System.Drawing.Size(30, 18);
- this.lb_color.StyleController = this.layoutControl1;
- this.lb_color.TabIndex = 29;
- this.lb_color.Text = "color";
- //
- // layoutControlItem25
- //
- this.layoutControlItem25.Control = this.lb_color;
- this.layoutControlItem25.Location = new System.Drawing.Point(428, 362);
- this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 11;
- this.layoutControlItem25.Size = new System.Drawing.Size(101, 33);
- this.layoutControlItem25.Text = "榛樿琛岄鑹瞝abel";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem25.TextVisible = false;
+ this.layoutControlItem27.Control = this.lb_OutsXjxc;
+ this.layoutControlItem27.CustomizationFormText = "鐢熶骇棰嗘枡鍏堣繘鍏堝嚭label";
+ this.layoutControlItem27.Location = new System.Drawing.Point(442, 366);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 12;
+ this.layoutControlItem27.Size = new System.Drawing.Size(87, 31);
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem27.TextVisible = false;
//
// Frm_Config
//
@@ -807,6 +861,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_sctlbfb.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_FSalesManId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qtRk.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_colorFinish.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_colorIng.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_color.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
@@ -814,6 +871,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -824,18 +885,14 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_colorFinish.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_colorIng.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_color.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_OutsXjxc.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
this.ResumeLayout(false);
}
@@ -882,7 +939,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraEditors.TextEdit txt_colorFinish;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraEditors.LabelControl lb_color;
private DevExpress.XtraEditors.LabelControl lb_colorIng;
@@ -891,10 +947,15 @@
private DevExpress.XtraEditors.TextEdit txt_color;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraEditors.LabelControl lb_OutsXjxc;
+ private DevExpress.XtraEditors.TextEdit txt_OutsXjxc;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
index 3ea9ac0..aa13eb8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
@@ -61,6 +61,10 @@
sb.Append(" values(newid(),'" + lb_colorIng.Text.Trim() + "','" + txt_colorIng.Text.Trim() + "','" + layoutControlItem21.Text.Trim() + "')");
sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
sb.Append(" values(newid(),'" + lb_color.Text.Trim() + "','" + txt_color.Text.Trim() + "','" + layoutControlItem22.Text.Trim() + "')");
+ //鍏堣繘鍏堝嚭
+ sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+ sb.Append(" values(newid(),'" +lb_OutsXjxc.Text.Trim() + "','" + txt_OutsXjxc.Text.Trim() + "','" + layoutControlItem26.Text.Trim() + "')");
+
var _obj = new
{
sql = sb.ToString(),
@@ -162,6 +166,11 @@
txt_color.Text = row["parameterValue"].ToString();
continue;
}
+ if (row["remark"].ToString() == layoutControlItem26.Text)
+ {
+ txt_OutsXjxc.Text = row["parameterValue"].ToString();
+ continue;
+ }
}
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 6e78391..853e76a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -143,7 +143,7 @@
_type = "宸ュ簭G003:姘存涓嶈壇鎻忚堪";
if (txt_gx.Text.Trim() == fGxZhongJian)
_type = "宸ュ簭G004:缁堟涓嶈壇鎻忚堪";
- UcDictionarySelect frm = new UcDictionarySelect("宸ュ簭涓嶈壇鎻忚堪", " a.s_type='"+ _type + "' and pid<>'00000000-0000-0000-0000-000000000000'", _msg);
+ UcDictionarySelect frm = new UcDictionarySelect(_type, " a.s_type='"+ _type + "' and pid<>'00000000-0000-0000-0000-000000000000'", _msg);
frm.UpdateParent += (ss, ee) =>
{
System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
--
Gitblit v1.9.3