From ef1d00b03b292d3b926828518ee823f5820343d6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 24 五月 2025 16:58:15 +0800
Subject: [PATCH] 工单优化
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 114 ++++---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 15
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs | 96 +++---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 138 +++++---
DevApp/Gs.DevApp/Program.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs | 49 ++
DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.cs | 28 +
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 368 ++++++++++++------------
DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs | 59 ++-
10 files changed, 498 insertions(+), 375 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index cee2aa3..057f052 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
index 0f18bec..fd6021b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
@@ -126,9 +126,11 @@
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.txt_depotId = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -187,6 +189,8 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -571,6 +575,7 @@
this.layoutMx1.Controls.Add(this.txt_status);
this.layoutMx1.Controls.Add(this.txt_dldh);
this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
+ this.layoutMx1.Controls.Add(this.txt_depotId);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem13});
@@ -745,7 +750,8 @@
this.layoutControlItem12,
this.layoutControlItem5,
this.layoutControlItem14,
- this.sp_fSubsidiary});
+ this.sp_fSubsidiary,
+ this.layoutControlItem15});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1251,6 +1257,16 @@
this.gvMx2remark.VisibleIndex = 10;
this.gvMx2remark.Width = 94;
//
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "鐗╂枡鍗曚綅";
+ this.gridColumn13.FieldName = "dwName";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 5;
+ this.gridColumn13.Width = 94;
+ //
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1262,15 +1278,24 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn13
+ // txt_depotId
//
- this.gridColumn13.Caption = "鐗╂枡鍗曚綅";
- this.gridColumn13.FieldName = "dwName";
- this.gridColumn13.MinWidth = 25;
- this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 5;
- this.gridColumn13.Width = 94;
+ this.txt_depotId.Location = new System.Drawing.Point(912, 99);
+ this.txt_depotId.Name = "txt_depotId";
+ this.txt_depotId.Size = new System.Drawing.Size(202, 24);
+ this.txt_depotId.StyleController = this.layoutMx1;
+ this.txt_depotId.TabIndex = 579;
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_depotId;
+ this.layoutControlItem15.Location = new System.Drawing.Point(828, 87);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(278, 30);
+ this.layoutControlItem15.Text = "浠撳簱ID";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// Frm_MesInvItemOut_SCLL
//
@@ -1340,6 +1365,8 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
this.ResumeLayout(false);
}
@@ -1435,5 +1462,7 @@
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraEditors.TextEdit txt_depotId;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index c1b0c3c..8c13b9a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -192,6 +192,7 @@
this.gvMx1scrapqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -429,7 +430,7 @@
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Tag = "org.fnamber";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 1;
+ this.gridColumn8.VisibleIndex = 20;
this.gridColumn8.Width = 200;
//
// gv_caa001
@@ -442,7 +443,7 @@
this.gv_caa001.OptionsColumn.AllowEdit = false;
this.gv_caa001.Tag = "query_a.CAA001";
this.gv_caa001.Visible = true;
- this.gv_caa001.VisibleIndex = 2;
+ this.gv_caa001.VisibleIndex = 1;
this.gv_caa001.Width = 100;
//
// gridColumn1
@@ -453,7 +454,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.VisibleIndex = 2;
this.gridColumn1.Width = 80;
//
// gridColumn9
@@ -464,7 +465,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 4;
+ this.gridColumn9.VisibleIndex = 3;
this.gridColumn9.Width = 60;
//
// gv_caa020
@@ -477,7 +478,7 @@
this.gv_caa020.OptionsColumn.AllowEdit = false;
this.gv_caa020.Tag = "query_a.CAA020";
this.gv_caa020.Visible = true;
- this.gv_caa020.VisibleIndex = 5;
+ this.gv_caa020.VisibleIndex = 4;
this.gv_caa020.Width = 100;
//
// gv_caa006
@@ -490,7 +491,7 @@
this.gv_caa006.OptionsColumn.AllowEdit = false;
this.gv_caa006.Tag = "query_a.CAA006";
this.gv_caa006.Visible = true;
- this.gv_caa006.VisibleIndex = 6;
+ this.gv_caa006.VisibleIndex = 5;
this.gv_caa006.Width = 80;
//
// gridColumn3
@@ -501,7 +502,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 7;
+ this.gridColumn3.VisibleIndex = 6;
this.gridColumn3.Width = 120;
//
// gv_caa021
@@ -514,7 +515,7 @@
this.gv_caa021.OptionsColumn.AllowEdit = false;
this.gv_caa021.Tag = "query_a.CAA021";
this.gv_caa021.Visible = true;
- this.gv_caa021.VisibleIndex = 8;
+ this.gv_caa021.VisibleIndex = 7;
this.gv_caa021.Width = 120;
//
// gv_caa012
@@ -527,7 +528,7 @@
this.gv_caa012.OptionsColumn.AllowEdit = false;
this.gv_caa012.Tag = "query_a.CAA012";
this.gv_caa012.Visible = true;
- this.gv_caa012.VisibleIndex = 9;
+ this.gv_caa012.VisibleIndex = 8;
this.gv_caa012.Width = 50;
//
// gv_caa009
@@ -540,7 +541,7 @@
this.gv_caa009.OptionsColumn.AllowEdit = false;
this.gv_caa009.Tag = "query_a.CAA009";
this.gv_caa009.Visible = true;
- this.gv_caa009.VisibleIndex = 10;
+ this.gv_caa009.VisibleIndex = 11;
this.gv_caa009.Width = 50;
//
// gv_caa024
@@ -554,33 +555,33 @@
this.gv_caa024.OptionsColumn.AllowEdit = false;
this.gv_caa024.Tag = "query_a.CAA024";
this.gv_caa024.Visible = true;
- this.gv_caa024.VisibleIndex = 11;
+ this.gv_caa024.VisibleIndex = 12;
this.gv_caa024.Width = 50;
//
// gv_caa010
//
this.gv_caa010.AppearanceCell.Options.UseFont = true;
- this.gv_caa010.Caption = "棰勮寮�宸ユ椂闂�";
+ this.gv_caa010.Caption = "Erp棰勮寮�宸�";
this.gv_caa010.FieldName = "caa010";
this.gv_caa010.MinWidth = 50;
this.gv_caa010.Name = "gv_caa010";
this.gv_caa010.OptionsColumn.AllowEdit = false;
this.gv_caa010.Tag = "query_a.CAA010";
this.gv_caa010.Visible = true;
- this.gv_caa010.VisibleIndex = 12;
+ this.gv_caa010.VisibleIndex = 13;
this.gv_caa010.Width = 180;
//
// gv_caa011
//
this.gv_caa011.AppearanceCell.Options.UseFont = true;
- this.gv_caa011.Caption = "棰勮瀹屽伐鏃堕棿";
+ this.gv_caa011.Caption = "Erp棰勮瀹屽伐";
this.gv_caa011.FieldName = "caa011";
this.gv_caa011.MinWidth = 50;
this.gv_caa011.Name = "gv_caa011";
this.gv_caa011.OptionsColumn.AllowEdit = false;
this.gv_caa011.Tag = "query_a.CAA011";
this.gv_caa011.Visible = true;
- this.gv_caa011.VisibleIndex = 13;
+ this.gv_caa011.VisibleIndex = 14;
this.gv_caa011.Width = 180;
//
// gv_saleOrderNo
@@ -614,7 +615,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 14;
+ this.gridColumn2.VisibleIndex = 15;
this.gridColumn2.Width = 110;
//
// gv_caa016
@@ -627,7 +628,7 @@
this.gv_caa016.OptionsColumn.AllowEdit = false;
this.gv_caa016.Tag = "query_a.CAA016";
this.gv_caa016.Visible = true;
- this.gv_caa016.VisibleIndex = 15;
+ this.gv_caa016.VisibleIndex = 16;
this.gv_caa016.Width = 100;
//
// gridColumn7
@@ -638,18 +639,22 @@
this.gridColumn7.MinWidth = 50;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 16;
+ this.gridColumn7.VisibleIndex = 9;
this.gridColumn7.Width = 50;
//
// gridColumn4
//
+ this.gridColumn4.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ 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.FieldName = "caa012wp";
this.gridColumn4.MaxWidth = 50;
this.gridColumn4.MinWidth = 50;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 17;
+ this.gridColumn4.VisibleIndex = 10;
this.gridColumn4.Width = 50;
//
// gridColumn20
@@ -683,7 +688,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 18;
+ this.gridColumn23.VisibleIndex = 17;
this.gridColumn23.Width = 94;
//
// gridColumn24
@@ -733,7 +738,7 @@
this.gridColumn31.MinWidth = 25;
this.gridColumn31.Name = "gridColumn31";
this.gridColumn31.Visible = true;
- this.gridColumn31.VisibleIndex = 19;
+ this.gridColumn31.VisibleIndex = 18;
this.gridColumn31.Width = 94;
//
// gridColumn32
@@ -783,7 +788,7 @@
this.gridColumn38.MinWidth = 25;
this.gridColumn38.Name = "gridColumn38";
this.gridColumn38.Visible = true;
- this.gridColumn38.VisibleIndex = 20;
+ this.gridColumn38.VisibleIndex = 19;
this.gridColumn38.Width = 94;
//
// gridColumn39
@@ -1328,11 +1333,12 @@
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_caa010;
+ this.layoutControlItem4.CustomizationFormText = "Erp棰勮寮�宸�";
this.layoutControlItem4.Location = new System.Drawing.Point(947, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem4.Size = new System.Drawing.Size(316, 28);
- this.layoutControlItem4.Text = "棰勮寮�宸ユ椂闂�";
+ this.layoutControlItem4.Text = "Erp棰勮寮�宸�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem5
@@ -1353,7 +1359,7 @@
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem8.Size = new System.Drawing.Size(316, 28);
- this.layoutControlItem8.Text = "棰勮瀹屽伐鏃堕棿";
+ this.layoutControlItem8.Text = "Erp棰勮瀹屽伐";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
@@ -1472,7 +1478,7 @@
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
this.layoutControlItem27.Size = new System.Drawing.Size(315, 28);
- this.layoutControlItem27.Text = "EerpId";
+ this.layoutControlItem27.Text = "ErpId";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem28
@@ -1717,7 +1723,8 @@
this.gvMx1scraprate,
this.gvMx1scrapqty,
this.gridColumn17,
- this.gridColumn29});
+ this.gridColumn29,
+ this.gridColumn18});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1766,7 +1773,7 @@
this.gvMx1cab003.Name = "gvMx1cab003";
this.gvMx1cab003.Tag = "query_a.CAB003";
this.gvMx1cab003.Visible = true;
- this.gvMx1cab003.VisibleIndex = 2;
+ this.gvMx1cab003.VisibleIndex = 3;
this.gvMx1cab003.Width = 94;
//
// gridColumn14
@@ -1776,7 +1783,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 3;
+ this.gridColumn14.VisibleIndex = 4;
this.gridColumn14.Width = 94;
//
// gridColumn10
@@ -1786,7 +1793,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 4;
+ this.gridColumn10.VisibleIndex = 5;
this.gridColumn10.Width = 94;
//
// gvMx1cab012
@@ -1798,7 +1805,7 @@
this.gvMx1cab012.Name = "gvMx1cab012";
this.gvMx1cab012.Tag = "query_a.CAB012";
this.gvMx1cab012.Visible = true;
- this.gvMx1cab012.VisibleIndex = 5;
+ this.gvMx1cab012.VisibleIndex = 6;
this.gvMx1cab012.Width = 94;
//
// gvMx1cab006
@@ -1810,7 +1817,7 @@
this.gvMx1cab006.Name = "gvMx1cab006";
this.gvMx1cab006.Tag = "query_a.CAB006";
this.gvMx1cab006.Visible = true;
- this.gvMx1cab006.VisibleIndex = 6;
+ this.gvMx1cab006.VisibleIndex = 7;
this.gvMx1cab006.Width = 94;
//
// gvMx1cab009
@@ -1822,7 +1829,7 @@
this.gvMx1cab009.Name = "gvMx1cab009";
this.gvMx1cab009.Tag = "query_a.CAB009";
this.gvMx1cab009.Visible = true;
- this.gvMx1cab009.VisibleIndex = 7;
+ this.gvMx1cab009.VisibleIndex = 8;
this.gvMx1cab009.Width = 94;
//
// gvMx1cab007
@@ -1834,7 +1841,7 @@
this.gvMx1cab007.Name = "gvMx1cab007";
this.gvMx1cab007.Tag = "query_a.CAB007";
this.gvMx1cab007.Visible = true;
- this.gvMx1cab007.VisibleIndex = 8;
+ this.gvMx1cab007.VisibleIndex = 9;
this.gvMx1cab007.Width = 94;
//
// gvMx1cab014
@@ -1846,7 +1853,7 @@
this.gvMx1cab014.Name = "gvMx1cab014";
this.gvMx1cab014.Tag = "query_a.CAB014";
this.gvMx1cab014.Visible = true;
- this.gvMx1cab014.VisibleIndex = 9;
+ this.gvMx1cab014.VisibleIndex = 10;
this.gvMx1cab014.Width = 94;
//
// gridColumn11
@@ -1856,7 +1863,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 10;
+ this.gridColumn11.VisibleIndex = 11;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -1866,7 +1873,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 11;
+ this.gridColumn12.VisibleIndex = 12;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -1876,7 +1883,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 12;
+ this.gridColumn13.VisibleIndex = 13;
this.gridColumn13.Width = 94;
//
// gvMx1mtono
@@ -1888,7 +1895,7 @@
this.gvMx1mtono.Name = "gvMx1mtono";
this.gvMx1mtono.Tag = "query_a.MTONO";
this.gvMx1mtono.Visible = true;
- this.gvMx1mtono.VisibleIndex = 13;
+ this.gvMx1mtono.VisibleIndex = 14;
this.gvMx1mtono.Width = 94;
//
// gvMx1numerator
@@ -1900,7 +1907,7 @@
this.gvMx1numerator.Name = "gvMx1numerator";
this.gvMx1numerator.Tag = "query_a.NUMERATOR";
this.gvMx1numerator.Visible = true;
- this.gvMx1numerator.VisibleIndex = 14;
+ this.gvMx1numerator.VisibleIndex = 15;
this.gvMx1numerator.Width = 94;
//
// gvMx1denominator
@@ -1912,7 +1919,7 @@
this.gvMx1denominator.Name = "gvMx1denominator";
this.gvMx1denominator.Tag = "query_a.DENOMINATOR";
this.gvMx1denominator.Visible = true;
- this.gvMx1denominator.VisibleIndex = 15;
+ this.gvMx1denominator.VisibleIndex = 16;
this.gvMx1denominator.Width = 94;
//
// gvMx1depotCode
@@ -1924,7 +1931,7 @@
this.gvMx1depotCode.Name = "gvMx1depotCode";
this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
this.gvMx1depotCode.Visible = true;
- this.gvMx1depotCode.VisibleIndex = 16;
+ this.gvMx1depotCode.VisibleIndex = 17;
this.gvMx1depotCode.Width = 94;
//
// gridColumn15
@@ -1934,7 +1941,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 17;
+ this.gridColumn15.VisibleIndex = 18;
this.gridColumn15.Width = 94;
//
// gvMx1issueType
@@ -1946,7 +1953,7 @@
this.gvMx1issueType.Name = "gvMx1issueType";
this.gvMx1issueType.Tag = "query_a.ISSUE_TYPE";
this.gvMx1issueType.Visible = true;
- this.gvMx1issueType.VisibleIndex = 18;
+ this.gvMx1issueType.VisibleIndex = 19;
this.gvMx1issueType.Width = 94;
//
// gridColumn16
@@ -1956,7 +1963,7 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 19;
+ this.gridColumn16.VisibleIndex = 20;
this.gridColumn16.Width = 94;
//
// gvMx1scraprate
@@ -1968,7 +1975,7 @@
this.gvMx1scraprate.Name = "gvMx1scraprate";
this.gvMx1scraprate.Tag = "query_a.SCRAPRATE";
this.gvMx1scraprate.Visible = true;
- this.gvMx1scraprate.VisibleIndex = 20;
+ this.gvMx1scraprate.VisibleIndex = 21;
this.gvMx1scraprate.Width = 94;
//
// gvMx1scrapqty
@@ -1980,7 +1987,7 @@
this.gvMx1scrapqty.Name = "gvMx1scrapqty";
this.gvMx1scrapqty.Tag = "query_a.SCRAPQTY";
this.gvMx1scrapqty.Visible = true;
- this.gvMx1scrapqty.VisibleIndex = 21;
+ this.gvMx1scrapqty.VisibleIndex = 22;
this.gvMx1scrapqty.Width = 94;
//
// gridColumn17
@@ -1990,7 +1997,7 @@
this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 22;
+ this.gridColumn17.VisibleIndex = 23;
this.gridColumn17.Width = 94;
//
// gridColumn29
@@ -2000,8 +2007,18 @@
this.gridColumn29.MinWidth = 25;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.Visible = true;
- this.gridColumn29.VisibleIndex = 23;
+ this.gridColumn29.VisibleIndex = 24;
this.gridColumn29.Width = 94;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.Caption = "鏉愭枡ID";
+ this.gridColumn18.FieldName = "itemId";
+ this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 2;
+ this.gridColumn18.Width = 94;
//
// Frm_Womcaa
//
@@ -2260,5 +2277,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index b6f7d4c..fa76956 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -408,7 +408,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1269, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1652, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -419,7 +419,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1269, 740);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1652, 740);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -429,7 +429,7 @@
//
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1267, 708);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1650, 708);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -450,7 +450,7 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1267, 708);
+ this.split1.Size = new System.Drawing.Size(1650, 708);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
@@ -460,7 +460,7 @@
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1267, 657);
+ this.gcMain1.Size = new System.Drawing.Size(1650, 657);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -579,7 +579,7 @@
this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
- this.gridColumn27.VisibleIndex = 5;
+ this.gridColumn27.VisibleIndex = 6;
this.gridColumn27.Width = 94;
//
// gv_daa018
@@ -592,7 +592,7 @@
this.gv_daa018.OptionsColumn.AllowEdit = false;
this.gv_daa018.Tag = "query_a.daa018";
this.gv_daa018.Visible = true;
- this.gv_daa018.VisibleIndex = 6;
+ this.gv_daa018.VisibleIndex = 5;
this.gv_daa018.Width = 90;
//
// gridColoun100
@@ -603,7 +603,7 @@
this.gridColoun100.Name = "gridColoun100";
this.gridColoun100.Tag = "org.fnamber";
this.gridColoun100.Visible = true;
- this.gridColoun100.VisibleIndex = 7;
+ this.gridColoun100.VisibleIndex = 28;
this.gridColoun100.Width = 250;
//
// gv_daa001
@@ -616,7 +616,7 @@
this.gv_daa001.OptionsColumn.AllowEdit = false;
this.gv_daa001.Tag = "query_a.daa001";
this.gv_daa001.Visible = true;
- this.gv_daa001.VisibleIndex = 8;
+ this.gv_daa001.VisibleIndex = 7;
this.gv_daa001.Width = 120;
//
// gv_daa021
@@ -629,7 +629,7 @@
this.gv_daa021.OptionsColumn.AllowEdit = false;
this.gv_daa021.Tag = "query_a.daa021";
this.gv_daa021.Visible = true;
- this.gv_daa021.VisibleIndex = 9;
+ this.gv_daa021.VisibleIndex = 8;
this.gv_daa021.Width = 100;
//
// gridColumn3
@@ -639,7 +639,7 @@
this.gridColumn3.MinWidth = 50;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 10;
+ this.gridColumn3.VisibleIndex = 9;
this.gridColumn3.Width = 94;
//
// gv_daa003
@@ -652,7 +652,7 @@
this.gv_daa003.OptionsColumn.AllowEdit = false;
this.gv_daa003.Tag = "query_a.daa003";
this.gv_daa003.Visible = true;
- this.gv_daa003.VisibleIndex = 11;
+ this.gv_daa003.VisibleIndex = 10;
this.gv_daa003.Width = 150;
//
// gv_daa004
@@ -665,7 +665,7 @@
this.gv_daa004.OptionsColumn.AllowEdit = false;
this.gv_daa004.Tag = "query_a.daa004";
this.gv_daa004.Visible = true;
- this.gv_daa004.VisibleIndex = 12;
+ this.gv_daa004.VisibleIndex = 11;
this.gv_daa004.Width = 150;
//
// gv_daa008
@@ -679,7 +679,7 @@
this.gv_daa008.OptionsColumn.AllowEdit = false;
this.gv_daa008.Tag = "query_a.daa008";
this.gv_daa008.Visible = true;
- this.gv_daa008.VisibleIndex = 13;
+ this.gv_daa008.VisibleIndex = 12;
this.gv_daa008.Width = 50;
//
// gv_daa011
@@ -693,18 +693,22 @@
this.gv_daa011.OptionsColumn.AllowEdit = false;
this.gv_daa011.Tag = "query_a.daa011";
this.gv_daa011.Visible = true;
- this.gv_daa011.VisibleIndex = 14;
+ this.gv_daa011.VisibleIndex = 13;
this.gv_daa011.Width = 50;
//
// gridColumn4
//
+ this.gridColumn4.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ 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.FieldName = "dscl";
this.gridColumn4.MaxWidth = 50;
this.gridColumn4.MinWidth = 50;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 15;
+ this.gridColumn4.VisibleIndex = 14;
this.gridColumn4.Width = 50;
//
// gv_daa010
@@ -718,7 +722,7 @@
this.gv_daa010.OptionsColumn.AllowEdit = false;
this.gv_daa010.Tag = "query_a.daa010";
this.gv_daa010.Visible = true;
- this.gv_daa010.VisibleIndex = 17;
+ this.gv_daa010.VisibleIndex = 16;
this.gv_daa010.Width = 50;
//
// gv_daa005
@@ -732,7 +736,7 @@
this.gv_daa005.OptionsColumn.AllowEdit = false;
this.gv_daa005.Tag = "query_a.daa005";
this.gv_daa005.Visible = true;
- this.gv_daa005.VisibleIndex = 18;
+ this.gv_daa005.VisibleIndex = 17;
this.gv_daa005.Width = 50;
//
// gv_cust
@@ -744,8 +748,6 @@
this.gv_cust.Name = "gv_cust";
this.gv_cust.OptionsColumn.AllowEdit = false;
this.gv_cust.Tag = "query_a.cust";
- this.gv_cust.Visible = true;
- this.gv_cust.VisibleIndex = 19;
this.gv_cust.Width = 100;
//
// gridColumn1
@@ -755,7 +757,7 @@
this.gridColumn1.MinWidth = 50;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 20;
+ this.gridColumn1.VisibleIndex = 18;
this.gridColumn1.Width = 94;
//
// gv_daa015
@@ -768,7 +770,7 @@
this.gv_daa015.OptionsColumn.AllowEdit = false;
this.gv_daa015.Tag = "query_a.daa015";
this.gv_daa015.Visible = true;
- this.gv_daa015.VisibleIndex = 21;
+ this.gv_daa015.VisibleIndex = 19;
this.gv_daa015.Width = 94;
//
// gv_daa009
@@ -781,7 +783,7 @@
this.gv_daa009.OptionsColumn.AllowEdit = false;
this.gv_daa009.Tag = "query_a.daa009";
this.gv_daa009.Visible = true;
- this.gv_daa009.VisibleIndex = 16;
+ this.gv_daa009.VisibleIndex = 15;
this.gv_daa009.Width = 94;
//
// gv_prepareTime
@@ -793,8 +795,6 @@
this.gv_prepareTime.Name = "gv_prepareTime";
this.gv_prepareTime.OptionsColumn.AllowEdit = false;
this.gv_prepareTime.Tag = "query_a.prepare_time";
- this.gv_prepareTime.Visible = true;
- this.gv_prepareTime.VisibleIndex = 22;
this.gv_prepareTime.Width = 180;
//
// gv_daa028
@@ -806,8 +806,6 @@
this.gv_daa028.Name = "gv_daa028";
this.gv_daa028.OptionsColumn.AllowEdit = false;
this.gv_daa028.Tag = "query_a.daa028";
- this.gv_daa028.Visible = true;
- this.gv_daa028.VisibleIndex = 23;
this.gv_daa028.Width = 180;
//
// gv_daa016
@@ -820,7 +818,7 @@
this.gv_daa016.OptionsColumn.AllowEdit = false;
this.gv_daa016.Tag = "query_a.daa016";
this.gv_daa016.Visible = true;
- this.gv_daa016.VisibleIndex = 24;
+ this.gv_daa016.VisibleIndex = 20;
this.gv_daa016.Width = 180;
//
// gv_daa017
@@ -833,7 +831,7 @@
this.gv_daa017.OptionsColumn.AllowEdit = false;
this.gv_daa017.Tag = "query_a.daa017";
this.gv_daa017.Visible = true;
- this.gv_daa017.VisibleIndex = 25;
+ this.gv_daa017.VisibleIndex = 21;
this.gv_daa017.Width = 180;
//
// gv_mesStartProd
@@ -846,7 +844,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 = 26;
+ this.gv_mesStartProd.VisibleIndex = 22;
this.gv_mesStartProd.Width = 180;
//
// gv_mesEndProd
@@ -859,7 +857,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 = 27;
+ this.gv_mesEndProd.VisibleIndex = 23;
this.gv_mesEndProd.Width = 180;
//
// gridColumn21
@@ -869,7 +867,7 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 28;
+ this.gridColumn21.VisibleIndex = 24;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -879,7 +877,7 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 29;
+ this.gridColumn22.VisibleIndex = 25;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -897,7 +895,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 30;
+ this.gridColumn24.VisibleIndex = 26;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -907,7 +905,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 31;
+ this.gridColumn25.VisibleIndex = 27;
this.gridColumn25.Width = 94;
//
// pageBar1
@@ -918,7 +916,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1267, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1650, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -926,7 +924,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1267, 708);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1650, 708);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -946,7 +944,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1267, 708);
+ this.splitMx1.Size = new System.Drawing.Size(1650, 708);
this.splitMx1.SplitterPosition = 183;
this.splitMx1.TabIndex = 0;
//
@@ -984,7 +982,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(910, 530, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1267, 183);
+ this.layoutMx1.Size = new System.Drawing.Size(1650, 183);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -1002,7 +1000,7 @@
this.txt_daa009.Location = new System.Drawing.Point(114, 152);
this.txt_daa009.Name = "txt_daa009";
this.txt_daa009.Properties.Appearance.Options.UseFont = true;
- this.txt_daa009.Size = new System.Drawing.Size(506, 24);
+ this.txt_daa009.Size = new System.Drawing.Size(698, 24);
this.txt_daa009.StyleController = this.layoutMx1;
this.txt_daa009.TabIndex = 240;
this.txt_daa009.Tag = "";
@@ -1022,37 +1020,37 @@
this.txt_daa001.Location = new System.Drawing.Point(114, 12);
this.txt_daa001.Name = "txt_daa001";
this.txt_daa001.Properties.Appearance.Options.UseFont = true;
- this.txt_daa001.Size = new System.Drawing.Size(200, 24);
+ this.txt_daa001.Size = new System.Drawing.Size(296, 24);
this.txt_daa001.StyleController = this.layoutMx1;
this.txt_daa001.TabIndex = 216;
this.txt_daa001.Tag = "readonly";
//
// txt_daa008
//
- this.txt_daa008.Location = new System.Drawing.Point(726, 12);
+ this.txt_daa008.Location = new System.Drawing.Point(918, 12);
this.txt_daa008.Name = "txt_daa008";
this.txt_daa008.Properties.Appearance.Options.UseFont = true;
- this.txt_daa008.Size = new System.Drawing.Size(200, 24);
+ this.txt_daa008.Size = new System.Drawing.Size(296, 24);
this.txt_daa008.StyleController = this.layoutMx1;
this.txt_daa008.TabIndex = 235;
this.txt_daa008.Tag = "readonly";
//
// txt_saleOrderNo
//
- this.txt_saleOrderNo.Location = new System.Drawing.Point(726, 124);
+ this.txt_saleOrderNo.Location = new System.Drawing.Point(918, 124);
this.txt_saleOrderNo.Name = "txt_saleOrderNo";
this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_saleOrderNo.Size = new System.Drawing.Size(200, 24);
+ this.txt_saleOrderNo.Size = new System.Drawing.Size(296, 24);
this.txt_saleOrderNo.StyleController = this.layoutMx1;
this.txt_saleOrderNo.TabIndex = 465;
this.txt_saleOrderNo.Tag = "readonly";
//
// txt_mesStartProd
//
- this.txt_mesStartProd.Location = new System.Drawing.Point(1032, 12);
+ this.txt_mesStartProd.Location = new System.Drawing.Point(1320, 12);
this.txt_mesStartProd.Name = "txt_mesStartProd";
this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
- this.txt_mesStartProd.Size = new System.Drawing.Size(202, 24);
+ this.txt_mesStartProd.Size = new System.Drawing.Size(297, 24);
this.txt_mesStartProd.StyleController = this.layoutMx1;
this.txt_mesStartProd.TabIndex = 336;
this.txt_mesStartProd.Tag = "readonly";
@@ -1062,67 +1060,67 @@
this.txt_daa014.Location = new System.Drawing.Point(114, 40);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
- this.txt_daa014.Size = new System.Drawing.Size(200, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(296, 24);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 327;
this.txt_daa014.Tag = "readonly";
//
// txt_daa022Remark
//
- this.txt_daa022Remark.Location = new System.Drawing.Point(420, 12);
+ this.txt_daa022Remark.Location = new System.Drawing.Point(516, 12);
this.txt_daa022Remark.Name = "txt_daa022Remark";
this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
- this.txt_daa022Remark.Size = new System.Drawing.Size(200, 24);
+ this.txt_daa022Remark.Size = new System.Drawing.Size(296, 24);
this.txt_daa022Remark.StyleController = this.layoutMx1;
this.txt_daa022Remark.TabIndex = 462;
this.txt_daa022Remark.Tag = "readonly";
//
// txt_daa010
//
- this.txt_daa010.Location = new System.Drawing.Point(726, 40);
+ this.txt_daa010.Location = new System.Drawing.Point(918, 40);
this.txt_daa010.Name = "txt_daa010";
this.txt_daa010.Properties.Appearance.Options.UseFont = true;
- this.txt_daa010.Size = new System.Drawing.Size(200, 24);
+ this.txt_daa010.Size = new System.Drawing.Size(296, 24);
this.txt_daa010.StyleController = this.layoutMx1;
this.txt_daa010.TabIndex = 243;
this.txt_daa010.Tag = "readonly";
//
// txt_mesEndProd
//
- this.txt_mesEndProd.Location = new System.Drawing.Point(1032, 40);
+ this.txt_mesEndProd.Location = new System.Drawing.Point(1320, 40);
this.txt_mesEndProd.Name = "txt_mesEndProd";
this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
- this.txt_mesEndProd.Size = new System.Drawing.Size(202, 24);
+ this.txt_mesEndProd.Size = new System.Drawing.Size(297, 24);
this.txt_mesEndProd.StyleController = this.layoutMx1;
this.txt_mesEndProd.TabIndex = 338;
this.txt_mesEndProd.Tag = "readonly";
//
// txt_daa011
//
- this.txt_daa011.Location = new System.Drawing.Point(726, 68);
+ this.txt_daa011.Location = new System.Drawing.Point(918, 68);
this.txt_daa011.Name = "txt_daa011";
this.txt_daa011.Properties.Appearance.Options.UseFont = true;
- this.txt_daa011.Size = new System.Drawing.Size(200, 24);
+ this.txt_daa011.Size = new System.Drawing.Size(296, 24);
this.txt_daa011.StyleController = this.layoutMx1;
this.txt_daa011.TabIndex = 247;
this.txt_daa011.Tag = "readonly";
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(420, 40);
+ this.txt_dptName.Location = new System.Drawing.Point(516, 40);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
- this.txt_dptName.Size = new System.Drawing.Size(200, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(296, 24);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 258;
this.txt_dptName.Tag = "readonly";
//
// txt_daa016
//
- this.txt_daa016.Location = new System.Drawing.Point(1032, 68);
+ this.txt_daa016.Location = new System.Drawing.Point(1320, 68);
this.txt_daa016.Name = "txt_daa016";
this.txt_daa016.Properties.Appearance.Options.UseFont = true;
- this.txt_daa016.Size = new System.Drawing.Size(202, 24);
+ this.txt_daa016.Size = new System.Drawing.Size(297, 24);
this.txt_daa016.StyleController = this.layoutMx1;
this.txt_daa016.TabIndex = 273;
this.txt_daa016.Tag = "readonly";
@@ -1132,27 +1130,27 @@
this.txt_daa029.Location = new System.Drawing.Point(114, 68);
this.txt_daa029.Name = "txt_daa029";
this.txt_daa029.Properties.Appearance.Options.UseFont = true;
- this.txt_daa029.Size = new System.Drawing.Size(200, 24);
+ this.txt_daa029.Size = new System.Drawing.Size(296, 24);
this.txt_daa029.StyleController = this.layoutMx1;
this.txt_daa029.TabIndex = 217;
this.txt_daa029.Tag = "readonly";
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(420, 96);
+ this.txt_lineName.Location = new System.Drawing.Point(516, 96);
this.txt_lineName.Name = "txt_lineName";
this.txt_lineName.Properties.Appearance.Options.UseFont = true;
- this.txt_lineName.Size = new System.Drawing.Size(200, 24);
+ this.txt_lineName.Size = new System.Drawing.Size(296, 24);
this.txt_lineName.StyleController = this.layoutMx1;
this.txt_lineName.TabIndex = 267;
this.txt_lineName.Tag = "readonly";
//
// txt_daa017
//
- this.txt_daa017.Location = new System.Drawing.Point(1032, 96);
+ this.txt_daa017.Location = new System.Drawing.Point(1320, 96);
this.txt_daa017.Name = "txt_daa017";
this.txt_daa017.Properties.Appearance.Options.UseFont = true;
- this.txt_daa017.Size = new System.Drawing.Size(202, 24);
+ this.txt_daa017.Size = new System.Drawing.Size(297, 24);
this.txt_daa017.StyleController = this.layoutMx1;
this.txt_daa017.TabIndex = 280;
this.txt_daa017.Tag = "readonly";
@@ -1162,17 +1160,17 @@
this.txt_daa003.Location = new System.Drawing.Point(114, 96);
this.txt_daa003.Name = "txt_daa003";
this.txt_daa003.Properties.Appearance.Options.UseFont = true;
- this.txt_daa003.Size = new System.Drawing.Size(200, 24);
+ this.txt_daa003.Size = new System.Drawing.Size(296, 24);
this.txt_daa003.StyleController = this.layoutMx1;
this.txt_daa003.TabIndex = 219;
this.txt_daa003.Tag = "readonly";
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(726, 96);
+ this.txt_dwName.Location = new System.Drawing.Point(918, 96);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
- this.txt_dwName.Size = new System.Drawing.Size(200, 24);
+ this.txt_dwName.Size = new System.Drawing.Size(296, 24);
this.txt_dwName.StyleController = this.layoutMx1;
this.txt_dwName.TabIndex = 226;
this.txt_dwName.Tag = "readonly";
@@ -1182,7 +1180,7 @@
this.txt_daa004.Location = new System.Drawing.Point(114, 124);
this.txt_daa004.Name = "txt_daa004";
this.txt_daa004.Properties.Appearance.Options.UseFont = true;
- this.txt_daa004.Size = new System.Drawing.Size(200, 24);
+ this.txt_daa004.Size = new System.Drawing.Size(296, 24);
this.txt_daa004.StyleController = this.layoutMx1;
this.txt_daa004.TabIndex = 222;
this.txt_daa004.Tag = "readonly";
@@ -1197,17 +1195,17 @@
//
// txt_lineNo
//
- this.txt_lineNo.Location = new System.Drawing.Point(420, 124);
+ this.txt_lineNo.Location = new System.Drawing.Point(516, 124);
this.txt_lineNo.Name = "txt_lineNo";
- this.txt_lineNo.Size = new System.Drawing.Size(200, 24);
+ this.txt_lineNo.Size = new System.Drawing.Size(296, 24);
this.txt_lineNo.StyleController = this.layoutMx1;
this.txt_lineNo.TabIndex = 474;
//
// txt_dptNo
//
- this.txt_dptNo.Location = new System.Drawing.Point(420, 68);
+ this.txt_dptNo.Location = new System.Drawing.Point(516, 68);
this.txt_dptNo.Name = "txt_dptNo";
- this.txt_dptNo.Size = new System.Drawing.Size(200, 24);
+ this.txt_dptNo.Size = new System.Drawing.Size(296, 24);
this.txt_dptNo.StyleController = this.layoutMx1;
this.txt_dptNo.TabIndex = 475;
//
@@ -1305,7 +1303,7 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1246, 188);
+ this.Root.Size = new System.Drawing.Size(1629, 188);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1313,17 +1311,17 @@
this.layoutControlItem1.Control = this.txt_daa001;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem1.Text = "宸ュ崟鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_daa008;
- this.layoutControlItem3.Location = new System.Drawing.Point(612, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(804, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1333,148 +1331,149 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem5.Text = "鎶曟枡鍗曞彿";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_daa010;
- this.layoutControlItem7.Location = new System.Drawing.Point(612, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(804, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_daa011;
- this.layoutControlItem11.Location = new System.Drawing.Point(612, 56);
+ this.layoutControlItem11.Location = new System.Drawing.Point(804, 56);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem11.Text = "宸茬敓浜ч噺";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_daa022Remark;
- this.layoutControlItem6.Location = new System.Drawing.Point(306, 0);
+ this.layoutControlItem6.Location = new System.Drawing.Point(402, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem6.Text = "閫氱煡澶囨枡";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_lineName;
- this.layoutControlItem14.Location = new System.Drawing.Point(306, 84);
+ this.layoutControlItem14.Location = new System.Drawing.Point(402, 84);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem14.Text = "鐢熶骇绾垮埆";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_dptName;
- this.layoutControlItem20.Location = new System.Drawing.Point(306, 28);
+ this.layoutControlItem20.Location = new System.Drawing.Point(402, 28);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem20.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem20.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem41
//
this.layoutControlItem41.Control = this.txt_dptNo;
- this.layoutControlItem41.Location = new System.Drawing.Point(306, 56);
+ this.layoutControlItem41.Location = new System.Drawing.Point(402, 56);
this.layoutControlItem41.Name = "layoutControlItem41";
this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem41.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem41.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem41.Text = "杞﹂棿缂栫爜";
this.layoutControlItem41.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_dwName;
- this.layoutControlItem15.Location = new System.Drawing.Point(612, 84);
+ this.layoutControlItem15.Location = new System.Drawing.Point(804, 84);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem15.Text = "鍗曚綅";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_mesStartProd;
- this.layoutControlItem4.Location = new System.Drawing.Point(918, 0);
+ this.layoutControlItem4.CustomizationFormText = "Mes棰勮寮�宸�";
+ this.layoutControlItem4.Location = new System.Drawing.Point(1206, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(308, 28);
- this.layoutControlItem4.Text = "棰勮寮�宸ユ椂闂�";
+ this.layoutControlItem4.Size = new System.Drawing.Size(403, 28);
+ this.layoutControlItem4.Text = "Mes棰勮寮�宸�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_mesEndProd;
- this.layoutControlItem8.Location = new System.Drawing.Point(918, 28);
+ this.layoutControlItem8.Location = new System.Drawing.Point(1206, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(308, 28);
- this.layoutControlItem8.Text = "棰勮瀹屽伐鏃堕棿";
+ this.layoutControlItem8.Size = new System.Drawing.Size(403, 28);
+ this.layoutControlItem8.Text = "Mes棰勮瀹屽伐";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_daa016;
- this.layoutControlItem12.Location = new System.Drawing.Point(918, 56);
+ this.layoutControlItem12.Location = new System.Drawing.Point(1206, 56);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(308, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(403, 28);
this.layoutControlItem12.Text = "瀹為檯寮�宸ユ椂闂�";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_daa017;
- this.layoutControlItem16.Location = new System.Drawing.Point(918, 84);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1206, 84);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(308, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(403, 28);
this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem40
//
this.layoutControlItem40.Control = this.txt_lineNo;
- this.layoutControlItem40.Location = new System.Drawing.Point(306, 112);
+ this.layoutControlItem40.Location = new System.Drawing.Point(402, 112);
this.layoutControlItem40.Name = "layoutControlItem40";
this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem40.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem40.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem40.Text = "绾垮埆缂栫爜";
this.layoutControlItem40.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_saleOrderNo;
- this.layoutControlItem9.Location = new System.Drawing.Point(612, 112);
+ this.layoutControlItem9.Location = new System.Drawing.Point(804, 112);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem9.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1484,7 +1483,7 @@
this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem13.Text = "浜у搧缂栫爜";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1494,7 +1493,7 @@
this.layoutControlItem19.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem19.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem19.Text = "浜у搧鍚嶇О";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1504,7 +1503,7 @@
this.layoutControlItem17.Location = new System.Drawing.Point(0, 112);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(306, 28);
+ this.layoutControlItem17.Size = new System.Drawing.Size(402, 28);
this.layoutControlItem17.Text = "浜у搧瑙勬牸";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1515,7 +1514,7 @@
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem28.Size = new System.Drawing.Size(612, 28);
+ this.layoutControlItem28.Size = new System.Drawing.Size(804, 28);
this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1525,7 +1524,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1267, 513);
+ this.tabMx.Size = new System.Drawing.Size(1650, 513);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1537,7 +1536,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1265, 481);
+ this.tabMxPage1.Size = new System.Drawing.Size(1648, 481);
this.tabMxPage1.Text = "澶囨枡鍗曡韩";
//
// gcMx1
@@ -1546,7 +1545,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1265, 481);
+ this.gcMx1.Size = new System.Drawing.Size(1648, 481);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1706,6 +1705,7 @@
// gridColumn15
//
this.gridColumn15.Caption = "寤鸿浠撳簱";
+ this.gridColumn15.FieldName = "erpCk";
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
@@ -1890,7 +1890,7 @@
//
this.tabMxPage2.Controls.Add(this.splitMx99);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1265, 481);
+ this.tabMxPage2.Size = new System.Drawing.Size(1648, 481);
this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
//
// splitMx99
@@ -1910,7 +1910,7 @@
this.splitMx99.Panel2.Controls.Add(this.gcMx2);
this.splitMx99.Panel2.Text = "Panel2";
this.splitMx99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx99.Size = new System.Drawing.Size(1265, 481);
+ this.splitMx99.Size = new System.Drawing.Size(1648, 481);
this.splitMx99.SplitterPosition = 83;
this.splitMx99.TabIndex = 2;
//
@@ -1929,7 +1929,7 @@
this.layoutMx99.Name = "layoutMx99";
this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(221, 389, 812, 500);
this.layoutMx99.Root = this.layoutControlGroup1;
- this.layoutMx99.Size = new System.Drawing.Size(1265, 83);
+ this.layoutMx99.Size = new System.Drawing.Size(1648, 83);
this.layoutMx99.TabIndex = 0;
this.layoutMx99.Text = "layoutControl1";
//
@@ -1937,11 +1937,11 @@
//
this.layShuLiang.Controls.Add(this.txt_iCount_1);
this.layShuLiang.Controls.Add(this.txt_yuliang_1);
- this.layShuLiang.Location = new System.Drawing.Point(632, 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(306, 28);
+ this.layShuLiang.Size = new System.Drawing.Size(321, 28);
this.layShuLiang.TabIndex = 475;
this.layShuLiang.Text = "dataLayoutControl1";
//
@@ -1950,16 +1950,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(62, 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(242, 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(62, 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;
//
@@ -1984,7 +1984,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(306, 28);
+ this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
this.layoutControlGroup3.TextVisible = false;
//
// layoutControlItem25
@@ -1992,7 +1992,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(153, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(160, 28);
this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2000,16 +2000,16 @@
//
this.layoutControlItem39.Control = this.txt_yuliang_1;
this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
- this.layoutControlItem39.Location = new System.Drawing.Point(153, 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(153, 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(943, 10);
+ this.radOut.Location = new System.Drawing.Point(988, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2024,29 +2024,29 @@
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(941, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(986, 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(308, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(323, 32);
this.ucBtnPrint1.TabIndex = 464;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(719, 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(219, 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(409, 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(219, 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";
@@ -2054,11 +2054,11 @@
// txt_kQty
//
this.txt_kQty.EditValue = "";
- this.txt_kQty.Location = new System.Drawing.Point(409, 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(219, 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";
@@ -2069,7 +2069,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(219, 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";
@@ -2079,7 +2079,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(219, 24);
+ this.txt_zQty.Size = new System.Drawing.Size(234, 24);
this.txt_zQty.StyleController = this.layoutMx99;
this.txt_zQty.TabIndex = 474;
//
@@ -2107,7 +2107,7 @@
columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition10.Width = 100D;
columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition11.Width = 20D;
+ columnDefinition11.Width = 328D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition7,
columnDefinition8,
@@ -2121,7 +2121,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition8,
rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1280, 84);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -2129,23 +2129,23 @@
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(310, 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(310, 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(930, 0);
+ this.layoutControlItem35.Location = new System.Drawing.Point(975, 0);
this.layoutControlItem35.MaxSize = new System.Drawing.Size(240, 28);
this.layoutControlItem35.MinSize = new System.Drawing.Size(240, 28);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
- this.layoutControlItem35.Size = new System.Drawing.Size(310, 32);
+ this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem35.Text = "鑷姩璁＄畻";
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
@@ -2156,12 +2156,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(930, 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(1, 1, 0, 0);
- this.layoutControlItem26.Size = new System.Drawing.Size(310, 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;
@@ -2174,18 +2174,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(310, 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(310, 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(310, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2195,21 +2195,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(620, 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(310, 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(620, 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(310, 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;
@@ -2219,7 +2219,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(310, 32);
+ this.layoutControlItem36.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2231,7 +2231,7 @@
this.gcMx2.Name = "gcMx2";
this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx2.Size = new System.Drawing.Size(1265, 386);
+ this.gcMx2.Size = new System.Drawing.Size(1648, 386);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2469,7 +2469,7 @@
this.xtraTabPage3.Controls.Add(this.gcMx3);
this.xtraTabPage3.Controls.Add(this.panMx98);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1265, 481);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1648, 481);
this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
//
// gcMx3
@@ -2478,7 +2478,7 @@
this.gcMx3.Location = new System.Drawing.Point(0, 54);
this.gcMx3.MainView = this.gvMx3;
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(1265, 427);
+ this.gcMx3.Size = new System.Drawing.Size(1648, 427);
this.gcMx3.TabIndex = 1;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -2603,7 +2603,7 @@
this.panMx98.Dock = System.Windows.Forms.DockStyle.Top;
this.panMx98.Location = new System.Drawing.Point(0, 0);
this.panMx98.Name = "panMx98";
- this.panMx98.Size = new System.Drawing.Size(1265, 54);
+ this.panMx98.Size = new System.Drawing.Size(1648, 54);
this.panMx98.TabIndex = 0;
//
// layoutMx98
@@ -2619,51 +2619,51 @@
this.layoutMx98.Name = "layoutMx98";
this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(96, 558, 812, 500);
this.layoutMx98.Root = this.layoutControlGroup2;
- this.layoutMx98.Size = new System.Drawing.Size(1265, 54);
+ this.layoutMx98.Size = new System.Drawing.Size(1648, 54);
this.layoutMx98.TabIndex = 0;
this.layoutMx98.Text = "layoutControl1";
//
// ucBtnPrint98
//
this.ucBtnPrint98.guidKey = null;
- this.ucBtnPrint98.Location = new System.Drawing.Point(1046, 10);
+ this.ucBtnPrint98.Location = new System.Drawing.Point(1366, 10);
this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint98.Name = "ucBtnPrint98";
this.ucBtnPrint98.rptParameter = null;
- this.ucBtnPrint98.Size = new System.Drawing.Size(208, 34);
+ this.ucBtnPrint98.Size = new System.Drawing.Size(271, 34);
this.ucBtnPrint98.TabIndex = 8;
//
// txt_yQty98
//
- this.txt_yQty98.Location = new System.Drawing.Point(321, 12);
+ this.txt_yQty98.Location = new System.Drawing.Point(385, 12);
this.txt_yQty98.Name = "txt_yQty98";
this.txt_yQty98.Properties.ReadOnly = true;
- this.txt_yQty98.Size = new System.Drawing.Size(101, 24);
+ this.txt_yQty98.Size = new System.Drawing.Size(165, 24);
this.txt_yQty98.StyleController = this.layoutMx98;
this.txt_yQty98.TabIndex = 4;
//
// txt_kQty98
//
- this.txt_kQty98.Location = new System.Drawing.Point(528, 12);
+ this.txt_kQty98.Location = new System.Drawing.Point(656, 12);
this.txt_kQty98.Name = "txt_kQty98";
this.txt_kQty98.Properties.ReadOnly = true;
- this.txt_kQty98.Size = new System.Drawing.Size(101, 24);
+ this.txt_kQty98.Size = new System.Drawing.Size(165, 24);
this.txt_kQty98.StyleController = this.layoutMx98;
this.txt_kQty98.TabIndex = 5;
//
// txt_printRemark98
//
- this.txt_printRemark98.Location = new System.Drawing.Point(735, 12);
+ this.txt_printRemark98.Location = new System.Drawing.Point(927, 12);
this.txt_printRemark98.Name = "txt_printRemark98";
- this.txt_printRemark98.Size = new System.Drawing.Size(101, 24);
+ this.txt_printRemark98.Size = new System.Drawing.Size(165, 24);
this.txt_printRemark98.StyleController = this.layoutMx98;
this.txt_printRemark98.TabIndex = 6;
//
// txt_iCount_98
//
- this.txt_iCount_98.Location = new System.Drawing.Point(942, 12);
+ this.txt_iCount_98.Location = new System.Drawing.Point(1198, 12);
this.txt_iCount_98.Name = "txt_iCount_98";
- this.txt_iCount_98.Size = new System.Drawing.Size(101, 24);
+ this.txt_iCount_98.Size = new System.Drawing.Size(165, 24);
this.txt_iCount_98.StyleController = this.layoutMx98;
this.txt_iCount_98.TabIndex = 7;
//
@@ -2672,7 +2672,7 @@
this.txt_zQty98.Location = new System.Drawing.Point(114, 12);
this.txt_zQty98.Name = "txt_zQty98";
this.txt_zQty98.Properties.ReadOnly = true;
- this.txt_zQty98.Size = new System.Drawing.Size(101, 24);
+ this.txt_zQty98.Size = new System.Drawing.Size(165, 24);
this.txt_zQty98.StyleController = this.layoutMx98;
this.txt_zQty98.TabIndex = 9;
//
@@ -2712,17 +2712,17 @@
rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition10});
- this.layoutControlGroup2.Size = new System.Drawing.Size(1265, 54);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 54);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.ucBtnPrint98;
- this.layoutControlItem34.Location = new System.Drawing.Point(1035, 0);
+ this.layoutControlItem34.Location = new System.Drawing.Point(1355, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 5;
this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
- this.layoutControlItem34.Size = new System.Drawing.Size(210, 34);
+ this.layoutControlItem34.Size = new System.Drawing.Size(273, 34);
this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
@@ -2730,40 +2730,40 @@
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_iCount_98;
- this.layoutControlItem33.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem33.Location = new System.Drawing.Point(1084, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem33.Size = new System.Drawing.Size(207, 34);
+ this.layoutControlItem33.Size = new System.Drawing.Size(271, 34);
this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_printRemark98;
- this.layoutControlItem32.Location = new System.Drawing.Point(621, 0);
+ this.layoutControlItem32.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem32.Size = new System.Drawing.Size(207, 34);
+ this.layoutControlItem32.Size = new System.Drawing.Size(271, 34);
this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.txt_kQty98;
- this.layoutControlItem31.Location = new System.Drawing.Point(414, 0);
+ this.layoutControlItem31.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem31.Size = new System.Drawing.Size(207, 34);
+ this.layoutControlItem31.Size = new System.Drawing.Size(271, 34);
this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.txt_yQty98;
- this.layoutControlItem30.Location = new System.Drawing.Point(207, 0);
+ this.layoutControlItem30.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem30.Size = new System.Drawing.Size(207, 34);
+ this.layoutControlItem30.Size = new System.Drawing.Size(271, 34);
this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
@@ -2772,7 +2772,7 @@
this.layoutControlItem37.Control = this.txt_zQty98;
this.layoutControlItem37.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem37.Name = "layoutControlItem37";
- this.layoutControlItem37.Size = new System.Drawing.Size(207, 34);
+ this.layoutControlItem37.Size = new System.Drawing.Size(271, 34);
this.layoutControlItem37.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
//
@@ -2781,7 +2781,7 @@
this.xtraTabPage4.Controls.Add(this.gcMx4);
this.xtraTabPage4.Controls.Add(this.panMx100);
this.xtraTabPage4.Name = "xtraTabPage4";
- this.xtraTabPage4.Size = new System.Drawing.Size(1265, 481);
+ this.xtraTabPage4.Size = new System.Drawing.Size(1648, 481);
this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
//
// gcMx4
@@ -2790,7 +2790,7 @@
this.gcMx4.Location = new System.Drawing.Point(0, 54);
this.gcMx4.MainView = this.gvMx4;
this.gcMx4.Name = "gcMx4";
- this.gcMx4.Size = new System.Drawing.Size(1265, 427);
+ this.gcMx4.Size = new System.Drawing.Size(1648, 427);
this.gcMx4.TabIndex = 2;
this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx4});
@@ -2915,7 +2915,7 @@
this.panMx100.Dock = System.Windows.Forms.DockStyle.Top;
this.panMx100.Location = new System.Drawing.Point(0, 0);
this.panMx100.Name = "panMx100";
- this.panMx100.Size = new System.Drawing.Size(1265, 54);
+ this.panMx100.Size = new System.Drawing.Size(1648, 54);
this.panMx100.TabIndex = 0;
//
// ucBtnPrint100
@@ -2932,7 +2932,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1269, 820);
+ this.ClientSize = new System.Drawing.Size(1652, 820);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_Womdaa";
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index 1aa967b..c46f33b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -30,6 +30,7 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fstatus", "", (value) =>
@@ -145,7 +146,19 @@
_filterList = e.FilterList;
getPageList(1);
}
-
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_hNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
/// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs
index 4d3fc65..c6f0c68 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs
@@ -46,9 +46,10 @@
this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
@@ -73,6 +74,7 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.colChkInt,
this.gv_guid,
this.gv_remarks,
this.gridColumn4,
@@ -94,8 +96,6 @@
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsSelection.MultiSelect = true;
- this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
@@ -122,7 +122,7 @@
this.gv_remarks.OptionsColumn.ReadOnly = true;
this.gv_remarks.Tag = "query_a.REMARKS";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 1;
+ this.gv_remarks.VisibleIndex = 13;
this.gv_remarks.Width = 100;
//
// gridColumn4
@@ -133,7 +133,7 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 2;
+ this.gridColumn4.VisibleIndex = 0;
this.gridColumn4.Width = 120;
//
// gridColumn3
@@ -144,7 +144,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.VisibleIndex = 1;
this.gridColumn3.Width = 125;
//
// gridColumn12
@@ -155,7 +155,7 @@
this.gridColumn12.MinWidth = 50;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 4;
+ this.gridColumn12.VisibleIndex = 2;
this.gridColumn12.Width = 50;
//
// gv_billNo
@@ -174,7 +174,7 @@
this.gv_billNo.OptionsColumn.ReadOnly = true;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 5;
+ this.gv_billNo.VisibleIndex = 3;
this.gv_billNo.Width = 50;
//
// gv_supplierItemCode
@@ -188,7 +188,7 @@
this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
this.gv_supplierItemCode.Visible = true;
- this.gv_supplierItemCode.VisibleIndex = 6;
+ this.gv_supplierItemCode.VisibleIndex = 4;
this.gv_supplierItemCode.Width = 100;
//
// gv_supplierItemName
@@ -202,7 +202,7 @@
this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
this.gv_supplierItemName.Visible = true;
- this.gv_supplierItemName.VisibleIndex = 7;
+ this.gv_supplierItemName.VisibleIndex = 5;
this.gv_supplierItemName.Width = 120;
//
// gridColumn5
@@ -223,7 +223,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 8;
+ this.gridColumn6.VisibleIndex = 6;
this.gridColumn6.Width = 50;
//
// gridColumn9
@@ -234,7 +234,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 9;
+ this.gridColumn9.VisibleIndex = 7;
this.gridColumn9.Width = 100;
//
// gridColumn8
@@ -245,7 +245,7 @@
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.OptionsColumn.ReadOnly = true;
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 10;
+ this.gridColumn8.VisibleIndex = 8;
this.gridColumn8.Width = 100;
//
// gridColumn7
@@ -256,7 +256,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 11;
+ this.gridColumn7.VisibleIndex = 9;
this.gridColumn7.Width = 100;
//
// gv_purchaseUnit
@@ -270,7 +270,7 @@
this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gv_purchaseUnit.Visible = true;
- this.gv_purchaseUnit.VisibleIndex = 12;
+ this.gv_purchaseUnit.VisibleIndex = 10;
this.gv_purchaseUnit.Width = 100;
//
// gv_inventoryUnit
@@ -284,7 +284,7 @@
this.gv_inventoryUnit.OptionsColumn.ReadOnly = true;
this.gv_inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
this.gv_inventoryUnit.Visible = true;
- this.gv_inventoryUnit.VisibleIndex = 13;
+ this.gv_inventoryUnit.VisibleIndex = 11;
this.gv_inventoryUnit.Width = 100;
//
// gridColumn1
@@ -294,6 +294,16 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鐢ㄦ枡娓呭崟";
+ this.gridColumn2.FieldName = "ylqd";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 12;
+ this.gridColumn2.Width = 94;
//
// panelControl1
//
@@ -317,15 +327,15 @@
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾瀵煎叆";
//
- // gridColumn2
+ // colChkInt
//
- this.gridColumn2.Caption = "鐢ㄦ枡娓呭崟";
- this.gridColumn2.FieldName = "ylqd";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 14;
- this.gridColumn2.Width = 94;
+ this.colChkInt.Caption = ".";
+ this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.MinWidth = 25;
+ this.colChkInt.Name = "colChkInt";
+ this.colChkInt.Visible = true;
+ this.colChkInt.VisibleIndex = 0;
+ this.colChkInt.Width = 94;
//
// SelectWompba
//
@@ -371,5 +381,6 @@
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.SimpleButton btnIn;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.cs
index dc79f79..11ad0c0 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.cs
@@ -16,23 +16,37 @@
{
InitializeComponent();
this.workId = _workId;
+ this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
+ this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); };
+ this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.colChkInt.OptionsFilter.AllowAutoFilter = false;
+ this.colChkInt.OptionsFilter.AllowFilter = false;
+ this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
+ this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.colChkInt.VisibleIndex = 0;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
-
}, null, false);
getPageList(1);
btnIn.Click += (s, e) =>
{
var list = new List<string>();
- int[] rows = this.gridView1.GetSelectedRows();//鍏堣幏鍙栭�夋嫨琛岀殑琛屽彿
- DataTable dt = this.gcMain.DataSource as DataTable;//寰楀埌GridControl鐨勬暟鎹簮
- foreach (int idx in rows)
+ gridView1.PostEditor();
+ gridView1.UpdateCurrentRow();
+ DataTable dt = this.gcMain.DataSource as DataTable;
{
- string _guid = dt.Rows[idx]["guid"].ToString();
- list.Add(_guid);
+ foreach (DataRow dr in dt.Rows)
+ {
+ string checkBox = dr["chkInt"].ToString();
+ if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
+ {
+ string _guid = dr["guid"].ToString();
+ list.Add(_guid);
+ }
+ }
}
UpdateParent?.Invoke(this,
- new UpdateParentEventArgs { StringList = list });
+ new UpdateParentEventArgs { StringList = list });
Close();
};
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 44d62ac..a3a55a6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -30,13 +30,13 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -159,7 +159,9 @@
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -927,29 +929,29 @@
this.layoutControlItem14});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3});
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
this.Root.Size = new System.Drawing.Size(1342, 104);
this.Root.TextVisible = false;
//
@@ -1272,7 +1274,7 @@
this.gvMx1purchaseQty.Name = "gvMx1purchaseQty";
this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY";
this.gvMx1purchaseQty.Visible = true;
- this.gvMx1purchaseQty.VisibleIndex = 5;
+ this.gvMx1purchaseQty.VisibleIndex = 4;
this.gvMx1purchaseQty.Width = 25;
//
// gvMx1purchaseUnit
@@ -1284,7 +1286,7 @@
this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit";
this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gvMx1purchaseUnit.Visible = true;
- this.gvMx1purchaseUnit.VisibleIndex = 6;
+ this.gvMx1purchaseUnit.VisibleIndex = 12;
this.gvMx1purchaseUnit.Width = 25;
//
// gvMx1inventoryUnit
@@ -1316,7 +1318,7 @@
this.gvMx1isGift.Name = "gvMx1isGift";
this.gvMx1isGift.Tag = "query_a.IS_GIFT";
this.gvMx1isGift.Visible = true;
- this.gvMx1isGift.VisibleIndex = 7;
+ this.gvMx1isGift.VisibleIndex = 13;
this.gvMx1isGift.Width = 25;
//
// gvMx1remarks
@@ -1328,7 +1330,7 @@
this.gvMx1remarks.Name = "gvMx1remarks";
this.gvMx1remarks.Tag = "query_a.REMARKS";
this.gvMx1remarks.Visible = true;
- this.gvMx1remarks.VisibleIndex = 8;
+ this.gvMx1remarks.VisibleIndex = 14;
this.gvMx1remarks.Width = 46;
//
// gvMx1businessTerminate
@@ -1340,7 +1342,7 @@
this.gvMx1businessTerminate.Name = "gvMx1businessTerminate";
this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE";
this.gvMx1businessTerminate.Visible = true;
- this.gvMx1businessTerminate.VisibleIndex = 4;
+ this.gvMx1businessTerminate.VisibleIndex = 15;
this.gvMx1businessTerminate.Width = 25;
//
// gvMx1businessClose
@@ -1352,7 +1354,7 @@
this.gvMx1businessClose.Name = "gvMx1businessClose";
this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE";
this.gvMx1businessClose.Visible = true;
- this.gvMx1businessClose.VisibleIndex = 9;
+ this.gvMx1businessClose.VisibleIndex = 16;
this.gvMx1businessClose.Width = 25;
//
// gvMx1businessFreeze
@@ -1364,7 +1366,7 @@
this.gvMx1businessFreeze.Name = "gvMx1businessFreeze";
this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE";
this.gvMx1businessFreeze.Visible = true;
- this.gvMx1businessFreeze.VisibleIndex = 10;
+ this.gvMx1businessFreeze.VisibleIndex = 17;
this.gvMx1businessFreeze.Width = 25;
//
// gvMx1freezer
@@ -1416,17 +1418,21 @@
this.gvMx1totalReceivedQty.Name = "gvMx1totalReceivedQty";
this.gvMx1totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY";
this.gvMx1totalReceivedQty.Visible = true;
- this.gvMx1totalReceivedQty.VisibleIndex = 11;
+ this.gvMx1totalReceivedQty.VisibleIndex = 5;
this.gvMx1totalReceivedQty.Width = 32;
//
// gridColumn10
//
+ this.gridColumn10.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn10.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn10.Caption = "鍓╀綑鏀舵枡鏁伴噺";
this.gridColumn10.FieldName = "qty2";
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 12;
+ this.gridColumn10.VisibleIndex = 6;
this.gridColumn10.Width = 37;
//
// gvMx1totalStoredQty
@@ -1438,19 +1444,23 @@
this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty";
this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY";
this.gvMx1totalStoredQty.Visible = true;
- this.gvMx1totalStoredQty.VisibleIndex = 13;
+ this.gvMx1totalStoredQty.VisibleIndex = 7;
this.gvMx1totalStoredQty.Width = 28;
//
// gvMx1remainingStoredQty
//
+ this.gvMx1remainingStoredQty.AppearanceCell.ForeColor = System.Drawing.Color.Red;
this.gvMx1remainingStoredQty.AppearanceCell.Options.UseFont = true;
+ this.gvMx1remainingStoredQty.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1remainingStoredQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gvMx1remainingStoredQty.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1remainingStoredQty.Caption = "鍓╀綑鍏ュ簱鏁伴噺";
this.gvMx1remainingStoredQty.FieldName = "qty4";
this.gvMx1remainingStoredQty.MinWidth = 25;
this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty";
this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
this.gvMx1remainingStoredQty.Visible = true;
- this.gvMx1remainingStoredQty.VisibleIndex = 14;
+ this.gvMx1remainingStoredQty.VisibleIndex = 8;
this.gvMx1remainingStoredQty.Width = 32;
//
// gvMx1totalReturnedQty
@@ -1462,7 +1472,7 @@
this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty";
this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY";
this.gvMx1totalReturnedQty.Visible = true;
- this.gvMx1totalReturnedQty.VisibleIndex = 15;
+ this.gvMx1totalReturnedQty.VisibleIndex = 9;
this.gvMx1totalReturnedQty.Width = 32;
//
// gvMx1returnableReceivedQty
@@ -1474,7 +1484,7 @@
this.gvMx1returnableReceivedQty.Name = "gvMx1returnableReceivedQty";
this.gvMx1returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY";
this.gvMx1returnableReceivedQty.Visible = true;
- this.gvMx1returnableReceivedQty.VisibleIndex = 16;
+ this.gvMx1returnableReceivedQty.VisibleIndex = 10;
this.gvMx1returnableReceivedQty.Width = 32;
//
// gvMx1returnableStoredQty
@@ -1486,7 +1496,7 @@
this.gvMx1returnableStoredQty.Name = "gvMx1returnableStoredQty";
this.gvMx1returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY";
this.gvMx1returnableStoredQty.Visible = true;
- this.gvMx1returnableStoredQty.VisibleIndex = 17;
+ this.gvMx1returnableStoredQty.VisibleIndex = 11;
this.gvMx1returnableStoredQty.Width = 32;
//
// gvMx1sourceDocumentType
@@ -1588,7 +1598,9 @@
this.gridColumn17,
this.gridColumn22,
this.gridColumn47,
- this.gridColumn48});
+ this.gridColumn48,
+ this.gridColumn12,
+ this.gridColumn18});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1622,7 +1634,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 1;
+ this.gridColumn15.VisibleIndex = 2;
this.gridColumn15.Width = 46;
//
// gridColumn16
@@ -1632,7 +1644,7 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 2;
+ this.gridColumn16.VisibleIndex = 3;
this.gridColumn16.Width = 55;
//
// gridColumn17
@@ -1644,19 +1656,19 @@
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Tag = "query_a.PRICING_QTY";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 3;
+ this.gridColumn17.VisibleIndex = 4;
this.gridColumn17.Width = 25;
//
// gridColumn22
//
this.gridColumn22.AppearanceCell.Options.UseFont = true;
- this.gridColumn22.Caption = "鏀惰揣鏁伴噺";
+ this.gridColumn22.Caption = "鍒拌揣鏁伴噺";
this.gridColumn22.FieldName = "quantity";
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Tag = "query_a.PURCHASE_QTY";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 4;
+ this.gridColumn22.VisibleIndex = 5;
this.gridColumn22.Width = 25;
//
// gridColumn47
@@ -1666,7 +1678,7 @@
this.gridColumn47.MinWidth = 25;
this.gridColumn47.Name = "gridColumn47";
this.gridColumn47.Visible = true;
- this.gridColumn47.VisibleIndex = 5;
+ this.gridColumn47.VisibleIndex = 7;
this.gridColumn47.Width = 43;
//
// gridColumn48
@@ -1676,8 +1688,32 @@
this.gridColumn48.MinWidth = 25;
this.gridColumn48.Name = "gridColumn48";
this.gridColumn48.Visible = true;
- this.gridColumn48.VisibleIndex = 6;
+ this.gridColumn48.VisibleIndex = 8;
this.gridColumn48.Width = 94;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "鍒拌揣鍗曞彿";
+ this.gridColumn12.FieldName = "dhdh";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 1;
+ this.gridColumn12.Width = 94;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn18.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn18.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn18.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn18.Caption = "瀹炴敹鏁伴噺";
+ this.gridColumn18.FieldName = "sjQuantity";
+ this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 6;
+ this.gridColumn18.Width = 94;
//
// Frm_MesRohIn
//
@@ -1870,5 +1906,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
index 4b1e89d..1eeb1d6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
@@ -83,6 +83,7 @@
this.btnCopy = new DevExpress.XtraEditors.SimpleButton();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -102,6 +103,7 @@
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -120,8 +122,6 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -164,6 +164,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isCheck.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
@@ -183,6 +184,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -193,8 +195,6 @@
((System.ComponentModel.ISupportInitialize)(this.rptGx)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -430,7 +430,7 @@
//
// txt_fMaxWeight
//
- this.txt_fMaxWeight.Location = new System.Drawing.Point(496, 12);
+ this.txt_fMaxWeight.Location = new System.Drawing.Point(498, 12);
this.txt_fMaxWeight.Name = "txt_fMaxWeight";
this.txt_fMaxWeight.Properties.Appearance.Options.UseFont = true;
this.txt_fMaxWeight.Size = new System.Drawing.Size(62, 24);
@@ -440,7 +440,7 @@
//
// txt_fMinWeight
//
- this.txt_fMinWeight.Location = new System.Drawing.Point(496, 43);
+ this.txt_fMinWeight.Location = new System.Drawing.Point(498, 43);
this.txt_fMinWeight.Name = "txt_fMinWeight";
this.txt_fMinWeight.Properties.Appearance.Options.UseFont = true;
this.txt_fMinWeight.Size = new System.Drawing.Size(62, 24);
@@ -450,7 +450,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(82, 74);
+ this.txt_itemName.Location = new System.Drawing.Point(84, 74);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
this.txt_itemName.Size = new System.Drawing.Size(200, 27);
@@ -470,7 +470,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(82, 43);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 43);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Size = new System.Drawing.Size(200, 24);
@@ -480,7 +480,7 @@
//
// txt_fSumPeople
//
- this.txt_fSumPeople.Location = new System.Drawing.Point(358, 74);
+ this.txt_fSumPeople.Location = new System.Drawing.Point(360, 74);
this.txt_fSumPeople.Name = "txt_fSumPeople";
this.txt_fSumPeople.Properties.Appearance.Options.UseFont = true;
this.txt_fSumPeople.Size = new System.Drawing.Size(62, 24);
@@ -490,7 +490,7 @@
//
// txt_fCapacity
//
- this.txt_fCapacity.Location = new System.Drawing.Point(496, 74);
+ this.txt_fCapacity.Location = new System.Drawing.Point(498, 74);
this.txt_fCapacity.Name = "txt_fCapacity";
this.txt_fCapacity.Properties.Appearance.Options.UseFont = true;
this.txt_fCapacity.Size = new System.Drawing.Size(62, 24);
@@ -500,7 +500,7 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(82, 105);
+ this.txt_remark.Location = new System.Drawing.Point(84, 105);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
this.txt_remark.Size = new System.Drawing.Size(200, 24);
@@ -511,12 +511,12 @@
// txt_fJingDu
//
this.txt_fJingDu.EditValue = "PSC娴�";
- this.txt_fJingDu.Location = new System.Drawing.Point(358, 43);
+ this.txt_fJingDu.Location = new System.Drawing.Point(360, 43);
this.txt_fJingDu.Name = "txt_fJingDu";
this.txt_fJingDu.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fJingDu.Properties.Items.AddRange(new object[] {
- "PSC娴�",
+ "PCS娴�",
"LOT娴�"});
this.txt_fJingDu.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_fJingDu.Size = new System.Drawing.Size(62, 24);
@@ -526,7 +526,7 @@
// txt_fBegDate
//
this.txt_fBegDate.EditValue = null;
- this.txt_fBegDate.Location = new System.Drawing.Point(358, 105);
+ this.txt_fBegDate.Location = new System.Drawing.Point(360, 105);
this.txt_fBegDate.Name = "txt_fBegDate";
this.txt_fBegDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -539,7 +539,7 @@
// txt_fEndDate
//
this.txt_fEndDate.EditValue = null;
- this.txt_fEndDate.Location = new System.Drawing.Point(358, 136);
+ this.txt_fEndDate.Location = new System.Drawing.Point(360, 136);
this.txt_fEndDate.Name = "txt_fEndDate";
this.txt_fEndDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -551,7 +551,7 @@
//
// txt_orgName
//
- this.txt_orgName.Location = new System.Drawing.Point(82, 12);
+ this.txt_orgName.Location = new System.Drawing.Point(84, 12);
this.txt_orgName.Name = "txt_orgName";
this.txt_orgName.Size = new System.Drawing.Size(200, 24);
this.txt_orgName.StyleController = this.layoutMx1;
@@ -561,7 +561,7 @@
// txt_fType
//
this.txt_fType.EditValue = "-璇烽�夋嫨-";
- this.txt_fType.Location = new System.Drawing.Point(358, 12);
+ this.txt_fType.Location = new System.Drawing.Point(360, 12);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -579,7 +579,7 @@
this.btnSelect.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
this.btnSelect.Appearance.Options.UseBackColor = true;
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
- this.btnSelect.Location = new System.Drawing.Point(10, 136);
+ this.btnSelect.Location = new System.Drawing.Point(12, 136);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(96, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -596,7 +596,7 @@
//
// txt_lastUpdateBy
//
- this.txt_lastUpdateBy.Location = new System.Drawing.Point(634, 12);
+ this.txt_lastUpdateBy.Location = new System.Drawing.Point(636, 12);
this.txt_lastUpdateBy.Name = "txt_lastUpdateBy";
this.txt_lastUpdateBy.Size = new System.Drawing.Size(62, 24);
this.txt_lastUpdateBy.StyleController = this.layoutMx1;
@@ -605,7 +605,7 @@
//
// txt_lastUpdateDate
//
- this.txt_lastUpdateDate.Location = new System.Drawing.Point(634, 43);
+ this.txt_lastUpdateDate.Location = new System.Drawing.Point(636, 43);
this.txt_lastUpdateDate.Name = "txt_lastUpdateDate";
this.txt_lastUpdateDate.Size = new System.Drawing.Size(62, 24);
this.txt_lastUpdateDate.StyleController = this.layoutMx1;
@@ -614,7 +614,7 @@
//
// txt_checkBy
//
- this.txt_checkBy.Location = new System.Drawing.Point(634, 74);
+ this.txt_checkBy.Location = new System.Drawing.Point(636, 74);
this.txt_checkBy.Name = "txt_checkBy";
this.txt_checkBy.Size = new System.Drawing.Size(62, 24);
this.txt_checkBy.StyleController = this.layoutMx1;
@@ -623,7 +623,7 @@
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(634, 105);
+ this.txt_checkDate.Location = new System.Drawing.Point(636, 105);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Size = new System.Drawing.Size(62, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
@@ -632,7 +632,7 @@
//
// txt_isCheck
//
- this.txt_isCheck.Location = new System.Drawing.Point(562, 136);
+ this.txt_isCheck.Location = new System.Drawing.Point(564, 136);
this.txt_isCheck.Name = "txt_isCheck";
this.txt_isCheck.Properties.Caption = "瀹℃牳鐘舵��";
this.txt_isCheck.Size = new System.Drawing.Size(134, 24);
@@ -645,7 +645,7 @@
this.btnCopy.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
this.btnCopy.Appearance.Options.UseBackColor = true;
this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.copy_16x16;
- this.btnCopy.Location = new System.Drawing.Point(148, 136);
+ this.btnCopy.Location = new System.Drawing.Point(150, 136);
this.btnCopy.Name = "btnCopy";
this.btnCopy.Size = new System.Drawing.Size(134, 27);
this.btnCopy.StyleController = this.layoutMx1;
@@ -674,6 +674,17 @@
this.layoutControlItem2.Size = new System.Drawing.Size(306, 32);
this.layoutControlItem2.Text = "瑙勬牸鍨嬪彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_guid;
+ this.layoutControlItem16.Location = new System.Drawing.Point(576, 31);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem16.Size = new System.Drawing.Size(144, 31);
+ this.layoutControlItem16.Text = "浜у搧GUID";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
//
// Root
//
@@ -939,6 +950,17 @@
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
//
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.txt_lastUpdateDate;
+ this.layoutControlItem21.Location = new System.Drawing.Point(552, 31);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem21.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem21.Text = "鏇存柊鏃堕棿";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1182,28 +1204,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_guid;
- this.layoutControlItem16.Location = new System.Drawing.Point(576, 31);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(144, 31);
- this.layoutControlItem16.Text = "浜у搧GUID";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem21
- //
- this.layoutControlItem21.Control = this.txt_lastUpdateDate;
- this.layoutControlItem21.Location = new System.Drawing.Point(552, 31);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(138, 31);
- this.layoutControlItem21.Text = "鏇存柊鏃堕棿";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
- //
// Frm_WorkTechnique
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1256,6 +1256,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isCheck.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
@@ -1275,6 +1276,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1285,8 +1287,6 @@
((System.ComponentModel.ISupportInitialize)(this.rptGx)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 4a26e0f..90d9eae 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -53,7 +53,7 @@
fmLogin.ShowDialog();
if (fmLogin.DialogResult == DialogResult.OK)
{
- //Application.Run(new DevFrm.User.SysMenu());
+ // Application.Run(new DevFrm.User.SysMenu());
bool IsWeight = false;
try
{
--
Gitblit v1.9.3