From 3dc0ce85e56e3b3d13ec6ab99409ea8e3c0d9078 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期四, 18 九月 2025 16:16:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 189 +++++++++++++++++------------------------------
1 files changed, 69 insertions(+), 120 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 781ccf8..1ed25c0 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -92,7 +92,6 @@
this.gv_daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa005 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -100,8 +99,6 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa015 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa009 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_prepareTime = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_daa028 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa016 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa017 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_mesStartProd = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -597,7 +594,6 @@
this.gv_daa003,
this.gv_daa004,
this.gv_daa008,
- this.gv_daa011,
this.gridColumn4,
this.gv_daa010,
this.gv_daa005,
@@ -605,8 +601,6 @@
this.gridColumn1,
this.gv_daa015,
this.gv_daa009,
- this.gv_prepareTime,
- this.gv_daa028,
this.gv_daa016,
this.gv_daa017,
this.gv_mesStartProd,
@@ -632,8 +626,6 @@
this.gridColumn5.MinWidth = 50;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "query_a.jabs";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 0;
this.gridColumn5.Width = 50;
//
// gridColumn7
@@ -645,7 +637,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Tag = "query_a.jabs";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 1;
+ this.gridColumn7.VisibleIndex = 0;
this.gridColumn7.Width = 50;
//
// gridColumn10
@@ -657,7 +649,7 @@
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Tag = "query_a.jabs";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 2;
+ this.gridColumn10.VisibleIndex = 1;
this.gridColumn10.Width = 50;
//
// gridColumn12
@@ -668,8 +660,6 @@
this.gridColumn12.MinWidth = 50;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Tag = "query_a.jabs";
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 3;
this.gridColumn12.Width = 50;
//
// gridColumn6
@@ -681,7 +671,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "query_a.jabs";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 4;
+ this.gridColumn6.VisibleIndex = 2;
this.gridColumn6.Width = 50;
//
// gridColumn27
@@ -691,20 +681,20 @@
this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
- this.gridColumn27.VisibleIndex = 20;
+ this.gridColumn27.VisibleIndex = 17;
this.gridColumn27.Width = 94;
//
// gv_daa018
//
this.gv_daa018.AppearanceCell.Options.UseFont = true;
this.gv_daa018.Caption = "宸ュ崟鐘舵��";
- this.gv_daa018.FieldName = "daa018Txt";
+ this.gv_daa018.FieldName = "daa018TxtColor";
this.gv_daa018.MinWidth = 90;
this.gv_daa018.Name = "gv_daa018";
this.gv_daa018.OptionsColumn.AllowEdit = false;
this.gv_daa018.Tag = "query_a.daa018";
this.gv_daa018.Visible = true;
- this.gv_daa018.VisibleIndex = 5;
+ this.gv_daa018.VisibleIndex = 3;
this.gv_daa018.Width = 90;
//
// gridColoun100
@@ -715,7 +705,7 @@
this.gridColoun100.Name = "gridColoun100";
this.gridColoun100.Tag = "org.fnamber";
this.gridColoun100.Visible = true;
- this.gridColoun100.VisibleIndex = 29;
+ this.gridColoun100.VisibleIndex = 25;
this.gridColoun100.Width = 250;
//
// gv_daa001
@@ -728,7 +718,7 @@
this.gv_daa001.OptionsColumn.AllowEdit = false;
this.gv_daa001.Tag = "query_a.daa001";
this.gv_daa001.Visible = true;
- this.gv_daa001.VisibleIndex = 6;
+ this.gv_daa001.VisibleIndex = 7;
this.gv_daa001.Width = 120;
//
// gv_daa021
@@ -741,7 +731,7 @@
this.gv_daa021.OptionsColumn.AllowEdit = false;
this.gv_daa021.Tag = "query_a.daa021";
this.gv_daa021.Visible = true;
- this.gv_daa021.VisibleIndex = 7;
+ this.gv_daa021.VisibleIndex = 19;
this.gv_daa021.Width = 100;
//
// gridColumn3
@@ -751,7 +741,7 @@
this.gridColumn3.MinWidth = 50;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 11;
+ this.gridColumn3.VisibleIndex = 10;
this.gridColumn3.Width = 94;
//
// gv_daa003
@@ -764,7 +754,7 @@
this.gv_daa003.OptionsColumn.AllowEdit = false;
this.gv_daa003.Tag = "query_a.daa003";
this.gv_daa003.Visible = true;
- this.gv_daa003.VisibleIndex = 12;
+ this.gv_daa003.VisibleIndex = 11;
this.gv_daa003.Width = 150;
//
// gv_daa004
@@ -777,7 +767,7 @@
this.gv_daa004.OptionsColumn.AllowEdit = false;
this.gv_daa004.Tag = "query_a.daa004";
this.gv_daa004.Visible = true;
- this.gv_daa004.VisibleIndex = 13;
+ this.gv_daa004.VisibleIndex = 14;
this.gv_daa004.Width = 150;
//
// gv_daa008
@@ -791,22 +781,8 @@
this.gv_daa008.OptionsColumn.AllowEdit = false;
this.gv_daa008.Tag = "query_a.daa008";
this.gv_daa008.Visible = true;
- this.gv_daa008.VisibleIndex = 14;
+ this.gv_daa008.VisibleIndex = 4;
this.gv_daa008.Width = 50;
- //
- // gv_daa011
- //
- this.gv_daa011.AppearanceCell.Options.UseFont = true;
- this.gv_daa011.Caption = "宸茬敓浜ч噺";
- this.gv_daa011.FieldName = "daa011";
- this.gv_daa011.MaxWidth = 50;
- this.gv_daa011.MinWidth = 50;
- this.gv_daa011.Name = "gv_daa011";
- this.gv_daa011.OptionsColumn.AllowEdit = false;
- this.gv_daa011.Tag = "query_a.daa011";
- this.gv_daa011.Visible = true;
- this.gv_daa011.VisibleIndex = 15;
- this.gv_daa011.Width = 50;
//
// gridColumn4
//
@@ -814,19 +790,19 @@
this.gridColumn4.AppearanceCell.Options.UseForeColor = true;
this.gridColumn4.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
this.gridColumn4.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn4.Caption = "寰呯敓浜ч噺";
+ this.gridColumn4.Caption = "寰呭叆搴撻噺";
this.gridColumn4.FieldName = "dscl";
this.gridColumn4.MaxWidth = 50;
this.gridColumn4.MinWidth = 50;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 16;
+ this.gridColumn4.VisibleIndex = 6;
this.gridColumn4.Width = 50;
//
// gv_daa010
//
this.gv_daa010.AppearanceCell.Options.UseFont = true;
- this.gv_daa010.Caption = "鍏ュ簱鏁伴噺";
+ this.gv_daa010.Caption = "宸插叆搴撻噺";
this.gv_daa010.FieldName = "daa010";
this.gv_daa010.MaxWidth = 50;
this.gv_daa010.MinWidth = 50;
@@ -834,7 +810,7 @@
this.gv_daa010.OptionsColumn.AllowEdit = false;
this.gv_daa010.Tag = "query_a.daa010";
this.gv_daa010.Visible = true;
- this.gv_daa010.VisibleIndex = 18;
+ this.gv_daa010.VisibleIndex = 5;
this.gv_daa010.Width = 50;
//
// gv_daa005
@@ -848,7 +824,7 @@
this.gv_daa005.OptionsColumn.AllowEdit = false;
this.gv_daa005.Tag = "query_a.daa005";
this.gv_daa005.Visible = true;
- this.gv_daa005.VisibleIndex = 19;
+ this.gv_daa005.VisibleIndex = 16;
this.gv_daa005.Width = 50;
//
// gv_cust
@@ -869,7 +845,7 @@
this.gridColumn1.MinWidth = 50;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 21;
+ this.gridColumn1.VisibleIndex = 18;
this.gridColumn1.Width = 94;
//
// gv_daa015
@@ -882,7 +858,7 @@
this.gv_daa015.OptionsColumn.AllowEdit = false;
this.gv_daa015.Tag = "query_a.daa015";
this.gv_daa015.Visible = true;
- this.gv_daa015.VisibleIndex = 9;
+ this.gv_daa015.VisibleIndex = 8;
this.gv_daa015.Width = 94;
//
// gv_daa009
@@ -895,30 +871,8 @@
this.gv_daa009.OptionsColumn.AllowEdit = false;
this.gv_daa009.Tag = "query_a.daa009";
this.gv_daa009.Visible = true;
- this.gv_daa009.VisibleIndex = 17;
+ this.gv_daa009.VisibleIndex = 15;
this.gv_daa009.Width = 94;
- //
- // gv_prepareTime
- //
- this.gv_prepareTime.AppearanceCell.Options.UseFont = true;
- this.gv_prepareTime.Caption = "棰勮澶囨枡鏃堕棿";
- this.gv_prepareTime.FieldName = "prepareTime";
- this.gv_prepareTime.MinWidth = 50;
- this.gv_prepareTime.Name = "gv_prepareTime";
- this.gv_prepareTime.OptionsColumn.AllowEdit = false;
- this.gv_prepareTime.Tag = "query_a.prepare_time";
- this.gv_prepareTime.Width = 180;
- //
- // gv_daa028
- //
- this.gv_daa028.AppearanceCell.Options.UseFont = true;
- this.gv_daa028.Caption = "澶囨枡瀹屾垚鏃堕棿";
- this.gv_daa028.FieldName = "daa028";
- this.gv_daa028.MinWidth = 50;
- this.gv_daa028.Name = "gv_daa028";
- this.gv_daa028.OptionsColumn.AllowEdit = false;
- this.gv_daa028.Tag = "query_a.daa028";
- this.gv_daa028.Width = 180;
//
// gv_daa016
//
@@ -930,7 +884,7 @@
this.gv_daa016.OptionsColumn.AllowEdit = false;
this.gv_daa016.Tag = "query_a.daa016";
this.gv_daa016.Visible = true;
- this.gv_daa016.VisibleIndex = 22;
+ this.gv_daa016.VisibleIndex = 21;
this.gv_daa016.Width = 180;
//
// gv_daa017
@@ -942,8 +896,6 @@
this.gv_daa017.Name = "gv_daa017";
this.gv_daa017.OptionsColumn.AllowEdit = false;
this.gv_daa017.Tag = "query_a.daa017";
- this.gv_daa017.Visible = true;
- this.gv_daa017.VisibleIndex = 23;
this.gv_daa017.Width = 180;
//
// gv_mesStartProd
@@ -956,7 +908,7 @@
this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
this.gv_mesStartProd.Visible = true;
- this.gv_mesStartProd.VisibleIndex = 24;
+ this.gv_mesStartProd.VisibleIndex = 12;
this.gv_mesStartProd.Width = 180;
//
// gv_mesEndProd
@@ -969,7 +921,7 @@
this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
this.gv_mesEndProd.Visible = true;
- this.gv_mesEndProd.VisibleIndex = 25;
+ this.gv_mesEndProd.VisibleIndex = 13;
this.gv_mesEndProd.Width = 180;
//
// gridColumn21
@@ -979,7 +931,7 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 26;
+ this.gridColumn21.VisibleIndex = 22;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -989,7 +941,7 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 27;
+ this.gridColumn22.VisibleIndex = 23;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -1007,7 +959,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 28;
+ this.gridColumn24.VisibleIndex = 24;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -1017,7 +969,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 8;
+ this.gridColumn25.VisibleIndex = 20;
this.gridColumn25.Width = 94;
//
// gridColumn52
@@ -1027,7 +979,7 @@
this.gridColumn52.MinWidth = 25;
this.gridColumn52.Name = "gridColumn52";
this.gridColumn52.Visible = true;
- this.gridColumn52.VisibleIndex = 10;
+ this.gridColumn52.VisibleIndex = 9;
this.gridColumn52.Width = 94;
//
// pageBar1
@@ -1870,7 +1822,7 @@
this.gvMx1dab004.Name = "gvMx1dab004";
this.gvMx1dab004.Tag = "query_a.dab004";
this.gvMx1dab004.Visible = true;
- this.gvMx1dab004.VisibleIndex = 3;
+ this.gvMx1dab004.VisibleIndex = 4;
this.gvMx1dab004.Width = 89;
//
// gvMx1dab005
@@ -1882,7 +1834,7 @@
this.gvMx1dab005.Name = "gvMx1dab005";
this.gvMx1dab005.Tag = "query_a.dab005";
this.gvMx1dab005.Visible = true;
- this.gvMx1dab005.VisibleIndex = 4;
+ this.gvMx1dab005.VisibleIndex = 5;
this.gvMx1dab005.Width = 89;
//
// gvMx1dab006
@@ -2132,7 +2084,7 @@
this.gridColumn58.MinWidth = 25;
this.gridColumn58.Name = "gridColumn58";
this.gridColumn58.Visible = true;
- this.gridColumn58.VisibleIndex = 5;
+ this.gridColumn58.VisibleIndex = 3;
this.gridColumn58.Width = 94;
//
// xtraTabPage6
@@ -2600,11 +2552,11 @@
//
this.layShuLiang.Controls.Add(this.txt_iCount_1);
this.layShuLiang.Controls.Add(this.txt_yuliang_1);
- this.layShuLiang.Location = new System.Drawing.Point(654, 44);
+ this.layShuLiang.Location = new System.Drawing.Point(662, 44);
this.layShuLiang.Name = "layShuLiang";
this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500);
this.layShuLiang.Root = this.layoutControlGroup3;
- this.layShuLiang.Size = new System.Drawing.Size(317, 28);
+ this.layShuLiang.Size = new System.Drawing.Size(321, 28);
this.layShuLiang.TabIndex = 475;
this.layShuLiang.Text = "dataLayoutControl1";
//
@@ -2613,16 +2565,16 @@
this.txt_iCount_1.Location = new System.Drawing.Point(89, 2);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(67, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(69, 24);
this.txt_iCount_1.StyleController = this.layShuLiang;
this.txt_iCount_1.TabIndex = 5;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(247, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(249, 2);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(68, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(70, 24);
this.txt_yuliang_1.StyleController = this.layShuLiang;
this.txt_yuliang_1.TabIndex = 6;
//
@@ -2647,7 +2599,7 @@
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28);
+ this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
this.layoutControlGroup3.TextVisible = false;
//
// layoutControlItem25
@@ -2655,7 +2607,7 @@
this.layoutControlItem25.Control = this.txt_iCount_1;
this.layoutControlItem25.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.Size = new System.Drawing.Size(158, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(160, 28);
this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2663,16 +2615,16 @@
//
this.layoutControlItem39.Control = this.txt_yuliang_1;
this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
- this.layoutControlItem39.Location = new System.Drawing.Point(158, 0);
+ this.layoutControlItem39.Location = new System.Drawing.Point(160, 0);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem39.Size = new System.Drawing.Size(159, 28);
+ this.layoutControlItem39.Size = new System.Drawing.Size(161, 28);
this.layoutControlItem39.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(973, 10);
+ this.radOut.Location = new System.Drawing.Point(985, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2681,7 +2633,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(321, 32);
+ this.radOut.Size = new System.Drawing.Size(325, 32);
this.radOut.StyleController = this.layoutMx99;
this.radOut.TabIndex = 473;
//
@@ -2689,29 +2641,29 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(973, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(985, 42);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(321, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(325, 32);
this.ucBtnPrint1.TabIndex = 464;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(741, 12);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(749, 12);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(230, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
this.txt_psnQty_1.StyleController = this.layoutMx99;
this.txt_psnQty_1.TabIndex = 330;
this.txt_psnQty_1.Tag = "readOnly-1";
//
// txt_printRemark
//
- this.txt_printRemark.Location = new System.Drawing.Point(420, 44);
+ this.txt_printRemark.Location = new System.Drawing.Point(424, 44);
this.txt_printRemark.Name = "txt_printRemark";
this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_printRemark.Size = new System.Drawing.Size(230, 24);
+ this.txt_printRemark.Size = new System.Drawing.Size(234, 24);
this.txt_printRemark.StyleController = this.layoutMx99;
this.txt_printRemark.TabIndex = 334;
this.txt_printRemark.Tag = "readOnly-1";
@@ -2719,11 +2671,11 @@
// txt_kQty
//
this.txt_kQty.EditValue = "";
- this.txt_kQty.Location = new System.Drawing.Point(420, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(424, 12);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(234, 24);
this.txt_kQty.StyleController = this.layoutMx99;
this.txt_kQty.TabIndex = 472;
this.txt_kQty.Tag = "readonly";
@@ -2734,7 +2686,7 @@
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(234, 24);
this.txt_yQty.StyleController = this.layoutMx99;
this.txt_yQty.TabIndex = 470;
this.txt_yQty.Tag = "readonly";
@@ -2744,7 +2696,7 @@
this.txt_zQty.Location = new System.Drawing.Point(99, 12);
this.txt_zQty.Name = "txt_zQty";
this.txt_zQty.Properties.ReadOnly = true;
- this.txt_zQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_zQty.Size = new System.Drawing.Size(234, 24);
this.txt_zQty.StyleController = this.layoutMx99;
this.txt_zQty.TabIndex = 474;
//
@@ -2772,7 +2724,7 @@
columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition10.Width = 100D;
columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition11.Width = 323D;
+ columnDefinition11.Width = 328D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition7,
columnDefinition8,
@@ -2786,7 +2738,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition8,
rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -2794,21 +2746,21 @@
this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem23.Control = this.txt_kQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(321, 0);
+ this.layoutControlItem23.Location = new System.Drawing.Point(325, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.radOut;
- this.layoutControlItem35.Location = new System.Drawing.Point(963, 0);
+ this.layoutControlItem35.Location = new System.Drawing.Point(975, 0);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem35.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem35.Text = "鑷姩璁＄畻";
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem35.TextVisible = false;
@@ -2818,12 +2770,12 @@
this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem26.Control = this.ucBtnPrint1;
- this.layoutControlItem26.Location = new System.Drawing.Point(963, 32);
+ this.layoutControlItem26.Location = new System.Drawing.Point(975, 32);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem26.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem26.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
@@ -2836,18 +2788,18 @@
this.layoutControlItem22.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_printRemark;
- this.layoutControlItem21.Location = new System.Drawing.Point(321, 32);
+ this.layoutControlItem21.Location = new System.Drawing.Point(325, 32);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2857,21 +2809,21 @@
this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem24.Control = this.txt_psnQty_1;
this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem24.Location = new System.Drawing.Point(642, 0);
+ this.layoutControlItem24.Location = new System.Drawing.Point(650, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem24.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.layShuLiang;
- this.layoutControlItem38.Location = new System.Drawing.Point(642, 32);
+ this.layoutControlItem38.Location = new System.Drawing.Point(650, 32);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem38.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem38.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
@@ -2881,7 +2833,7 @@
this.layoutControlItem36.Control = this.txt_zQty;
this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
- this.layoutControlItem36.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem36.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
//
@@ -4012,7 +3964,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_daa003;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa004;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa008;
- private DevExpress.XtraGrid.Columns.GridColumn gv_daa011;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa010;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa005;
@@ -4020,8 +3971,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa015;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa009;
- private DevExpress.XtraGrid.Columns.GridColumn gv_prepareTime;
- private DevExpress.XtraGrid.Columns.GridColumn gv_daa028;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa016;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa017;
private DevExpress.XtraGrid.Columns.GridColumn gv_mesStartProd;
--
Gitblit v1.9.3