From eb374e4405bac15c8d28ce9d17e6ee47b43338d4 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 27 八月 2025 14:00:23 +0800
Subject: [PATCH] 生产部分优化
---
DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs | 37 +
DevApp/Gs.DevApp/UserControl/UcLookDaa.Designer.cs | 33
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WompbaGx.Designer.cs | 345 ++++++-----
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | 10
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.cs | 134 ++++
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs | 2
DevApp/Gs.DevApp/Gs.DevApp.csproj | 10
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs | 514 +++++++++++-------
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs | 111 ++-
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 71 +-
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WompbaGx.resx | 212 +++----
DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs | 148 ++--
12 files changed, 974 insertions(+), 653 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
index 62c774f..bb3ca7b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -91,6 +91,16 @@
return;
}
var frm = new UcBlclSelect(txt_aboutGuid.GetId(), this.txt_orgId.GetId());
+
+ if (txt_bl017.Text.Trim() == "鐢熶骇琛ユ枡")
+ {
+ frm = new UcBlclSelect(txt_aboutGuid.GetId(), this.txt_orgId.GetId(), txt_bl017.Text.Trim());
+ }
+ else
+ {
+ frm = new UcBlclSelect(txt_aboutGuid.GetId(), this.txt_orgId.GetId());
+
+ }
//璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.cs
index 0cb2c74..df28aa3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclSelect.cs
@@ -12,24 +12,58 @@
private readonly string _webServiceName = "WomdaaManager/";
private string daaId = "";
private string orgId = "";
+
/// <summary>
- ///
+ /// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="_daaGuid">daaGuid</param>
/// <param name="_orgId">鐢熶骇缁勭粐</param>
public UcBlclSelect(string _daaGuid, string _orgId)
{
InitializeComponent();
+ InitializeGridSettings();
+ this.daaId = _daaGuid;
+ this.orgId = _orgId;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
+ getPageList(1);
+ SetupButtonClickEvent();
+ }
+
+ /// <summary>
+ /// 閲嶈浇鏋勯�犲嚱鏁� - 绛涢�夋帀kbsl涓�0鐨勬暟鎹�
+ /// </summary>
+ /// <param name="_daaGuid">daaGuid</param>
+ /// <param name="_orgId">鐢熶骇缁勭粐</param>
+ /// <param name="_type">绫诲瀷鏍囪瘑</param>
+ public UcBlclSelect(string _daaGuid, string _orgId, string _type)
+ {
+ InitializeComponent();
+ InitializeGridSettings();
+ this.daaId = _daaGuid;
+ this.orgId = _orgId;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
+ getPageListWithFilter(1); // 浣跨敤杩囨护鏂规硶
+ SetupButtonClickEvent();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栫綉鏍艰缃�
+ /// </summary>
+ private void InitializeGridSettings()
+ {
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.daaId = _daaGuid;
- this.orgId = _orgId;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
- getPageList(1);
+ }
+
+ /// <summary>
+ /// 璁剧疆鎸夐挳鐐瑰嚮浜嬩欢
+ /// </summary>
+ private void SetupButtonClickEvent()
+ {
btnIn.Click += (s, e) =>
{
gridView1.PostEditor();
@@ -52,23 +86,24 @@
itemNo = dr["itemNo"].ToString(),
gdh = dr["gdh"].ToString(),
kbsl = dr["kbsl"].ToString()
- });
+ });
}
}
}
- UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list }); Close();
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
+ Close();
};
}
/// <summary>
- /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
/// </summary>
public event EventHandler<UpdateParentEventArgs> UpdateParent;
/// <summary>
+ /// 鑾峰彇椤甸潰鏁版嵁锛堜笉杩囨护锛�
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
- /// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
var _obj = new
@@ -89,12 +124,91 @@
gcMain.BindingContext = new BindingContext();
gcMain.DataSource = dt;
gcMain.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ gridView1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+ /// <summary>
+ /// 鑾峰彇椤甸潰鏁版嵁骞剁瓫閫夋帀kbsl涓�0鐨勬暟鎹�
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ private void getPageListWithFilter(int curPage)
+ {
+ var _obj = new
+ {
+ currentPage = 1,
+ everyPageSize = 999999,
+ sortName = "",
+ keyWhere = "",
+ daaGuid = daaId
+ };
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ _webServiceName + "GetListSelectDab", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+
+ // 绛涢�夋帀kbsl涓�0鐨勬暟鎹�
+ DataTable filteredDt = FilterZeroKbsl(dt);
+
+ gcMain.BindingContext = new BindingContext();
+ gcMain.DataSource = filteredDt;
+ gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 绛涢�夋帀kbsl涓�0鐨勬暟鎹�
+ /// </summary>
+ /// <param name="sourceTable">婧愭暟鎹〃</param>
+ /// <returns>杩囨护鍚庣殑鏁版嵁琛�</returns>
+ private DataTable FilterZeroKbsl(DataTable sourceTable)
+ {
+ if (sourceTable == null || sourceTable.Rows.Count == 0)
+ return sourceTable;
+
+ // 鍒涘缓鏂扮殑DataTable鏉ュ瓨鍌ㄨ繃婊ゅ悗鐨勬暟鎹�
+ DataTable filteredTable = sourceTable.Clone();
+
+ foreach (DataRow row in sourceTable.Rows)
+ {
+ // 妫�鏌bsl鍒楁槸鍚﹀瓨鍦ㄤ笖涓嶄负0
+ if (sourceTable.Columns.Contains("kbsl"))
+ {
+ object kbslValue = row["kbsl"];
+ decimal kbsl = 0;
+
+ // 灏濊瘯杞崲涓篸ecimal
+ if (kbslValue != null && kbslValue != DBNull.Value &&
+ decimal.TryParse(kbslValue.ToString(), out kbsl))
+ {
+ if (kbsl > 0) // 鍙繚鐣檏bsl澶т簬0鐨勮
+ {
+ filteredTable.ImportRow(row);
+ }
+ }
+ }
+ else
+ {
+ // 濡傛灉娌℃湁kbsl鍒楋紝淇濈暀鎵�鏈夎
+ filteredTable.ImportRow(row);
+ }
+ }
+
+ return filteredTable;
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
index 9ccbbba..9535b70 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.Designer.cs
@@ -52,6 +52,7 @@
this.gv_indepUserCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.gv_cgy = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -73,9 +74,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1051, 62);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -83,10 +85,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1051, 468);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1});
@@ -94,8 +97,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1049, 442);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -104,6 +108,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -116,17 +121,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.Size = new System.Drawing.Size(1049, 442);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1049, 402);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -150,9 +157,11 @@
this.gv_ownerId,
this.gridColumn5,
this.gv_indepUserCode,
- this.gv_indepDate});
+ this.gv_indepDate,
+ this.gv_cgy});
+ this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 44;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -164,74 +173,74 @@
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭GUID";
this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 50;
+ this.gv_guid.MinWidth = 44;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.Tag = "query_a.guid";
- this.gv_guid.Width = 94;
+ this.gv_guid.Width = 82;
//
// gv_itemId
//
this.gv_itemId.AppearanceCell.Options.UseFont = true;
this.gv_itemId.Caption = "鐗╂枡ID ";
this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 50;
+ this.gv_itemId.MinWidth = 44;
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.ITEM_ID";
this.gv_itemId.Visible = true;
this.gv_itemId.VisibleIndex = 0;
- this.gv_itemId.Width = 73;
+ this.gv_itemId.Width = 70;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡缂栫爜";
this.gridColumn3.FieldName = "itemNo";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 22;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 1;
- this.gridColumn3.Width = 73;
+ this.gridColumn3.Width = 70;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
this.gridColumn2.FieldName = "itemName";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 22;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 2;
- this.gridColumn2.Width = 73;
+ this.gridColumn2.Width = 70;
//
// gridColumn4
//
this.gridColumn4.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn4.FieldName = "itemModel";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 22;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 3;
- this.gridColumn4.Width = 73;
+ this.gridColumn4.Width = 70;
//
// gv_itemBarcode
//
this.gv_itemBarcode.AppearanceCell.Options.UseFont = true;
this.gv_itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gv_itemBarcode.FieldName = "itemBarcode";
- this.gv_itemBarcode.MinWidth = 50;
+ this.gv_itemBarcode.MinWidth = 44;
this.gv_itemBarcode.Name = "gv_itemBarcode";
this.gv_itemBarcode.OptionsColumn.AllowEdit = false;
this.gv_itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gv_itemBarcode.Visible = true;
this.gv_itemBarcode.VisibleIndex = 4;
- this.gv_itemBarcode.Width = 73;
+ this.gv_itemBarcode.Width = 70;
//
// gv_quantity
//
this.gv_quantity.AppearanceCell.Options.UseFont = true;
this.gv_quantity.Caption = "鏁伴噺 ";
this.gv_quantity.FieldName = "quantity";
- this.gv_quantity.MinWidth = 50;
+ this.gv_quantity.MinWidth = 44;
this.gv_quantity.Name = "gv_quantity";
this.gv_quantity.OptionsColumn.AllowEdit = false;
this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
@@ -239,136 +248,147 @@
this.gv_quantity.Tag = "query_a.QUANTITY";
this.gv_quantity.Visible = true;
this.gv_quantity.VisibleIndex = 5;
- this.gv_quantity.Width = 73;
+ this.gv_quantity.Width = 70;
//
// gv_depotId
//
this.gv_depotId.AppearanceCell.Options.UseFont = true;
this.gv_depotId.Caption = "浠撳簱ID";
this.gv_depotId.FieldName = "depotId";
- this.gv_depotId.MinWidth = 50;
+ this.gv_depotId.MinWidth = 44;
this.gv_depotId.Name = "gv_depotId";
this.gv_depotId.OptionsColumn.AllowEdit = false;
this.gv_depotId.Tag = "query_a.DEPOT_ID";
this.gv_depotId.Visible = true;
this.gv_depotId.VisibleIndex = 6;
- this.gv_depotId.Width = 73;
+ this.gv_depotId.Width = 70;
//
// gridColumn6
//
this.gridColumn6.Caption = "浠撳簱缂栧彿";
this.gridColumn6.FieldName = "depotNo";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 22;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 7;
- this.gridColumn6.Width = 73;
+ this.gridColumn6.Width = 70;
//
// gridColumn1
//
this.gridColumn1.Caption = "浠撳簱鍚嶇О";
this.gridColumn1.FieldName = "depotName";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 22;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 8;
- this.gridColumn1.Width = 73;
+ this.gridColumn1.Width = 70;
//
// gv_depotSectionsCode
//
this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;
this.gv_depotSectionsCode.Caption = "璐т綅缂栧彿";
this.gv_depotSectionsCode.FieldName = "depotSectionsCode";
- this.gv_depotSectionsCode.MinWidth = 50;
+ this.gv_depotSectionsCode.MinWidth = 44;
this.gv_depotSectionsCode.Name = "gv_depotSectionsCode";
this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false;
this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE";
this.gv_depotSectionsCode.Visible = true;
this.gv_depotSectionsCode.VisibleIndex = 9;
- this.gv_depotSectionsCode.Width = 73;
+ this.gv_depotSectionsCode.Width = 70;
//
// gv_ownerType
//
this.gv_ownerType.AppearanceCell.Options.UseFont = true;
this.gv_ownerType.Caption = "璐т富绫诲瀷";
this.gv_ownerType.FieldName = "ownerType";
- this.gv_ownerType.MinWidth = 50;
+ this.gv_ownerType.MinWidth = 44;
this.gv_ownerType.Name = "gv_ownerType";
this.gv_ownerType.OptionsColumn.AllowEdit = false;
this.gv_ownerType.Tag = "query_a.Owner_Type";
this.gv_ownerType.Visible = true;
this.gv_ownerType.VisibleIndex = 10;
- this.gv_ownerType.Width = 73;
+ this.gv_ownerType.Width = 70;
//
// gv_ownerId
//
this.gv_ownerId.AppearanceCell.Options.UseFont = true;
this.gv_ownerId.Caption = "璐т富ID";
this.gv_ownerId.FieldName = "ownerId";
- this.gv_ownerId.MinWidth = 50;
+ this.gv_ownerId.MinWidth = 44;
this.gv_ownerId.Name = "gv_ownerId";
this.gv_ownerId.OptionsColumn.AllowEdit = false;
this.gv_ownerId.Tag = "query_a.Owner_Id";
this.gv_ownerId.Visible = true;
this.gv_ownerId.VisibleIndex = 11;
- this.gv_ownerId.Width = 73;
+ this.gv_ownerId.Width = 70;
//
// gridColumn5
//
this.gridColumn5.Caption = "璐т富鍚嶇О";
this.gridColumn5.FieldName = "ownerName";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 22;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 12;
- this.gridColumn5.Width = 73;
+ this.gridColumn5.Width = 70;
//
// gv_indepUserCode
//
this.gv_indepUserCode.AppearanceCell.Options.UseFont = true;
this.gv_indepUserCode.Caption = "鍏ュ簱浜�";
this.gv_indepUserCode.FieldName = "indepUserCode";
- this.gv_indepUserCode.MinWidth = 50;
+ this.gv_indepUserCode.MinWidth = 44;
this.gv_indepUserCode.Name = "gv_indepUserCode";
this.gv_indepUserCode.OptionsColumn.AllowEdit = false;
this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";
this.gv_indepUserCode.Visible = true;
this.gv_indepUserCode.VisibleIndex = 13;
- this.gv_indepUserCode.Width = 73;
+ this.gv_indepUserCode.Width = 67;
//
// gv_indepDate
//
this.gv_indepDate.AppearanceCell.Options.UseFont = true;
this.gv_indepDate.Caption = "鍏ュ簱鏃ユ湡 ";
this.gv_indepDate.FieldName = "indepDate";
- this.gv_indepDate.MinWidth = 10;
+ this.gv_indepDate.MinWidth = 9;
this.gv_indepDate.Name = "gv_indepDate";
this.gv_indepDate.OptionsColumn.AllowEdit = false;
this.gv_indepDate.Tag = "query_a.INDEP_DATE";
this.gv_indepDate.Visible = true;
this.gv_indepDate.VisibleIndex = 14;
- this.gv_indepDate.Width = 10;
+ this.gv_indepDate.Width = 26;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 402);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1049, 30);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
+ // gv_cgy
+ //
+ this.gv_cgy.Caption = "浠撶鍛�";
+ this.gv_cgy.FieldName = "cgy";
+ this.gv_cgy.Name = "gv_cgy";
+ this.gv_cgy.Tag = "st.staff_name";
+ this.gv_cgy.Visible = true;
+ this.gv_cgy.VisibleIndex = 15;
+ this.gv_cgy.Width = 66;
+ //
// CKTmkc
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(1051, 530);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "CKTmkc";
this.Text = "鏉＄爜搴撳瓨";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -408,5 +428,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode;
private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate;
private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_cgy;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs
index 45a2ee8..b5b497f 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs
@@ -21,6 +21,7 @@
{
InitializeComponent();
this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+ this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
@@ -136,7 +137,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "guid");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -145,8 +146,10 @@
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
return;
List<dynamic> lst = new List<dynamic>();
- lst.Add(rowGuid);
- var _obj = lst;
+ var _obj = new
+ {
+ guid = UtilityHelper.ToGuid(rowGuid),
+ };
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
@@ -203,6 +206,31 @@
//澧炲姞鏃讹紝榛樿缁勭粐
string deftOrg = UtilityHelper.GetFirstOrg(txt_orgId);
}
+
+ /// <summary>
+ /// 淇敼浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.currentAction = "edit";
+ string rowGuid = "", rowName = "";
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid);
+ }
+
+ }
+
+
/// <summary>
/// 淇濆瓨浜嬩欢
/// </summary>
@@ -237,6 +265,7 @@
}
var _obj = new
{
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
itemId = txt_ItemId.GetId(),
departmentId = txt_departmentId.GetId().Trim(),
depotId = txt_depotId.GetId().Trim(),
@@ -369,7 +398,7 @@
};
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "guid");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
index 2bd4b88..1e4109b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.Designer.cs
@@ -47,6 +47,7 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.bandedGridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_dcstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -89,7 +90,6 @@
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_tldh = new DevExpress.XtraEditors.TextEdit();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -134,6 +134,9 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.txt_dcstatus = new DevExpress.XtraEditors.CheckEdit();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -172,7 +175,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tldh.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -200,6 +202,9 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dcstatus.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -211,9 +216,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1348, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1180, 62);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -221,10 +227,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1348, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1180, 468);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -233,15 +240,18 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1346, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1178, 442);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -252,18 +262,21 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1346, 570);
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Size = new System.Drawing.Size(1178, 442);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1346, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1178, 402);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -274,6 +287,7 @@
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_guid,
this.bandedGridColumn7,
+ this.gv_dcstatus,
this.gv_billNo,
this.gv_createBy,
this.gv_createDate,
@@ -292,8 +306,9 @@
this.bandedGridColumn5,
this.bandedGridColumn6,
this.gridColumn7});
+ this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 44;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -304,237 +319,258 @@
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭Guid";
this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 50;
+ this.gv_guid.MinWidth = 44;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.Tag = "query_a.GUID";
- this.gv_guid.Width = 94;
+ this.gv_guid.Width = 82;
//
// bandedGridColumn7
//
this.bandedGridColumn7.Caption = "瀹℃牳";
this.bandedGridColumn7.FieldName = "checkStatus";
- this.bandedGridColumn7.MinWidth = 25;
+ this.bandedGridColumn7.MinWidth = 22;
this.bandedGridColumn7.Name = "bandedGridColumn7";
this.bandedGridColumn7.Tag = "query_a.BILL_NO";
this.bandedGridColumn7.Visible = true;
this.bandedGridColumn7.VisibleIndex = 0;
- this.bandedGridColumn7.Width = 94;
+ this.bandedGridColumn7.Width = 82;
+ //
+ // gv_dcstatus
+ //
+ this.gv_dcstatus.Caption = "鍊掑啿";
+ this.gv_dcstatus.FieldName = "dcstatus";
+ this.gv_dcstatus.Name = "gv_dcstatus";
+ this.gv_dcstatus.Visible = true;
+ this.gv_dcstatus.VisibleIndex = 1;
+ this.gv_dcstatus.Width = 66;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍏ュ簱鍗曞彿 ";
this.gv_billNo.FieldName = "billNo";
+ this.gv_billNo.MinWidth = 17;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 1;
- this.gv_billNo.Width = 180;
+ this.gv_billNo.VisibleIndex = 2;
+ this.gv_billNo.Width = 157;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜� ";
this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.MinWidth = 17;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.CREATE_BY";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 2;
- this.gv_createBy.Width = 80;
+ this.gv_createBy.VisibleIndex = 3;
+ this.gv_createBy.Width = 70;
//
// gv_createDate
//
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
this.gv_createDate.FieldName = "createDate";
+ this.gv_createDate.MinWidth = 17;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 3;
- this.gv_createDate.Width = 180;
+ this.gv_createDate.VisibleIndex = 4;
+ this.gv_createDate.Width = 157;
//
// gv_lastupdateBy
//
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
this.gv_lastupdateBy.FieldName = "lastupdateBy";
+ this.gv_lastupdateBy.MinWidth = 17;
this.gv_lastupdateBy.Name = "gv_lastupdateBy";
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 4;
- this.gv_lastupdateBy.Width = 94;
+ this.gv_lastupdateBy.VisibleIndex = 5;
+ this.gv_lastupdateBy.Width = 82;
//
// gv_lastupdateDate
//
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
+ this.gv_lastupdateDate.MinWidth = 17;
this.gv_lastupdateDate.Name = "gv_lastupdateDate";
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 5;
- this.gv_lastupdateDate.Width = 94;
+ this.gv_lastupdateDate.VisibleIndex = 6;
+ this.gv_lastupdateDate.Width = 82;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
this.gv_checkUser.FieldName = "checkUser";
+ this.gv_checkUser.MinWidth = 17;
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 6;
- this.gv_checkUser.Width = 60;
+ this.gv_checkUser.VisibleIndex = 7;
+ this.gv_checkUser.Width = 52;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
this.gv_checkDate.FieldName = "checkDate";
+ this.gv_checkDate.MinWidth = 17;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 7;
- this.gv_checkDate.Width = 180;
+ this.gv_checkDate.VisibleIndex = 8;
+ this.gv_checkDate.Width = 157;
//
// gv_taskNo
//
this.gv_taskNo.AppearanceCell.Options.UseFont = true;
this.gv_taskNo.Caption = "鐢熶骇宸ュ崟鍙�";
this.gv_taskNo.FieldName = "taskNo";
+ this.gv_taskNo.MinWidth = 17;
this.gv_taskNo.Name = "gv_taskNo";
this.gv_taskNo.OptionsColumn.AllowEdit = false;
this.gv_taskNo.Tag = "query_a.TASK_NO";
this.gv_taskNo.Visible = true;
- this.gv_taskNo.VisibleIndex = 8;
- this.gv_taskNo.Width = 94;
+ this.gv_taskNo.VisibleIndex = 9;
+ this.gv_taskNo.Width = 82;
//
// gridColumn8
//
this.gridColumn8.Caption = "浠诲姟鍗曞彿";
this.gridColumn8.FieldName = "workNo";
- this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.MinWidth = 22;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 9;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.VisibleIndex = 10;
+ this.gridColumn8.Width = 82;
//
// gridColumn9
//
this.gridColumn9.Caption = "鎶曟枡鍗曞彿";
this.gridColumn9.FieldName = "tldh";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 22;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 10;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.VisibleIndex = 11;
+ this.gridColumn9.Width = 82;
//
// bandedGridColumn1
//
this.bandedGridColumn1.Caption = "浠撳簱缂栧彿";
this.bandedGridColumn1.FieldName = "depotCode";
+ this.bandedGridColumn1.MinWidth = 17;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Visible = true;
- this.bandedGridColumn1.VisibleIndex = 11;
- this.bandedGridColumn1.Width = 100;
+ this.bandedGridColumn1.VisibleIndex = 12;
+ this.bandedGridColumn1.Width = 87;
//
// gv_depotsId
//
this.gv_depotsId.AppearanceCell.Options.UseFont = true;
this.gv_depotsId.Caption = "浠撳簱鍚嶇О";
this.gv_depotsId.FieldName = "depotName";
+ this.gv_depotsId.MinWidth = 17;
this.gv_depotsId.Name = "gv_depotsId";
this.gv_depotsId.OptionsColumn.AllowEdit = false;
this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
this.gv_depotsId.Visible = true;
- this.gv_depotsId.VisibleIndex = 12;
- this.gv_depotsId.Width = 100;
+ this.gv_depotsId.VisibleIndex = 13;
+ this.gv_depotsId.Width = 87;
//
// bandedGridColumn2
//
this.bandedGridColumn2.Caption = "鏀舵枡缁勭粐";
this.bandedGridColumn2.FieldName = "rkOrg";
+ this.bandedGridColumn2.MinWidth = 17;
this.bandedGridColumn2.Name = "bandedGridColumn2";
this.bandedGridColumn2.Tag = "org.fnamber";
this.bandedGridColumn2.Visible = true;
- this.bandedGridColumn2.VisibleIndex = 13;
- this.bandedGridColumn2.Width = 250;
+ this.bandedGridColumn2.VisibleIndex = 14;
+ this.bandedGridColumn2.Width = 219;
//
// bandedGridColumn3
//
this.bandedGridColumn3.Caption = "鐢熶骇缁勭粐";
this.bandedGridColumn3.FieldName = "scOrg";
- this.bandedGridColumn3.MinWidth = 25;
+ this.bandedGridColumn3.MinWidth = 22;
this.bandedGridColumn3.Name = "bandedGridColumn3";
this.bandedGridColumn3.Visible = true;
- this.bandedGridColumn3.VisibleIndex = 14;
- this.bandedGridColumn3.Width = 94;
+ this.bandedGridColumn3.VisibleIndex = 15;
+ this.bandedGridColumn3.Width = 82;
//
// bandedGridColumn4
//
this.bandedGridColumn4.Caption = "鐗╂枡缂栫爜";
this.bandedGridColumn4.FieldName = "itemNo";
- this.bandedGridColumn4.MinWidth = 25;
+ this.bandedGridColumn4.MinWidth = 22;
this.bandedGridColumn4.Name = "bandedGridColumn4";
this.bandedGridColumn4.Visible = true;
- this.bandedGridColumn4.VisibleIndex = 15;
- this.bandedGridColumn4.Width = 94;
+ this.bandedGridColumn4.VisibleIndex = 16;
+ this.bandedGridColumn4.Width = 82;
//
// bandedGridColumn5
//
this.bandedGridColumn5.Caption = "鐗╂枡鍚嶇О";
this.bandedGridColumn5.FieldName = "itemName";
- this.bandedGridColumn5.MinWidth = 25;
+ this.bandedGridColumn5.MinWidth = 22;
this.bandedGridColumn5.Name = "bandedGridColumn5";
this.bandedGridColumn5.Visible = true;
- this.bandedGridColumn5.VisibleIndex = 16;
- this.bandedGridColumn5.Width = 94;
+ this.bandedGridColumn5.VisibleIndex = 17;
+ this.bandedGridColumn5.Width = 82;
//
// bandedGridColumn6
//
this.bandedGridColumn6.Caption = "瑙勬牸鍨嬪彿";
this.bandedGridColumn6.FieldName = "itemModel";
- this.bandedGridColumn6.MinWidth = 25;
+ this.bandedGridColumn6.MinWidth = 22;
this.bandedGridColumn6.Name = "bandedGridColumn6";
this.bandedGridColumn6.Visible = true;
- this.bandedGridColumn6.VisibleIndex = 17;
- this.bandedGridColumn6.Width = 94;
+ this.bandedGridColumn6.VisibleIndex = 18;
+ this.bandedGridColumn6.Width = 82;
//
// gridColumn7
//
this.gridColumn7.Caption = "鍏ュ簱绫诲瀷";
this.gridColumn7.FieldName = "inType";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 22;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 18;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.VisibleIndex = 19;
+ this.gridColumn7.Width = 82;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 402);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1346, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1178, 30);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1346, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1178, 442);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -542,7 +578,8 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -553,12 +590,14 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
- this.splitMx1.Size = new System.Drawing.Size(1346, 570);
- this.splitMx1.SplitterPosition = 172;
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Size = new System.Drawing.Size(1178, 442);
+ this.splitMx1.SplitterPosition = 134;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_dcstatus);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_dptName);
this.layoutMx1.Controls.Add(this.txt_fcheckUser);
@@ -579,186 +618,208 @@
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_tldh);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem18,
+ this.layoutControlItem17});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(843, 270, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1013, 442, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1346, 172);
+ this.layoutMx1.Size = new System.Drawing.Size(1178, 134);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(1005, 102);
+ this.lbGuid.Location = new System.Drawing.Point(867, 84);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(329, 26);
+ this.lbGuid.Size = new System.Drawing.Size(282, 20);
this.lbGuid.TabIndex = 607;
this.lbGuid.Text = "lbGuid";
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(415, 72);
+ this.txt_dptName.Location = new System.Drawing.Point(357, 60);
+ this.txt_dptName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
- this.txt_dptName.Size = new System.Drawing.Size(255, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(221, 20);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 605;
this.txt_dptName.Tag = "readonly";
//
// txt_fcheckUser
//
- this.txt_fcheckUser.Location = new System.Drawing.Point(1077, 12);
+ this.txt_fcheckUser.Location = new System.Drawing.Point(927, 12);
+ this.txt_fcheckUser.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_fcheckUser.Name = "txt_fcheckUser";
this.txt_fcheckUser.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckUser.Size = new System.Drawing.Size(257, 24);
+ this.txt_fcheckUser.Size = new System.Drawing.Size(222, 20);
this.txt_fcheckUser.StyleController = this.layoutMx1;
this.txt_fcheckUser.TabIndex = 595;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1077, 42);
+ this.txt_checkDate.Location = new System.Drawing.Point(927, 36);
+ this.txt_checkDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(257, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(222, 20);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 587;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 102);
+ this.txt_itemName.Location = new System.Drawing.Point(72, 84);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(255, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(221, 20);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 599;
this.txt_itemName.Tag = "readonly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(415, 102);
+ this.txt_itemNo.Location = new System.Drawing.Point(357, 84);
+ this.txt_itemNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(255, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(221, 20);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 597;
this.txt_itemNo.Tag = "readonly";
//
// txt_scOrg
//
- this.txt_scOrg.Location = new System.Drawing.Point(415, 42);
+ this.txt_scOrg.Location = new System.Drawing.Point(357, 36);
+ this.txt_scOrg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_scOrg.Name = "txt_scOrg";
this.txt_scOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_scOrg.Size = new System.Drawing.Size(255, 24);
+ this.txt_scOrg.Size = new System.Drawing.Size(221, 20);
this.txt_scOrg.StyleController = this.layoutMx1;
this.txt_scOrg.TabIndex = 603;
this.txt_scOrg.Tag = "readonly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(84, 132);
+ this.txt_remark.Location = new System.Drawing.Point(72, 108);
+ this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(586, 24);
+ this.txt_remark.Size = new System.Drawing.Size(506, 20);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 240;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(746, 102);
+ this.txt_itemModel.Location = new System.Drawing.Point(642, 84);
+ this.txt_itemModel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(255, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(221, 20);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 601;
this.txt_itemModel.Tag = "readonly";
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(72, 12);
+ this.txt_billNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(255, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(221, 20);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
//
// txt_rkOrg
//
- this.txt_rkOrg.Location = new System.Drawing.Point(415, 12);
+ this.txt_rkOrg.Location = new System.Drawing.Point(357, 12);
+ this.txt_rkOrg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_rkOrg.Name = "txt_rkOrg";
this.txt_rkOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_rkOrg.Size = new System.Drawing.Size(255, 24);
+ this.txt_rkOrg.Size = new System.Drawing.Size(221, 20);
this.txt_rkOrg.StyleController = this.layoutMx1;
this.txt_rkOrg.TabIndex = 592;
this.txt_rkOrg.Tag = "readonly";
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(746, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(642, 12);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(255, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(221, 20);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 219;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(746, 42);
+ this.txt_createDate.Location = new System.Drawing.Point(642, 36);
+ this.txt_createDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(255, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(221, 20);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 222;
//
// txt_depotName
//
- this.txt_depotName.Location = new System.Drawing.Point(746, 72);
+ this.txt_depotName.Location = new System.Drawing.Point(642, 60);
+ this.txt_depotName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_depotName.Name = "txt_depotName";
this.txt_depotName.Properties.Appearance.Options.UseFont = true;
- this.txt_depotName.Size = new System.Drawing.Size(255, 24);
+ this.txt_depotName.Size = new System.Drawing.Size(221, 20);
this.txt_depotName.StyleController = this.layoutMx1;
this.txt_depotName.TabIndex = 593;
this.txt_depotName.Tag = "readonly";
//
// txt_cbillNo
//
- this.txt_cbillNo.Location = new System.Drawing.Point(84, 42);
+ this.txt_cbillNo.Location = new System.Drawing.Point(72, 36);
+ this.txt_cbillNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_cbillNo.Name = "txt_cbillNo";
this.txt_cbillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_cbillNo.Size = new System.Drawing.Size(255, 24);
+ this.txt_cbillNo.Size = new System.Drawing.Size(221, 20);
this.txt_cbillNo.StyleController = this.layoutMx1;
this.txt_cbillNo.TabIndex = 507;
//
// txt_workNo
//
- this.txt_workNo.Location = new System.Drawing.Point(84, 72);
+ this.txt_workNo.Location = new System.Drawing.Point(72, 60);
+ this.txt_workNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_workNo.Name = "txt_workNo";
this.txt_workNo.Properties.Appearance.Options.UseFont = true;
- this.txt_workNo.Size = new System.Drawing.Size(255, 24);
+ this.txt_workNo.Size = new System.Drawing.Size(221, 20);
this.txt_workNo.StyleController = this.layoutMx1;
this.txt_workNo.TabIndex = 243;
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(1005, 72);
+ this.txt_fstatus.Location = new System.Drawing.Point(867, 60);
+ this.txt_fstatus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_fstatus.Size = new System.Drawing.Size(329, 24);
+ this.txt_fstatus.Size = new System.Drawing.Size(282, 20);
this.txt_fstatus.StyleController = this.layoutMx1;
this.txt_fstatus.TabIndex = 606;
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(1077, 132);
+ this.txt_guid.Location = new System.Drawing.Point(927, 108);
+ this.txt_guid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(257, 24);
+ this.txt_guid.Size = new System.Drawing.Size(222, 20);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 608;
//
// txt_tldh
//
- this.txt_tldh.Location = new System.Drawing.Point(746, 132);
+ this.txt_tldh.Location = new System.Drawing.Point(642, 108);
+ this.txt_tldh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_tldh.Name = "txt_tldh";
- this.txt_tldh.Size = new System.Drawing.Size(255, 24);
+ this.txt_tldh.Size = new System.Drawing.Size(221, 20);
this.txt_tldh.StyleController = this.layoutMx1;
this.txt_tldh.TabIndex = 609;
//
@@ -767,7 +828,6 @@
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem1,
this.layoutControlItem2,
this.layoutControlItem3,
this.layoutControlItem4,
@@ -783,9 +843,9 @@
this.layoutControlItem14,
this.layoutControlItem15,
this.layoutControlItem16,
- this.layoutControlItem17,
- this.layoutControlItem18,
- this.layoutControlItem19});
+ this.layoutControlItem19,
+ this.layoutControlItem1,
+ this.layoutControlItem20});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -817,174 +877,165 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1346, 172);
+ this.Root.Size = new System.Drawing.Size(1161, 140);
this.Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_billNo;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(331, 30);
- this.layoutControlItem1.Text = "鍏ュ簱鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_rkOrg;
- this.layoutControlItem2.Location = new System.Drawing.Point(331, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(285, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem2.Size = new System.Drawing.Size(285, 24);
this.layoutControlItem2.Text = "鍏ュ簱缁勭粐";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_createBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(662, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(570, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem3.Size = new System.Drawing.Size(285, 24);
this.layoutControlItem3.Text = "鍒涘缓浜�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_createDate;
- this.layoutControlItem4.Location = new System.Drawing.Point(662, 30);
+ this.layoutControlItem4.Location = new System.Drawing.Point(570, 24);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem4.Size = new System.Drawing.Size(285, 24);
this.layoutControlItem4.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_depotName;
- this.layoutControlItem5.Location = new System.Drawing.Point(662, 60);
+ this.layoutControlItem5.Location = new System.Drawing.Point(570, 48);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem5.Size = new System.Drawing.Size(285, 24);
this.layoutControlItem5.Text = "浠撳簱鍚嶇О";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.Location = new System.Drawing.Point(662, 90);
+ this.layoutControlItem6.Location = new System.Drawing.Point(570, 72);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem6.Size = new System.Drawing.Size(285, 24);
this.layoutControlItem6.Text = "瑙勬牸鍨嬪彿";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_cbillNo;
- this.layoutControlItem7.Location = new System.Drawing.Point(0, 30);
+ this.layoutControlItem7.Location = new System.Drawing.Point(0, 24);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem7.Size = new System.Drawing.Size(285, 24);
this.layoutControlItem7.Text = "宸ュ崟鍗曞彿";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_scOrg;
- this.layoutControlItem8.Location = new System.Drawing.Point(331, 30);
+ this.layoutControlItem8.Location = new System.Drawing.Point(285, 24);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem8.Size = new System.Drawing.Size(285, 24);
this.layoutControlItem8.Text = "鐢熶骇缁勭粐";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_workNo;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 60);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 48);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem9.Size = new System.Drawing.Size(285, 24);
this.layoutControlItem9.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_dptName;
- this.layoutControlItem10.Location = new System.Drawing.Point(331, 60);
+ this.layoutControlItem10.Location = new System.Drawing.Point(285, 48);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem10.Size = new System.Drawing.Size(285, 24);
this.layoutControlItem10.Text = "鐢熶骇杞﹂棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemName;
- this.layoutControlItem11.Location = new System.Drawing.Point(0, 90);
+ this.layoutControlItem11.Location = new System.Drawing.Point(0, 72);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem11.Size = new System.Drawing.Size(285, 24);
this.layoutControlItem11.Text = "浜у搧缂栫爜";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_itemNo;
- this.layoutControlItem12.Location = new System.Drawing.Point(331, 90);
+ this.layoutControlItem12.Location = new System.Drawing.Point(285, 72);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem12.Size = new System.Drawing.Size(285, 24);
this.layoutControlItem12.Text = "浜у搧鍚嶇О";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_remark;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 120);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 96);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(662, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(570, 24);
this.layoutControlItem13.Text = "澶囨敞";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fcheckUser;
- this.layoutControlItem14.Location = new System.Drawing.Point(993, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(855, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(333, 30);
+ this.layoutControlItem14.Size = new System.Drawing.Size(286, 24);
this.layoutControlItem14.Text = "瀹℃牳浜�";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_checkDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(993, 30);
+ this.layoutControlItem15.Location = new System.Drawing.Point(855, 24);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(333, 30);
+ this.layoutControlItem15.Size = new System.Drawing.Size(286, 24);
this.layoutControlItem15.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fstatus;
- this.layoutControlItem16.Location = new System.Drawing.Point(993, 60);
+ this.layoutControlItem16.Location = new System.Drawing.Point(855, 48);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(333, 30);
+ this.layoutControlItem16.Size = new System.Drawing.Size(286, 24);
this.layoutControlItem16.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
@@ -992,11 +1043,11 @@
// layoutControlItem17
//
this.layoutControlItem17.Control = this.lbGuid;
- this.layoutControlItem17.Location = new System.Drawing.Point(993, 90);
+ this.layoutControlItem17.Location = new System.Drawing.Point(855, 72);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(333, 30);
+ this.layoutControlItem17.Size = new System.Drawing.Size(286, 24);
this.layoutControlItem17.Text = "lbGuid";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
@@ -1004,32 +1055,33 @@
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_guid;
- this.layoutControlItem18.Location = new System.Drawing.Point(993, 120);
+ this.layoutControlItem18.Location = new System.Drawing.Point(855, 96);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(333, 32);
+ this.layoutControlItem18.Size = new System.Drawing.Size(286, 24);
this.layoutControlItem18.Text = "涓婚敭Guid";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(48, 14);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_tldh;
- this.layoutControlItem19.Location = new System.Drawing.Point(662, 120);
+ this.layoutControlItem19.Location = new System.Drawing.Point(570, 96);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem19.Size = new System.Drawing.Size(285, 24);
this.layoutControlItem19.Text = "鎶曟枡鍗曞彿";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(48, 14);
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage2;
- this.tabMx.Size = new System.Drawing.Size(1346, 386);
+ this.tabMx.Size = new System.Drawing.Size(1178, 298);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage2,
@@ -1038,17 +1090,20 @@
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx1);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1344, 354);
+ this.tabMxPage2.Size = new System.Drawing.Size(1176, 272);
this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1344, 354);
+ this.gcMx1.Size = new System.Drawing.Size(1176, 272);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1064,6 +1119,7 @@
this.gvMx2unit,
this.gridColumn5,
this.gridColumn6});
+ this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1074,87 +1130,95 @@
//
this.gridColumn2.Caption = "鐗╂枡缂栧彿";
this.gridColumn2.FieldName = "itemNo";
+ this.gridColumn2.MinWidth = 17;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 0;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 82;
//
// gvMx2itemSname
//
this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О";
this.gvMx2itemSname.FieldName = "itemName";
+ this.gvMx2itemSname.MinWidth = 17;
this.gvMx2itemSname.Name = "gvMx2itemSname";
this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx2itemSname.Visible = true;
this.gvMx2itemSname.VisibleIndex = 1;
- this.gvMx2itemSname.Width = 94;
+ this.gvMx2itemSname.Width = 82;
//
// gridColumn1
//
this.gridColumn1.Caption = "鐗╂枡瑙勬牸";
this.gridColumn1.FieldName = "itemModel";
+ this.gridColumn1.MinWidth = 17;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 2;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 82;
//
// gvMx2quantity
//
this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
this.gvMx2quantity.Caption = "鏁伴噺";
this.gvMx2quantity.FieldName = "quantity";
+ this.gvMx2quantity.MinWidth = 17;
this.gvMx2quantity.Name = "gvMx2quantity";
this.gvMx2quantity.Tag = "query_a.QUANTITY";
this.gvMx2quantity.Visible = true;
this.gvMx2quantity.VisibleIndex = 3;
- this.gvMx2quantity.Width = 94;
+ this.gvMx2quantity.Width = 82;
//
// gvMx2unit
//
this.gvMx2unit.AppearanceCell.Options.UseFont = true;
this.gvMx2unit.Caption = "搴撳瓨鍗曚綅";
this.gvMx2unit.FieldName = "kcUnit";
+ this.gvMx2unit.MinWidth = 17;
this.gvMx2unit.Name = "gvMx2unit";
this.gvMx2unit.Tag = "query_a.UNIT";
this.gvMx2unit.Visible = true;
this.gvMx2unit.VisibleIndex = 4;
- this.gvMx2unit.Width = 94;
+ this.gvMx2unit.Width = 82;
//
// gridColumn5
//
this.gridColumn5.Caption = "寤虹珛鑰�";
this.gridColumn5.FieldName = "createBy";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 22;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 5;
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 82;
//
// gridColumn6
//
this.gridColumn6.Caption = "寤虹珛鏃堕棿";
this.gridColumn6.FieldName = "createDate";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 22;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 6;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 82;
//
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
+ this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1344, 354);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1176, 272);
this.xtraTabPage3.Text = "鍏ュ簱鏉＄爜";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1344, 354);
+ this.gcMx2.Size = new System.Drawing.Size(1176, 272);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1173,6 +1237,7 @@
this.gvMx1depotCode,
this.gridColumn3,
this.gridColumn4});
+ this.gvMx2.DetailHeight = 272;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1184,128 +1249,168 @@
this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx1itemBarcode.FieldName = "itemBarcode";
+ this.gvMx1itemBarcode.MinWidth = 17;
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
this.gvMx1itemBarcode.VisibleIndex = 0;
- this.gvMx1itemBarcode.Width = 250;
+ this.gvMx1itemBarcode.Width = 219;
//
// gvMx1cItemCode
//
this.gvMx1cItemCode.AppearanceCell.Options.UseFont = true;
this.gvMx1cItemCode.Caption = "鐗╂枡缂栫爜";
this.gvMx1cItemCode.FieldName = "itemNo";
+ this.gvMx1cItemCode.MinWidth = 17;
this.gvMx1cItemCode.Name = "gvMx1cItemCode";
this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
this.gvMx1cItemCode.Visible = true;
this.gvMx1cItemCode.VisibleIndex = 1;
- this.gvMx1cItemCode.Width = 100;
+ this.gvMx1cItemCode.Width = 87;
//
// gvMx1itemSname
//
this.gvMx1itemSname.AppearanceCell.Options.UseFont = true;
this.gvMx1itemSname.Caption = "鐗╂枡鍚嶇О";
this.gvMx1itemSname.FieldName = "itemName";
+ this.gvMx1itemSname.MinWidth = 17;
this.gvMx1itemSname.Name = "gvMx1itemSname";
this.gvMx1itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx1itemSname.Visible = true;
this.gvMx1itemSname.VisibleIndex = 2;
- this.gvMx1itemSname.Width = 250;
+ this.gvMx1itemSname.Width = 219;
//
// gvMx1itemNo
//
this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx1itemNo.Caption = "瑙勬牸鍨嬪彿";
this.gvMx1itemNo.FieldName = "itemModel";
+ this.gvMx1itemNo.MinWidth = 17;
this.gvMx1itemNo.Name = "gvMx1itemNo";
this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
this.gvMx1itemNo.Visible = true;
this.gvMx1itemNo.VisibleIndex = 3;
- this.gvMx1itemNo.Width = 250;
+ this.gvMx1itemNo.Width = 219;
//
// gvMx1quantity
//
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鏁伴噺";
this.gvMx1quantity.FieldName = "quantity";
+ this.gvMx1quantity.MinWidth = 17;
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.QUANTITY";
this.gvMx1quantity.Visible = true;
this.gvMx1quantity.VisibleIndex = 4;
- this.gvMx1quantity.Width = 94;
+ this.gvMx1quantity.Width = 82;
//
// gvMx1unit
//
this.gvMx1unit.AppearanceCell.Options.UseFont = true;
this.gvMx1unit.Caption = "搴撳瓨鍗曚綅";
this.gvMx1unit.FieldName = "kcUnit";
+ this.gvMx1unit.MinWidth = 17;
this.gvMx1unit.Name = "gvMx1unit";
this.gvMx1unit.Tag = "query_a.UNIT";
this.gvMx1unit.Visible = true;
this.gvMx1unit.VisibleIndex = 5;
- this.gvMx1unit.Width = 94;
+ this.gvMx1unit.Width = 82;
//
// gvMx1depotSectionCode
//
this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜";
this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
+ this.gvMx1depotSectionCode.MinWidth = 17;
this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
this.gvMx1depotSectionCode.Visible = true;
this.gvMx1depotSectionCode.VisibleIndex = 6;
- this.gvMx1depotSectionCode.Width = 94;
+ this.gvMx1depotSectionCode.Width = 82;
//
// gvMx1depotCode
//
this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
this.gvMx1depotCode.Caption = "浠撳簱缂栫爜";
this.gvMx1depotCode.FieldName = "depotCode";
+ this.gvMx1depotCode.MinWidth = 17;
this.gvMx1depotCode.Name = "gvMx1depotCode";
this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
this.gvMx1depotCode.Visible = true;
this.gvMx1depotCode.VisibleIndex = 7;
- this.gvMx1depotCode.Width = 94;
+ this.gvMx1depotCode.Width = 82;
//
// gridColumn3
//
this.gridColumn3.Caption = "寤虹珛鑰�";
this.gridColumn3.FieldName = "createBy";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 22;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 8;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 82;
//
// gridColumn4
//
this.gridColumn4.Caption = "寤虹珛鏃堕棿";
this.gridColumn4.FieldName = "createDate";
- this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.MinWidth = 22;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 9;
- this.gridColumn4.Width = 94;
+ this.gridColumn4.Width = 82;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(961, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(841, 43);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(88, 39);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // txt_dcstatus
+ //
+ this.txt_dcstatus.Location = new System.Drawing.Point(867, 84);
+ this.txt_dcstatus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_dcstatus.Name = "txt_dcstatus";
+ this.txt_dcstatus.Properties.Caption = "鍊掑啿鏍囪瘑";
+ this.txt_dcstatus.Size = new System.Drawing.Size(282, 20);
+ this.txt_dcstatus.StyleController = this.layoutMx1;
+ this.txt_dcstatus.TabIndex = 610;
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_billNo;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(285, 24);
+ this.layoutControlItem1.Text = "鍏ュ簱鍗曞彿";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14);
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_dcstatus;
+ this.layoutControlItem20.Location = new System.Drawing.Point(855, 72);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem20.Size = new System.Drawing.Size(286, 24);
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem20.TextVisible = false;
+ //
// Frm_MesScrkDj
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1348, 682);
+ this.ClientSize = new System.Drawing.Size(1180, 530);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "Frm_MesScrkDj";
this.Text = "浜у搧鍏ュ簱鍗�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1346,7 +1451,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tldh.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -1374,6 +1478,9 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dcstatus.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
this.ResumeLayout(false);
}
@@ -1404,7 +1511,6 @@
private DevExpress.XtraEditors.TextEdit txt_billNo;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
@@ -1473,5 +1579,9 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_dcstatus;
+ private DevExpress.XtraEditors.CheckEdit txt_dcstatus;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
index 18a3f5e..3a17f65 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesScrkDj.cs
@@ -10,7 +10,7 @@
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
-{
+{
public partial class Frm_MesScrkDj : DevExpress.XtraEditors.XtraForm
{
string _webServiceName = "MesScrkDjManager/";
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 806bba5..2132525 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -142,8 +142,6 @@
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -285,6 +283,8 @@
this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -338,8 +338,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
@@ -437,6 +435,8 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
this.xtraTabPage5.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -1171,7 +1171,7 @@
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(447, 36);
+ this.txt_dptName.Location = new System.Drawing.Point(447, 60);
this.txt_dptName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
@@ -1277,7 +1277,7 @@
//
// txt_dptNo
//
- this.txt_dptNo.Location = new System.Drawing.Point(447, 60);
+ this.txt_dptNo.Location = new System.Drawing.Point(447, 36);
this.txt_dptNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_dptNo.Name = "txt_dptNo";
this.txt_dptNo.Size = new System.Drawing.Size(264, 20);
@@ -1341,8 +1341,6 @@
this.layoutControlItem11,
this.layoutControlItem6,
this.layoutControlItem14,
- this.layoutControlItem20,
- this.layoutControlItem41,
this.layoutControlItem15,
this.layoutControlItem4,
this.layoutControlItem8,
@@ -1354,7 +1352,9 @@
this.layoutControlItem19,
this.layoutControlItem17,
this.layoutControlItem28,
- this.layoutControlItem46});
+ this.layoutControlItem46,
+ this.layoutControlItem20,
+ this.layoutControlItem41});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1463,28 +1463,6 @@
this.layoutControlItem14.Size = new System.Drawing.Size(352, 24);
this.layoutControlItem14.Text = "鐢熶骇绾垮埆";
this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
- //
- // layoutControlItem20
- //
- this.layoutControlItem20.Control = this.txt_dptName;
- this.layoutControlItem20.Location = new System.Drawing.Point(351, 24);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem20.Size = new System.Drawing.Size(352, 24);
- this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14);
- //
- // layoutControlItem41
- //
- this.layoutControlItem41.Control = this.txt_dptNo;
- this.layoutControlItem41.Location = new System.Drawing.Point(351, 48);
- this.layoutControlItem41.Name = "layoutControlItem41";
- this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem41.Size = new System.Drawing.Size(352, 24);
- this.layoutControlItem41.Text = "杞﹂棿缂栫爜";
- this.layoutControlItem41.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem15
//
@@ -3263,6 +3241,29 @@
this.ucBtnPrint101.Size = new System.Drawing.Size(203, 25);
this.ucBtnPrint101.TabIndex = 0;
//
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_dptName;
+ this.layoutControlItem20.Location = new System.Drawing.Point(351, 48);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem20.Size = new System.Drawing.Size(352, 24);
+ this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem41
+ //
+ this.layoutControlItem41.Control = this.txt_dptNo;
+ this.layoutControlItem41.CustomizationFormText = "浠诲姟鍗曞崟鍙�";
+ this.layoutControlItem41.Location = new System.Drawing.Point(351, 24);
+ this.layoutControlItem41.Name = "layoutControlItem41";
+ this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem41.Size = new System.Drawing.Size(352, 24);
+ this.layoutControlItem41.Text = "浠诲姟鍗曞崟鍙�";
+ this.layoutControlItem41.TextSize = new System.Drawing.Size(72, 14);
+ //
// Frm_Womdaa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -3326,8 +3327,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
@@ -3425,6 +3424,8 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
this.xtraTabPage5.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
this.ResumeLayout(false);
}
@@ -3616,8 +3617,6 @@
private DevExpress.XtraEditors.TextEdit txt_lineNo;
private DevExpress.XtraEditors.TextEdit txt_dptNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
@@ -3650,5 +3649,7 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx100;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WompbaGx.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WompbaGx.Designer.cs
index dde28cd..a533d09 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WompbaGx.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WompbaGx.Designer.cs
@@ -190,9 +190,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(987, 62);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -200,10 +201,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(987, 468);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -212,8 +214,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(985, 442);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -222,6 +225,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -234,17 +238,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.Size = new System.Drawing.Size(985, 442);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 4;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.Size = new System.Drawing.Size(985, 402);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -254,7 +260,7 @@
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.ColumnPanelRowHeight = 39;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_fstatus,
this.gridColumn4,
@@ -266,8 +272,9 @@
this.gv_pba006,
this.gv_pba009,
this.gridColumn5});
+ this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 44;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -278,130 +285,138 @@
this.gv_fstatus.AppearanceCell.Options.UseFont = true;
this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
this.gv_fstatus.FieldName = "fstatus";
- this.gv_fstatus.MaxWidth = 50;
- this.gv_fstatus.MinWidth = 50;
+ this.gv_fstatus.MaxWidth = 44;
+ this.gv_fstatus.MinWidth = 44;
this.gv_fstatus.Name = "gv_fstatus";
this.gv_fstatus.OptionsColumn.AllowEdit = false;
this.gv_fstatus.Tag = "query_a.fstatus";
this.gv_fstatus.Visible = true;
this.gv_fstatus.VisibleIndex = 0;
- this.gv_fstatus.Width = 50;
+ this.gv_fstatus.Width = 44;
//
// gridColumn4
//
this.gridColumn4.Caption = "鐢熶骇缁勭粐";
this.gridColumn4.FieldName = "fSubsidiary";
+ this.gridColumn4.MinWidth = 17;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Tag = "org.fnamber";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 1;
- this.gridColumn4.Width = 250;
+ this.gridColumn4.Width = 219;
//
// gridColumn1
//
this.gridColumn1.Caption = "杞﹂棿鍚嶇О";
this.gridColumn1.FieldName = "dptName";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 22;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 2;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 82;
//
// gridColumn2
//
this.gridColumn2.Caption = "鎺掍骇鍗曞彿";
this.gridColumn2.FieldName = "hNo";
+ this.gridColumn2.MinWidth = 17;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 3;
- this.gridColumn2.Width = 150;
+ this.gridColumn2.Width = 131;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜�";
this.gv_checkUser.FieldName = "checkUser";
+ this.gv_checkUser.MinWidth = 17;
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
this.gv_checkUser.VisibleIndex = 4;
- this.gv_checkUser.Width = 94;
+ this.gv_checkUser.Width = 82;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡";
this.gv_checkDate.FieldName = "checkDate";
+ this.gv_checkDate.MinWidth = 17;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
this.gv_checkDate.VisibleIndex = 5;
- this.gv_checkDate.Width = 180;
+ this.gv_checkDate.Width = 157;
//
// gv_pba005
//
this.gv_pba005.AppearanceCell.Options.UseFont = true;
this.gv_pba005.Caption = "鍒涘缓浜�";
this.gv_pba005.FieldName = "pba005";
+ this.gv_pba005.MinWidth = 17;
this.gv_pba005.Name = "gv_pba005";
this.gv_pba005.OptionsColumn.AllowEdit = false;
this.gv_pba005.Tag = "query_a.pba005";
this.gv_pba005.Visible = true;
this.gv_pba005.VisibleIndex = 6;
- this.gv_pba005.Width = 94;
+ this.gv_pba005.Width = 82;
//
// gv_pba006
//
this.gv_pba006.AppearanceCell.Options.UseFont = true;
this.gv_pba006.Caption = "鍒涘缓鏃堕棿";
this.gv_pba006.FieldName = "pba006";
+ this.gv_pba006.MinWidth = 17;
this.gv_pba006.Name = "gv_pba006";
this.gv_pba006.OptionsColumn.AllowEdit = false;
this.gv_pba006.Tag = "query_a.pba006";
this.gv_pba006.Visible = true;
this.gv_pba006.VisibleIndex = 7;
- this.gv_pba006.Width = 180;
+ this.gv_pba006.Width = 157;
//
// gv_pba009
//
this.gv_pba009.AppearanceCell.Options.UseFont = true;
this.gv_pba009.Caption = "澶囨敞";
this.gv_pba009.FieldName = "pba009";
+ this.gv_pba009.MinWidth = 17;
this.gv_pba009.Name = "gv_pba009";
this.gv_pba009.OptionsColumn.AllowEdit = false;
this.gv_pba009.Tag = "query_a.pba009";
this.gv_pba009.Visible = true;
this.gv_pba009.VisibleIndex = 8;
- this.gv_pba009.Width = 100;
+ this.gv_pba009.Width = 87;
//
// gridColumn5
//
this.gridColumn5.Caption = "涓婚敭GUID";
this.gridColumn5.FieldName = "guid";
- this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.MinWidth = 22;
this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Width = 94;
+ this.gridColumn5.Width = 82;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 402);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(985, 30);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(985, 442);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -409,6 +424,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -421,8 +437,8 @@
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(1126, 570);
- this.splitMx1.SplitterPosition = 107;
+ this.splitMx1.Size = new System.Drawing.Size(985, 442);
+ this.splitMx1.SplitterPosition = 83;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -440,18 +456,19 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem9});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(816, 394, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 107);
+ this.layoutMx1.Size = new System.Drawing.Size(985, 83);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(840, 99);
+ this.lbGuid.Location = new System.Drawing.Point(735, 77);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(274, 40);
+ this.lbGuid.Size = new System.Drawing.Size(240, 31);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
@@ -459,9 +476,10 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 74);
+ this.btnSelect.Location = new System.Drawing.Point(11, 58);
+ this.btnSelect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(101, 27);
+ this.btnSelect.Size = new System.Drawing.Size(88, 20);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 456;
this.btnSelect.Text = "閫夊彇鎶曟枡鍗�";
@@ -469,64 +487,71 @@
// txt_pba013
//
this.txt_pba013.IsReadly = false;
- this.txt_pba013.Location = new System.Drawing.Point(89, 43);
+ this.txt_pba013.Location = new System.Drawing.Point(73, 34);
+ this.txt_pba013.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_pba013.Name = "txt_pba013";
- this.txt_pba013.Size = new System.Drawing.Size(190, 24);
+ this.txt_pba013.Size = new System.Drawing.Size(171, 20);
this.txt_pba013.TabIndex = 459;
//
// txt_erpSczz
//
this.txt_erpSczz.IsReadly = false;
- this.txt_erpSczz.Location = new System.Drawing.Point(89, 12);
+ this.txt_erpSczz.Location = new System.Drawing.Point(73, 10);
+ this.txt_erpSczz.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_erpSczz.Name = "txt_erpSczz";
- this.txt_erpSczz.Size = new System.Drawing.Size(190, 24);
+ this.txt_erpSczz.Size = new System.Drawing.Size(171, 20);
this.txt_erpSczz.TabIndex = 460;
//
// txt_hNo
//
- this.txt_hNo.Location = new System.Drawing.Point(360, 12);
+ this.txt_hNo.Location = new System.Drawing.Point(310, 10);
+ this.txt_hNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_hNo.Name = "txt_hNo";
this.txt_hNo.Properties.Appearance.Options.UseFont = true;
- this.txt_hNo.Size = new System.Drawing.Size(190, 24);
+ this.txt_hNo.Size = new System.Drawing.Size(171, 20);
this.txt_hNo.StyleController = this.layoutMx1;
this.txt_hNo.TabIndex = 458;
this.txt_hNo.Tag = "readonly";
//
// txt_pba009
//
- this.txt_pba009.Location = new System.Drawing.Point(360, 43);
+ this.txt_pba009.Location = new System.Drawing.Point(310, 34);
+ this.txt_pba009.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_pba009.Name = "txt_pba009";
this.txt_pba009.Properties.Appearance.Options.UseFont = true;
- this.txt_pba009.Size = new System.Drawing.Size(461, 24);
+ this.txt_pba009.Size = new System.Drawing.Size(408, 20);
this.txt_pba009.StyleController = this.layoutMx1;
this.txt_pba009.TabIndex = 240;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(902, 12);
+ this.txt_checkUser.Location = new System.Drawing.Point(784, 10);
+ this.txt_checkUser.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(191, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(173, 20);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 273;
this.txt_checkUser.Tag = "readonly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(631, 12);
+ this.txt_checkDate.Location = new System.Drawing.Point(547, 10);
+ this.txt_checkDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(190, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(171, 20);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 267;
this.txt_checkDate.Tag = "readonly";
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(825, 43);
+ this.txt_fstatus.Location = new System.Drawing.Point(722, 34);
+ this.txt_fstatus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_fstatus.Size = new System.Drawing.Size(268, 24);
+ this.txt_fstatus.Size = new System.Drawing.Size(235, 20);
this.txt_fstatus.StyleController = this.layoutMx1;
this.txt_fstatus.TabIndex = 461;
this.txt_fstatus.Tag = "readonly";
@@ -581,7 +606,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1105, 113);
+ this.Root.Size = new System.Drawing.Size(968, 88);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -589,58 +614,58 @@
this.layoutControlItem1.Control = this.txt_erpSczz;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem1.Text = "鐢熶骇缁勭粐";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(52, 14);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_hNo;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(237, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem2.Text = "鎺掍骇缂栧彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(52, 14);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_checkDate;
- this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(474, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem3.Text = "瀹℃牳鏃ユ湡 ";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(52, 14);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_pba013;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 24);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem4.Text = "宸ヤ綔杞﹂棿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(52, 14);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_checkUser;
- this.layoutControlItem5.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(711, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(239, 24);
this.layoutControlItem5.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(52, 14);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fstatus;
- this.layoutControlItem6.Location = new System.Drawing.Point(813, 31);
+ this.layoutControlItem6.Location = new System.Drawing.Point(711, 24);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(239, 24);
this.layoutControlItem6.Text = "瀹℃牳鐘舵��";
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
@@ -648,24 +673,24 @@
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_pba009;
- this.layoutControlItem7.Location = new System.Drawing.Point(271, 31);
+ this.layoutControlItem7.Location = new System.Drawing.Point(237, 24);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(474, 24);
this.layoutControlItem7.Text = "鎺掍骇澶囨敞";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(52, 14);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.btnSelect;
- this.layoutControlItem8.Location = new System.Drawing.Point(0, 62);
- this.layoutControlItem8.MaxSize = new System.Drawing.Size(105, 31);
- this.layoutControlItem8.MinSize = new System.Drawing.Size(105, 31);
+ this.layoutControlItem8.Location = new System.Drawing.Point(0, 48);
+ this.layoutControlItem8.MaxSize = new System.Drawing.Size(92, 24);
+ this.layoutControlItem8.MinSize = new System.Drawing.Size(92, 24);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(237, 24);
this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem8.Text = "閫夋嫨鎶曟枡鍗�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
@@ -675,9 +700,10 @@
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 451);
+ this.tabMx.Size = new System.Drawing.Size(985, 349);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -685,15 +711,18 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 419);
+ this.tabMxPage1.Size = new System.Drawing.Size(983, 323);
this.tabMxPage1.Text = "浠诲姟鍗曟槑缁�";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemDateEdit1,
@@ -702,7 +731,7 @@
this.rptJYBZ,
this.repositoryItemDateEdit3,
this.repSCGX});
- this.gcMx1.Size = new System.Drawing.Size(1124, 419);
+ this.gcMx1.Size = new System.Drawing.Size(983, 323);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -711,7 +740,7 @@
//
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx1.ColumnPanelRowHeight = 50;
+ this.gvMx1.ColumnPanelRowHeight = 39;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.caaGuid,
@@ -749,6 +778,7 @@
this.gridColumn6,
this.gvMxDel,
this.gridColumn7});
+ this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -760,85 +790,85 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "鏄庣粏Guid";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
+ this.gvMx1guid.MinWidth = 44;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
+ this.gvMx1guid.Width = 82;
//
// caaGuid
//
this.caaGuid.Caption = "caaGuid";
this.caaGuid.FieldName = "caaGuid";
- this.caaGuid.MinWidth = 25;
+ this.caaGuid.MinWidth = 22;
this.caaGuid.Name = "caaGuid";
this.caaGuid.OptionsColumn.ReadOnly = true;
- this.caaGuid.Width = 94;
+ this.caaGuid.Width = 82;
//
// gvMx1daa002
//
this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
this.gvMx1daa002.Caption = "宸ュ崟鍗曞彿";
this.gvMx1daa002.FieldName = "daa001";
- this.gvMx1daa002.MinWidth = 50;
+ this.gvMx1daa002.MinWidth = 44;
this.gvMx1daa002.Name = "gvMx1daa002";
this.gvMx1daa002.OptionsColumn.ReadOnly = true;
this.gvMx1daa002.Tag = "query_a.daa002";
this.gvMx1daa002.Visible = true;
this.gvMx1daa002.VisibleIndex = 0;
- this.gvMx1daa002.Width = 50;
+ this.gvMx1daa002.Width = 44;
//
// gvMx1daa010
//
this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
this.gvMx1daa010.Caption = "浠诲姟鍗曞彿";
this.gvMx1daa010.FieldName = "daa021";
- this.gvMx1daa010.MinWidth = 50;
+ this.gvMx1daa010.MinWidth = 44;
this.gvMx1daa010.Name = "gvMx1daa010";
this.gvMx1daa010.OptionsColumn.ReadOnly = true;
this.gvMx1daa010.Tag = "query_a.daa010";
this.gvMx1daa010.Visible = true;
this.gvMx1daa010.VisibleIndex = 1;
- this.gvMx1daa010.Width = 50;
+ this.gvMx1daa010.Width = 44;
//
// gvMx1daa005
//
this.gvMx1daa005.AppearanceCell.Options.UseFont = true;
this.gvMx1daa005.Caption = "鐗╂枡缂栫爜";
this.gvMx1daa005.FieldName = "itemNo";
- this.gvMx1daa005.MinWidth = 50;
+ this.gvMx1daa005.MinWidth = 44;
this.gvMx1daa005.Name = "gvMx1daa005";
this.gvMx1daa005.OptionsColumn.ReadOnly = true;
this.gvMx1daa005.Tag = "query_a.daa005";
this.gvMx1daa005.Visible = true;
this.gvMx1daa005.VisibleIndex = 2;
- this.gvMx1daa005.Width = 50;
+ this.gvMx1daa005.Width = 44;
//
// gvMx1daa003
//
this.gvMx1daa003.AppearanceCell.Options.UseFont = true;
this.gvMx1daa003.Caption = "浜у搧鍚嶇О";
this.gvMx1daa003.FieldName = "daa003";
- this.gvMx1daa003.MinWidth = 50;
+ this.gvMx1daa003.MinWidth = 44;
this.gvMx1daa003.Name = "gvMx1daa003";
this.gvMx1daa003.OptionsColumn.ReadOnly = true;
this.gvMx1daa003.Tag = "query_a.daa003";
this.gvMx1daa003.Visible = true;
this.gvMx1daa003.VisibleIndex = 3;
- this.gvMx1daa003.Width = 50;
+ this.gvMx1daa003.Width = 44;
//
// gvMx1daa004
//
this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
this.gvMx1daa004.Caption = "浜у搧瑙勬牸";
this.gvMx1daa004.FieldName = "daa004";
- this.gvMx1daa004.MinWidth = 50;
+ this.gvMx1daa004.MinWidth = 44;
this.gvMx1daa004.Name = "gvMx1daa004";
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
this.gvMx1daa004.Tag = "query_a.daa004";
this.gvMx1daa004.Visible = true;
this.gvMx1daa004.VisibleIndex = 4;
- this.gvMx1daa004.Width = 50;
+ this.gvMx1daa004.Width = 44;
//
// gvMx1daa016
//
@@ -850,12 +880,12 @@
this.gvMx1daa016.Caption = "棰勮寮�宸ユ棩鏃堕棿";
this.gvMx1daa016.ColumnEdit = this.repositoryItemDateEdit2;
this.gvMx1daa016.FieldName = "mesStartProd";
- this.gvMx1daa016.MinWidth = 50;
+ this.gvMx1daa016.MinWidth = 44;
this.gvMx1daa016.Name = "gvMx1daa016";
this.gvMx1daa016.Tag = "edit";
this.gvMx1daa016.Visible = true;
this.gvMx1daa016.VisibleIndex = 5;
- this.gvMx1daa016.Width = 61;
+ this.gvMx1daa016.Width = 53;
//
// repositoryItemDateEdit2
//
@@ -876,12 +906,12 @@
this.gvMx1daa018.Caption = "棰勮瀹屽伐鏃堕棿";
this.gvMx1daa018.ColumnEdit = this.repositoryItemDateEdit3;
this.gvMx1daa018.FieldName = "mesEndProd";
- this.gvMx1daa018.MinWidth = 50;
+ this.gvMx1daa018.MinWidth = 44;
this.gvMx1daa018.Name = "gvMx1daa018";
this.gvMx1daa018.Tag = "edit";
this.gvMx1daa018.Visible = true;
this.gvMx1daa018.VisibleIndex = 6;
- this.gvMx1daa018.Width = 50;
+ this.gvMx1daa018.Width = 44;
//
// repositoryItemDateEdit3
//
@@ -897,56 +927,56 @@
this.gvMx1daa008.AppearanceCell.Options.UseFont = true;
this.gvMx1daa008.Caption = "宸ュ崟鎬绘暟";
this.gvMx1daa008.FieldName = "caa012";
- this.gvMx1daa008.MaxWidth = 50;
- this.gvMx1daa008.MinWidth = 50;
+ this.gvMx1daa008.MaxWidth = 44;
+ this.gvMx1daa008.MinWidth = 44;
this.gvMx1daa008.Name = "gvMx1daa008";
this.gvMx1daa008.OptionsColumn.ReadOnly = true;
this.gvMx1daa008.Tag = "query_a.daa008";
this.gvMx1daa008.Visible = true;
this.gvMx1daa008.VisibleIndex = 7;
- this.gvMx1daa008.Width = 50;
+ this.gvMx1daa008.Width = 44;
//
// gvMx1daa006
//
this.gvMx1daa006.AppearanceCell.Options.UseFont = true;
this.gvMx1daa006.Caption = "鍗曚綅";
this.gvMx1daa006.FieldName = "fname";
- this.gvMx1daa006.MaxWidth = 50;
- this.gvMx1daa006.MinWidth = 50;
+ this.gvMx1daa006.MaxWidth = 44;
+ this.gvMx1daa006.MinWidth = 44;
this.gvMx1daa006.Name = "gvMx1daa006";
this.gvMx1daa006.OptionsColumn.ReadOnly = true;
this.gvMx1daa006.Tag = "query_a.daa006";
this.gvMx1daa006.Visible = true;
this.gvMx1daa006.VisibleIndex = 8;
- this.gvMx1daa006.Width = 50;
+ this.gvMx1daa006.Width = 44;
//
// gvMx1daa007
//
this.gvMx1daa007.AppearanceCell.Options.UseFont = true;
this.gvMx1daa007.Caption = "宸叉帓";
this.gvMx1daa007.FieldName = "yp";
- this.gvMx1daa007.MaxWidth = 50;
- this.gvMx1daa007.MinWidth = 50;
+ this.gvMx1daa007.MaxWidth = 44;
+ this.gvMx1daa007.MinWidth = 44;
this.gvMx1daa007.Name = "gvMx1daa007";
this.gvMx1daa007.OptionsColumn.ReadOnly = true;
this.gvMx1daa007.Tag = "query_a.daa007";
this.gvMx1daa007.Visible = true;
this.gvMx1daa007.VisibleIndex = 9;
- this.gvMx1daa007.Width = 50;
+ this.gvMx1daa007.Width = 44;
//
// gvMx1daa009
//
this.gvMx1daa009.AppearanceCell.Options.UseFont = true;
this.gvMx1daa009.Caption = "鏈帓";
this.gvMx1daa009.FieldName = "wp";
- this.gvMx1daa009.MaxWidth = 50;
- this.gvMx1daa009.MinWidth = 50;
+ this.gvMx1daa009.MaxWidth = 44;
+ this.gvMx1daa009.MinWidth = 44;
this.gvMx1daa009.Name = "gvMx1daa009";
this.gvMx1daa009.OptionsColumn.ReadOnly = true;
this.gvMx1daa009.Tag = "query_a.daa009";
this.gvMx1daa009.Visible = true;
this.gvMx1daa009.VisibleIndex = 10;
- this.gvMx1daa009.Width = 50;
+ this.gvMx1daa009.Width = 44;
//
// gvMx1daa011
//
@@ -957,13 +987,13 @@
this.gvMx1daa011.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1daa011.Caption = "鏈鎺掓暟閲�";
this.gvMx1daa011.FieldName = "daa008";
- this.gvMx1daa011.MaxWidth = 50;
- this.gvMx1daa011.MinWidth = 60;
+ this.gvMx1daa011.MaxWidth = 44;
+ this.gvMx1daa011.MinWidth = 52;
this.gvMx1daa011.Name = "gvMx1daa011";
this.gvMx1daa011.Tag = "yz_quantity_0_edit";
this.gvMx1daa011.Visible = true;
this.gvMx1daa011.VisibleIndex = 11;
- this.gvMx1daa011.Width = 60;
+ this.gvMx1daa011.Width = 52;
//
// gvMx1daa012
//
@@ -975,12 +1005,12 @@
this.gvMx1daa012.Caption = "绾垮埆缂栫爜";
this.gvMx1daa012.ColumnEdit = this.rptJYBZ;
this.gvMx1daa012.FieldName = "daa015LineName";
- this.gvMx1daa012.MinWidth = 150;
+ this.gvMx1daa012.MinWidth = 131;
this.gvMx1daa012.Name = "gvMx1daa012";
this.gvMx1daa012.Tag = "edit";
this.gvMx1daa012.Visible = true;
this.gvMx1daa012.VisibleIndex = 12;
- this.gvMx1daa012.Width = 150;
+ this.gvMx1daa012.Width = 131;
//
// rptJYBZ
//
@@ -1002,10 +1032,9 @@
this.gvMx1daa030.Caption = "鐢熶骇宸ュ簭";
this.gvMx1daa030.ColumnEdit = this.repSCGX;
this.gvMx1daa030.FieldName = "daa030ProcName";
- this.gvMx1daa030.MinWidth = 150;
+ this.gvMx1daa030.MinWidth = 131;
this.gvMx1daa030.Name = "gvMx1daa030";
- this.gvMx1daa030.Visible = false;
- this.gvMx1daa030.Width = 150;
+ this.gvMx1daa030.Width = 131;
//
// repSCGX
//
@@ -1025,12 +1054,12 @@
this.gvMx1reporttime.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1reporttime.Caption = "澶囨敞";
this.gvMx1reporttime.FieldName = "daa009";
- this.gvMx1reporttime.MinWidth = 50;
+ this.gvMx1reporttime.MinWidth = 44;
this.gvMx1reporttime.Name = "gvMx1reporttime";
this.gvMx1reporttime.Tag = "edit";
this.gvMx1reporttime.Visible = true;
this.gvMx1reporttime.VisibleIndex = 13;
- this.gvMx1reporttime.Width = 80;
+ this.gvMx1reporttime.Width = 70;
//
// gvMx1daa017
//
@@ -1041,109 +1070,109 @@
this.gvMx1daa017.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1daa017.Caption = "璁″垝浜烘暟";
this.gvMx1daa017.FieldName = "planPersonnel";
- this.gvMx1daa017.MinWidth = 50;
+ this.gvMx1daa017.MinWidth = 44;
this.gvMx1daa017.Name = "gvMx1daa017";
this.gvMx1daa017.Tag = "yz_quantity_0";
- this.gvMx1daa017.Width = 50;
+ this.gvMx1daa017.Width = 44;
//
// gvMx1daa019
//
this.gvMx1daa019.AppearanceCell.Options.UseFont = true;
this.gvMx1daa019.Caption = "鎺掍骇鏃ユ湡";
this.gvMx1daa019.FieldName = "daa024";
- this.gvMx1daa019.MinWidth = 50;
+ this.gvMx1daa019.MinWidth = 44;
this.gvMx1daa019.Name = "gvMx1daa019";
this.gvMx1daa019.OptionsColumn.ReadOnly = true;
this.gvMx1daa019.Tag = "query_a.daa019";
- this.gvMx1daa019.Width = 50;
+ this.gvMx1daa019.Width = 44;
//
// gvMx1checkDate
//
this.gvMx1checkDate.AppearanceCell.Options.UseFont = true;
this.gvMx1checkDate.Caption = "绾夸綋绫诲埆";
this.gvMx1checkDate.FieldName = "lineType";
- this.gvMx1checkDate.MinWidth = 50;
+ this.gvMx1checkDate.MinWidth = 44;
this.gvMx1checkDate.Name = "gvMx1checkDate";
this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
this.gvMx1checkDate.Tag = "query_a.check_date";
- this.gvMx1checkDate.Width = 50;
+ this.gvMx1checkDate.Width = 44;
//
// gvMx1checkUser
//
this.gvMx1checkUser.AppearanceCell.Options.UseFont = true;
this.gvMx1checkUser.Caption = "鏍囧噯浜烘暟";
this.gvMx1checkUser.FieldName = "personnel";
- this.gvMx1checkUser.MinWidth = 50;
+ this.gvMx1checkUser.MinWidth = 44;
this.gvMx1checkUser.Name = "gvMx1checkUser";
this.gvMx1checkUser.OptionsColumn.ReadOnly = true;
this.gvMx1checkUser.Tag = "query_a.check_user";
- this.gvMx1checkUser.Width = 50;
+ this.gvMx1checkUser.Width = 44;
//
// gvMx1daa020
//
this.gvMx1daa020.AppearanceCell.Options.UseFont = true;
this.gvMx1daa020.Caption = "鏍囧噯宸ユ椂";
this.gvMx1daa020.FieldName = "prodHour";
- this.gvMx1daa020.MinWidth = 50;
+ this.gvMx1daa020.MinWidth = 44;
this.gvMx1daa020.Name = "gvMx1daa020";
this.gvMx1daa020.OptionsColumn.ReadOnly = true;
this.gvMx1daa020.Tag = "query_a.daa020";
- this.gvMx1daa020.Width = 50;
+ this.gvMx1daa020.Width = 44;
//
// gvMx1daa021
//
this.gvMx1daa021.AppearanceCell.Options.UseFont = true;
this.gvMx1daa021.Caption = "鍗曚汉灏忔椂浜ц兘";
this.gvMx1daa021.FieldName = "personHourCapactity";
- this.gvMx1daa021.MinWidth = 50;
+ this.gvMx1daa021.MinWidth = 44;
this.gvMx1daa021.Name = "gvMx1daa021";
this.gvMx1daa021.OptionsColumn.ReadOnly = true;
this.gvMx1daa021.Tag = "query_a.daa021";
- this.gvMx1daa021.Width = 50;
+ this.gvMx1daa021.Width = 44;
//
// gvMx1daa022
//
this.gvMx1daa022.AppearanceCell.Options.UseFont = true;
this.gvMx1daa022.Caption = "鐞嗚鏍囦骇";
this.gvMx1daa022.FieldName = "theCapactity";
- this.gvMx1daa022.MinWidth = 50;
+ this.gvMx1daa022.MinWidth = 44;
this.gvMx1daa022.Name = "gvMx1daa022";
this.gvMx1daa022.OptionsColumn.ReadOnly = true;
this.gvMx1daa022.Tag = "query_a.daa022";
- this.gvMx1daa022.Width = 50;
+ this.gvMx1daa022.Width = 44;
//
// gvMx1daa023
//
this.gvMx1daa023.AppearanceCell.Options.UseFont = true;
this.gvMx1daa023.Caption = "璁″垝鏍囧噯浜ц兘";
this.gvMx1daa023.FieldName = "planCapactity";
- this.gvMx1daa023.MinWidth = 50;
+ this.gvMx1daa023.MinWidth = 44;
this.gvMx1daa023.Name = "gvMx1daa023";
this.gvMx1daa023.OptionsColumn.ReadOnly = true;
this.gvMx1daa023.Tag = "query_a.daa023";
- this.gvMx1daa023.Width = 50;
+ this.gvMx1daa023.Width = 44;
//
// gvMx1daa024
//
this.gvMx1daa024.AppearanceCell.Options.UseFont = true;
this.gvMx1daa024.Caption = "鍒嗛挓";
this.gvMx1daa024.FieldName = "theMin";
- this.gvMx1daa024.MinWidth = 50;
+ this.gvMx1daa024.MinWidth = 44;
this.gvMx1daa024.Name = "gvMx1daa024";
this.gvMx1daa024.OptionsColumn.ReadOnly = true;
this.gvMx1daa024.Tag = "query_a.daa024";
- this.gvMx1daa024.Width = 50;
+ this.gvMx1daa024.Width = 44;
//
// gvMx1daa025
//
this.gvMx1daa025.AppearanceCell.Options.UseFont = true;
this.gvMx1daa025.Caption = "灏忔椂";
this.gvMx1daa025.FieldName = "theHour";
- this.gvMx1daa025.MinWidth = 50;
+ this.gvMx1daa025.MinWidth = 44;
this.gvMx1daa025.Name = "gvMx1daa025";
this.gvMx1daa025.OptionsColumn.ReadOnly = true;
this.gvMx1daa025.Tag = "query_a.daa025";
- this.gvMx1daa025.Width = 50;
+ this.gvMx1daa025.Width = 44;
//
// gvMx1daa026
//
@@ -1154,10 +1183,10 @@
this.gvMx1daa026.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1daa026.Caption = "鎹㈢嚎鏃堕棿";
this.gvMx1daa026.FieldName = "changeLineTime";
- this.gvMx1daa026.MinWidth = 50;
+ this.gvMx1daa026.MinWidth = 44;
this.gvMx1daa026.Name = "gvMx1daa026";
this.gvMx1daa026.Tag = "yz_quantity_0";
- this.gvMx1daa026.Width = 50;
+ this.gvMx1daa026.Width = 44;
//
// gvMx1isReportcheck
//
@@ -1168,24 +1197,24 @@
this.gvMx1isReportcheck.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1isReportcheck.Caption = "浼戞伅鏃堕棿";
this.gvMx1isReportcheck.FieldName = "restTime";
- this.gvMx1isReportcheck.MinWidth = 50;
+ this.gvMx1isReportcheck.MinWidth = 44;
this.gvMx1isReportcheck.Name = "gvMx1isReportcheck";
this.gvMx1isReportcheck.OptionsColumn.ReadOnly = true;
this.gvMx1isReportcheck.Tag = "query_a.is_reportcheck";
- this.gvMx1isReportcheck.Width = 50;
+ this.gvMx1isReportcheck.Width = 44;
//
// gvMx1daa014
//
this.gvMx1daa014.AppearanceCell.Options.UseFont = true;
this.gvMx1daa014.Caption = "鎶曟枡鍗曞崟鍙�";
this.gvMx1daa014.FieldName = "daa014";
- this.gvMx1daa014.MinWidth = 50;
+ this.gvMx1daa014.MinWidth = 44;
this.gvMx1daa014.Name = "gvMx1daa014";
this.gvMx1daa014.OptionsColumn.ReadOnly = true;
this.gvMx1daa014.Tag = "query_a.daa014";
this.gvMx1daa014.Visible = true;
this.gvMx1daa014.VisibleIndex = 14;
- this.gvMx1daa014.Width = 50;
+ this.gvMx1daa014.Width = 44;
//
// gvMx1machineNo
//
@@ -1197,10 +1226,10 @@
this.gvMx1machineNo.Caption = "棰勮澶囨枡鏃堕棿";
this.gvMx1machineNo.ColumnEdit = this.repositoryItemDateEdit1;
this.gvMx1machineNo.FieldName = "prepareTime";
- this.gvMx1machineNo.MinWidth = 50;
+ this.gvMx1machineNo.MinWidth = 44;
this.gvMx1machineNo.Name = "gvMx1machineNo";
this.gvMx1machineNo.Tag = "query_a.machine_no";
- this.gvMx1machineNo.Width = 200;
+ this.gvMx1machineNo.Width = 175;
//
// repositoryItemDateEdit1
//
@@ -1215,42 +1244,42 @@
//
this.gridColumn3.Caption = "绾夸綋ID";
this.gridColumn3.FieldName = "daa015";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MinWidth = 22;
this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Width = 94;
+ this.gridColumn3.Width = 82;
//
// gvMx1fstatus
//
this.gvMx1fstatus.AppearanceCell.Options.UseFont = true;
this.gvMx1fstatus.Caption = "闇�姹傚崟鍙�";
this.gvMx1fstatus.FieldName = "caa015";
- this.gvMx1fstatus.MinWidth = 50;
+ this.gvMx1fstatus.MinWidth = 44;
this.gvMx1fstatus.Name = "gvMx1fstatus";
this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
this.gvMx1fstatus.Tag = "query_a.fstatus";
this.gvMx1fstatus.Visible = true;
this.gvMx1fstatus.VisibleIndex = 15;
- this.gvMx1fstatus.Width = 50;
+ this.gvMx1fstatus.Width = 44;
//
// gridColumn6
//
this.gridColumn6.Caption = "娆″簭";
this.gridColumn6.FieldName = "scheduleOrder";
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 22;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 16;
- this.gridColumn6.Width = 25;
+ this.gridColumn6.Width = 22;
//
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 80;
+ this.gvMxDel.MinWidth = 70;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
this.gvMxDel.VisibleIndex = 17;
- this.gvMxDel.Width = 80;
+ this.gvMxDel.Width = 70;
//
// repositoryItemButtonEdit1
//
@@ -1267,16 +1296,17 @@
//
this.gridColumn7.Caption = "宸ュ簭ID";
this.gridColumn7.FieldName = "daa030";
- this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.MinWidth = 22;
this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 82;
//
// picCheckBox
//
this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
- this.picCheckBox.Location = new System.Drawing.Point(1024, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(896, 43);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(88, 39);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 7;
this.picCheckBox.TabStop = false;
@@ -1284,12 +1314,13 @@
//
// Frm_WompbaGx
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(987, 530);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "Frm_WompbaGx";
this.Text = "鎵归噺鎺掍骇";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WompbaGx.resx b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WompbaGx.resx
index 81653b6..bd9ea0c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WompbaGx.resx
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WompbaGx.resx
@@ -120,118 +120,106 @@
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="picCheckBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- iVBORw0KGgoAAAANSUhEUgAAAXoAAADICAYAAADm1SpaAAAABGdBTUEAALGPC/xhBQAAGc1JREFUeF7t
- nUuoLdldhzvOFCGgifgkgni7zzm9T/f10mKjwhVHxkESFREfoAQyycCIgiAJXsWBOAgqgm8bFSGDGJEE
- BxnYE0VRB9GBItLGgcS8NHab1omgv/++/31unXVWVa1VtVbVqtrfBz/OPXvXetaqrx5nn3OfmsvV1dUL
- ynueffbZDyqfUP6PEELI9Mip/6ivv6O88/r6+mnX7bJcXl7ePxwOv6FOfO7UMUIIIdXyivLTTz/99Fe6
- hushuR/U2Ic7jRNCCFkw0vCv3L9//82u5XLYWUS3En8Qa5QQQsji+S85+b2u6Pmowu9U/qPTACGEkDby
- MeXrXNfT8B+yxionhBDSRl49HA4PXNt5SPI/E6mQEEJIe3n9+vr6W13fadizn0hFhBBC2s1rcvcLrvFh
- dAvwtkgFhBBC2s9n7t279ybXeZyLi4u3aMPXgoKEEEK2k4+60uNogz8KChBCCNlYrq6uvse1fht7kB8r
- kJi/V8Xv19fvUq5Hbx0AAOAO/jtLLxwOhx+RS39b+bQSc+5YXvEqb6M3/irYMCX/ok59n1cBAAAFefDg
- wRdJ+u+Ta/8ncO9o5OZ3ezWPUUVvj204kg+rE2/0KgAAoBLy7bXE/fHAwWP5lBd/jF74ULDBWP5Uxd7w
- uDQAANTm8vLyy+XerD8kqYv47zgV/uLYBgP5VJU/qAMAAINI3G+NOHkov3ksqH+8I3hjMPZDgmNBAABY
- HDn4j2Nu7snjxzf6x68Gbwzln46FAABgFeTh68DLg7Hfj7I/d/CXsTdj0bbv97YAAGAl5ON/C/3cF3n7
- 26xA8p8gvnmwDwAAqyF5vxRzdE9+yEQfe6Mv194OAACshC667bP1MUfH8uO5op/3B+4BAGA2Ev27In7u
- y89lif76+vqrvR0AAFgJ+fh7Qz8P5BcRPQDAxpCPc0T/y4geAGBjyMeIHgBgz8jHiB4AYM/Ix4geAGDP
- yMeIHgBgz8jHiB4AYM/Ix4geAGDPyMeIHgBgz8jHiB4AYM/Ix4geAGDPyMeIHgBgz8jHiB4AYM/Ix4ge
- AGDPyMeIHgBgz8jHiB4AYM/Ix4geAGDPyMeIHgBgz8jHiB4AYM/Ix4geAGDPyMeIHgBgz8jHiB4AYM/I
- x4geAGDPyMeIHgBgz8jHiB4AYM/Ix4geAGDPyMeIHgBgz8jHiB4AYM/Ix4geAGDPyMeIHiDk+eef/1qt
- 4YfKI+Vl+7e/BWeIrQdfE7YeLJtaD+ovoi/J4XD44aurq5dSojlCHg0QkXpsPT/yzWEAzdPD2FoPY8eJ
- F2mOiNRja+Jl33wTqL+IviQad58o7qTlxX4OaB8k7yvJ6eNeDAbQXJkYo3MYpLkTpx2P6lfSmrD1YCcD
- L9o86jOiL4nGjeg3gl1ZxvbLQLgDG0FztHXRx/ral83c5amviL4kGjei3wh+ex7dNz3h8c0INkfBnPWl
- ubnMXQ9bustTfxF9STRuRL8hMq/qN/Vcdg00R5sVvWH9Cvo5lk3c5amfiL4kGjei3xA5V3E8px9H87Rp
- 0U+4y9vEyV/9RPQl0bgR/cZIvapH9ONonjYteiPzLs/S/FW9+ojoS6JxI/qNkXMVZ9t6MYigOdq86Cc8
- q3/JizaL+onoS6JxI/oAjfVluxpuOeG+6UusbKtRfxeXqbXZna+BNCt6Q/1LPo5trr1Ys6ifiL4kGjei
- D3DpROeAVA2in4j6Z79AF+t3X5p+fKP+IfqSaNyIPgDRrxZEPwP1MeuqXon+FnCpzHlsqD4i+pJo3Ig+
- QIsU0a+TXYreyi6U5GN5iSD6htC4EX0Aol8tuxN97g9K9xRE3xAaN6IPQPSrBdHvKGcret/p9kOTZpIp
- NTsoovWsFZ/aoiD61YLod5SzFb3aSF1UJDE+tUVB9KsF0e8oiJ4Ui09tURD9akH0OwqiJ8XiU1sURL9a
- EP2OguhJsfjUFiVD9A9tMZPhaJ6qynQO1mbQh74g+szY2H0aslF5RE+exKe2KKmin7OQzwnNFaI/wyB6
- Uiw+tUVB9GXRXJ216O1jyaWitZn7lyqPH4teIz4Fk1C/ET15Ep/aoiD6smiuqoveyk5M6u+R2Hax8n2p
- 8tFf1Zv1269zhbsW6juiJ0/iU1uULYle/bDfJwglE8tqf8TK24/OYZA5oo/Vt1rsytu7VgyTdqytgWz2
- fxhT3xE9eRKf2qJsTPTVJToXazvoS18QfQ+21mLtjKT5/2CkD/Ud0a8VF6DdOjYTn9qiIPqyWNtBX/qC
- 6HtQnbbeo231ZLX9XQL1f7uit1svk0hLic1DX7b6vC+X1HlB9GlY20Ff+oLoI6g+ezwXbScWW79edLNo
- HNsVfYto3MlXCoj+dhB9GtZ20Je+IPoIqeuxk80+sjmhMSD6kmjciD4A0ZfF2g760hdEH6C6UufulM3+
- ALaLxoHoS6JxI/oARF8WazvoS18QfQfVk/XIxjJ3TfraX/2OQH1A9CXRuBF9AKIvi82T2r/509J9mTOf
- Kh8b82opJPqsH8DOPT6tz6e61ha+2kb0JdG4EX2AjTMlvvmqaL80L/oliIx31cwVvepY9JGNn4zv1LuW
- 8NUmoi+Jxo3oZ2Bzormxg3KtpO6/vYs+NjeDcYnF5ioWm+doPbHMOVZU3u5wYn0YyiwZq/zgOlpa+GoL
- 0ZdE40b0M9C8JM/fyskSVY20tn7Up9g89WWxE2XmCcgyq28qn3xisb55saqoLURfEo0b0c9A87IV0beQ
- Zj4R4ndisT72ZRHRq53c9TR7TnNOLNq22MdGh1BbiL4kGjein4HmBdGnpxnRm7Ai/RtKddFPOPlYZj1O
- yZ2HpT6AoLYQfUk0bkQ/A80Lok9PS6Jf9PHIGKo/+7n83ONRdeS2udjjK7WF6EuicSP6GWheEH16mhF9
- pG9jqSY51T3lh69LP7JZ9M8qqE1EXxKNG9HPQPOC6NPThOinPCIx0dV4bNH3scahlOiL6slat0sf+2oT
- 0ZdE40b0M9C8IPr0NCF6iTL7f2mylL6qVZ1TruQtcz9Kmdvu4vtNbSL6kmjciH4GmhdEn55WRJ/7fL6b
- ImNQPfaR01j9Y5n9WfZInWNZ7PPzJ9Qmoi+Jxo3oZ6B5QfTpWV30Ux7bhLE7Aq9uEqpj6poZ/DmBPc7x
- R0EPfZw3v8NgffbknuRW2WdqF9GXRONG9DPQvCTNnx1k+npz4BVM6v6z7WLl5yZHWquL3vdDrG+5yf7h
- rB0/E0R7Exf1Mfre5v3lOfWlpMbPJVJQ2+2LXnXFDogmk7lQasmiRha53VQ7qaKr0h/Va2ONtRemyqdG
- Mq+QWxB9STFmzam2zzkptpDFH9mcUNtti37KT9FJ+dhVj++SqqgtRB9vL5ZVRZ/Z19H4SSN5v9q23fKN
- Z9V9pfYRPRkPor+Tsxe9rYlIn2bFZJ/6eGNLbvAur4b6gOjJeBD9nZy96CP9KRKTvTcxirbfwuOb6Fq1
- fW1j1ftV1lIXtYHoyXgQ/Z2ctehLP7YJk7retG3Toh8aR7BdVeGrbkRPxoPo7+SsRW/rIdKf0hmdY23T
- 7HN6k7d38w56P7rOaglfdSJ6Mh5EfydnLfpIX4rHpTe4nxv3Q7TvKX0uLXzVhejJeBD9nZyt6Es8tnGR
- Rd/rxrbzZnvRdqNrxuo5Rd/b5+VPn5+3/X38T1xO0fd2l/DQt43Wl5De9an3kh83WR+92CxUF6In4ym1
- 4MZQW4g+3l4sq4je2g36MSU2z0n1jK29rpxPMW9YfJMs3Dlzxti7NvRe7qOmIutc9SB6Mp7WRG/90dfj
- 1VjhpB7gtl2s/Kz4uGLtxbK46MdOROp/6lXwo8xju8qJNaSA5Af3ib0fbN+bksec6tuE6KMHxRoZW8gZ
- Cz0pfuBH+7Jk7AD3XVIVtTXnIDu3LC56azPow634eo2+F+Qo7tQ7GD+uqtzFnZh7UWl99KqiZN6tFf3s
- veprW/QtoTGN3XbZQZAjKpNo7PWbjC2evaExI/r0LCp6tTe4/jsXJdH3g9xcoevfSfvcjgWTsRcriurP
- faQSy+CJyE9WsXJ3UvrCSnUi+lQ0prEFaYslWVR+hh/d3g4g78Lu0XgRfXqWFv3gvvH1nC36nCvpGhc+
- qre65PV+zrouvl9VJ6JPIeG267hz7Gvwem+szoxFXvW2tRU0TkSfnsVEr7ZGZejbZYve8LuB2HZ3UvLC
- J+G4TsmY5HNPJMWPddWJ6MdIlPFx5+hrluhTy9S4kmkRjRXRp2dJ0Q/ul5N89e9Jos+8qp8tem+vxFob
- lHLOuCwlT2JdVDeiH0NjGVsQNwec/Tt4rzcn0acuhlqLoCU0TkSfnkVEr3ZGr0g7Fy2TRG+kXl375pNR
- HXM/I3/K6JW3tklez9YnL1Yc1Y/oh0hZfKdFbuj7bNEbJvHYNmG6ZfaIxojo07OU6Ef3iW9q204WfeJV
- 9qzHGiqf2r+xpEg+t61ZYxtCdSP6PjSGlGdrtw42+z54vzddaWdc1Vf75EELaIyIPj3VRa82Ro+B7p2m
- vp8semPkOJg83sSTSGpSJJ/1XL47hzVQG4i+D40hZWHc2un6fpLoDfs+tl0ki1zJrYGNLRgr6U/1dWAX
- FpF2w9wcA/r3LNEb9l6w7SmTrnitXFDPnCT1Qdslr2ObYy9WDbWD6GOo/6M7KnYW1uuTRZ951dF7oGwZ
- jStp/Db3+mpCKJ3U+bftYuXnJnn9KFVF73Mca7ebW33Q9zaG2HZhetevHQeRE0z2evd6kj/NMxTvT3HJ
- eyadwHJQG4g+RH1PugKwheRFbtDryTs59rxdrye1nbPwtoTGlDp/VcauemeLag4Zd3WWaqJX3UnrMFzD
- eq3I/PlFz3FbW+v+chJeNrUfKUmeZ22b1a6diLxoVdQWou+ifqfe5kUXql6fJXpD7yXVsUfZazyIPt5e
- LNVE72sr1uat+OY36LVi82fb+LbJ+7pTpkhyRKztsx4R5Z7A5qD2EP2J7lXEUIZ2kN6fLfrUflisL7E7
- i62iMSH6eHuxVBG9yS3S1p3EJKjXi82freu+YyRE9ZX6yGQ3yftY22ZJ3rPYRZraQvQn1OfZktF7s0Vv
- 5Bzwe5K9xoPo4+3FUlz0qjNHWHf2gV5bdP78oij5mEuJnzCS15dt2y2fmCrrpw+1h+gN9TdpscSuYrpo
- myKiN7RNcl17kb3Ggujj7cVSQ/Sp8x9tW68vMn9WvsIVvCVrTv1EE6tnKFXuxIZQm4hefU2V/OgzNW1X
- TPS2iHIW8x5kr3Eg+nh7sRQVRqa0ovOv16vNn/cvtf4pye6TyiQf75YUh9RAbZ+36NXPnB01KhdtU0z0
- RuaBv9pCKoXGgOjj7cVS/MpQ6yf7I5Vd9F7x+ast+KkXSCqbJXlPlXU7hto9X9Grjzk7KmlharuiojcS
- D76bbFn26j+ij7cXS3HRq86U5829c6/3is5f7oXOhGTvRz/xZEs+9Xivgdo/T9Grf8k7Kkec2r646G1h
- WR9idfTFTg5efFOo74g+3l4sVZ71Wr1BO90Mtqn3i8+fbRuUnR0/nrLX0FTJK1X2VSpq//xEbxKM9Xcg
- yQtC2xYXveELLFpPX3JOUK2gfifNn+9DE0DppO4/2y5WflYy12YVeYycbAaPBb1v44iVC5N1orTtg/KT
- YsfE1CvrKRdcnlUlb6gP5yV69Sv3bJx11tf2VURvZF7tHWML0xaoV9E86nPu/jnnVBHIwEXFaHvaporo
- vU9zZT/5LmzKhZbFjj+vYlXUl/MQve+oXIlkLwyVqSZ6Q+WyF7tfhUxe5EuifiL69FS7UtSauXNnkXLB
- oO2qiN6YeAxbZq19lZ/yOflTqjxizEX92L/oJy6QSQeRlQvq6c0U0U9d7FuRvfqI6NNTTfSqO5Rb0tqx
- 7YJyfZm0Fm39+1qO1Xkrtl3KyWkI1bN5yRvqy75F72KM9q8vtkC8eDYqX1X0Rs5ij6Rp2at/iD491URv
- WP3WTs7xoO2rit5IWP+P5gresHqCerNS4kRTCvVnv6Kf8kzbM/lMrLLVRW9MOYGd0tICDFH/EH16qoq+
- c/wkHw/atrrojZ71X0TwXneRddjKsaa+7FP0muDcT9acMut2S+UXEb3Rs9iT0qrs1TdEn56qorf1YceR
- f5uE+rSI6A07fmwdl6jrhOqa86gmmhaONfVjX6J3+U2VxexnaqpjMdEbnauu7JQ+SEqg/iD69FQV/RTU
- p8VEXxrrU9DHYvFjbbVn9mp7P6JXm5PPxiWka6iuRUVvzJG9p5mDTn1B9OlB9AWYeXGYHJN9qWM+F7W/
- fdH7jppzNi5567e46A3VN+tqZO0rjhPqA6JPD6KfifpR/FHNUNa6i1ab2xa92pm1ozTxRf9UgOpcRfSG
- 6iwh+1UPQLWfNH+23/TVxlsjWznZIPqJFLg4PMbXYfS9vqxxnKm9bYq+0I4qfqBYnUEbvalxG6d6Syze
- 1a7u1W7q/FXrn+pOnUPrq21bNBnyQPQTsLaDvmSne4zo69T6FpsDtbU90avu2bdbdjB5dUVR3auK3lDd
- sxeyZ/GDUW1uSfRV5kf1pq5vRJ9BqWfxJnmv8ga93rTs1c52RF/whybVJld1ry56Q/UXkf3SV/dqC9Ej
- +qKUekzj6Z1zvdes7NVG+6IvuaNqytVQG02I3lAbpRa3ZakrD0SP6Ith7QTtzslon22boExSaj1hOKE2
- 2ha96im5o6pfmaqNZkRvqJ1i87fE1b3qR/SIfjZWv6/XWNtZyV332nbqMVdtTlR3u6K3K/lSO0upLnlD
- 7TQlekNtlTxZLnIltiY2xmDMfUH0AerT2nNXcq0fJW8e8uqTUdmmZK96276iNxnG6k7NElehXdRWc6I3
- 1F6qPIbSnFhqoHGuKisTS0p886awOQnmqC9F587qC+ovkVl9tPJBfakpvq5UZ9uitwWtupLlGWRxMVmb
- QR96s6ToDZvLqXdIVs6r2T0a76qi3zI2J8Ec9aXI3Fk9Qb2zU/LiUPVk98/aL+0G1dv+D2NV15Sr0VUO
- QrXbrOiNGbJf7K5obTRWRD8Rm5Ngjvoyee784q+44D1F9+nUvpY82Riqq33RG6ovSaClJygXtd206A2X
- fc5v9J2N5A2NF9FPxOYkmKO+ZM3dSZgTL1JGU9MbE463Y6xPVtarmYXq24bofUdH2zml5MRMRf1oXvTG
- 6cAJ+xTJWTyX76IxI/qJ2JwEc9SXpLnLWKdzUn0/+jiS3XBKKaeprm2I3hg5KzZx0KkfmxD9CfVj6CA6
- O8kbGjein4jNSTBHfRmcOzs2THKRcsXi9S92t2rCnjKmErJXPdsRvZ8Vb7Wx9M4aQ33ZlOiNvgVY4kpi
- i2jsiH4iNifBHPVlcO70folPiUVja33lx6aTZO9VTEJ1bEf0hu2gThvNHWjq0+ZEb/hJtHuQntVz+S7B
- PAwF0QfYnARz1JfRuZPcsp9rD8UFu/o+i12wjmWuK1THtkTvk2QybVJE3rfofIRpSfRGR/ZnLTCfg+g+
- C4LoA2xOgjnqy+jcTb36DdOK4LsEF6yDKeEJ1bMt0beOxr1Z0cNjtG8Q/URsToI56kvS3OUIMUyLgu9i
- fev2N5ZSjlBdiL4kGjei3zjaN4h+IjYnwRz1JXnutG3yMWVpXfBd1Nfex1Ml/aD6EH1JNG5Ev3G0bxD9
- RGxOgjnqS/LcZTzTtrY39bOlvsdTpd2gOhF9STRuRL9xtG8Q/URsToI56kvW3Nn2QfljtnT13kd4Iqvh
- BdWL6EuicSP6jaN9g+gnYnMSzFFfsubOZXg8tk5yt9f87c1jLrCx1XKC6kb0JfEdZos9JWf7EcaW8X0T
- XdNBEH2A5sQ+/x6u81iy176Jfc8XR1PmJBXVjegBumjtmoiiazoIoodNoLWK6AG6+F2ZPSYYzJ6vLmFf
- aL0iegCAPSMfI3oAgD0jHyN6AIA9Ix8jegCAPSMfI3oAgD0jHyN6AIA9Ix8jegCAPSMfI3oAgD0jHyN6
- AIA9Ix8jegCAPSMfI3oAgD0jHyN6AIA9Ix8jegCAPSMfI3oAgD0jHyN6AIA9Ix8jegCAPSMfI3oAgD0j
- HyN6AIA9Ix8jegCAPSMfI3oAgD0jH+eI/peswH8HL/bm8vLyytsBAICVOBwO74o5uie/YKL/dPDiUB56
- OwAAsBIS/fsifu7LIxP9x4IXh/JObwcAAFZCLv7dwM29ubq6ercV+GD4xkA+5O0AAMA6vEEufjVwc290
- 9f+2p2T798be7Mnr2v5LvDEAAFgYifutETf35viz1evr62+KvTmQR94eAAAsjBz854GTh/J5FfmCU8HP
- BG8O5dWLi4uvPxYEAIDFkH9/MPDxWD7gRY+Ffy14cyz/rDuBL/PiAABQGTn32yMuHss7vPhT9pz+myMb
- jOWT9tjHqwAAgErI0T8WcfBYPuvFn6AXPxpslJL/VX7r4uLiK7waAAAoxOXl5bfIsX/dcW5OftSreYIq
- vB/ZMCcfORwO36+v1/fu3XuTVwsAAIk899xzXyUXf6M8+lPK37pbp+QVr/IuevP3go0JIYRsLFdXV9/t
- Wr+LPYLRRp8MCxFCCNlM/tCV3o/OBM9pw9eDgoQQQtrP37z44otf6Dof5nA4vD1SASGEkHbzifv377/Z
- NZ6GCtkPA2KVEUIIaSuv2QdqXN95XF1dvSdSISGEkHbyWeXatT0Nf4zzn51KCSGEtJG/UL7GdT0P+y8E
- VdnvdyonhBCyXj5nT1xc0WWR8L9BDXwkaJAQQsgy+bwE/7MPHjx4o2u5HvabW2rs163RoBOEEELK5x8O
- h8NPPvPMM1/qGl4WNf6iOvETJn7lT/Tvv1P+3TtHCCEkPf+q/JnyAfn05+XXH7i4uHiL63YiTz31/x/a
- 2OyW1yHZAAAAAElFTkSuQmCC
+ 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
</value>
</data>
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs
index c6f0c68..017eb28 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs
@@ -30,6 +30,7 @@
{
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -49,7 +50,6 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
- 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();
@@ -59,10 +59,12 @@
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
+ this.gcMain.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1047, 642);
+ this.gcMain.Size = new System.Drawing.Size(916, 500);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -72,7 +74,7 @@
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.ColumnPanelRowHeight = 39;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.colChkInt,
this.gv_guid,
@@ -92,71 +94,82 @@
this.gv_inventoryUnit,
this.gridColumn1,
this.gridColumn2});
+ this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 44;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // colChkInt
+ //
+ this.colChkInt.Caption = ".";
+ this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.MinWidth = 22;
+ this.colChkInt.Name = "colChkInt";
+ this.colChkInt.Visible = true;
+ this.colChkInt.VisibleIndex = 0;
+ this.colChkInt.Width = 82;
//
// gv_guid
//
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 50;
+ this.gv_guid.MinWidth = 44;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.OptionsColumn.ReadOnly = true;
this.gv_guid.Tag = "query_a.guid";
- this.gv_guid.Width = 94;
+ this.gv_guid.Width = 82;
//
// gv_remarks
//
this.gv_remarks.AppearanceCell.Options.UseFont = true;
this.gv_remarks.Caption = "闇�姹傚崟鍙�";
this.gv_remarks.FieldName = "saleOrderNo";
- this.gv_remarks.MinWidth = 50;
+ this.gv_remarks.MinWidth = 44;
this.gv_remarks.Name = "gv_remarks";
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.OptionsColumn.ReadOnly = true;
this.gv_remarks.Tag = "query_a.REMARKS";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 13;
- this.gv_remarks.Width = 100;
+ this.gv_remarks.VisibleIndex = 14;
+ this.gv_remarks.Width = 87;
//
// gridColumn4
//
this.gridColumn4.Caption = "鎶曟枡鍗曞彿";
this.gridColumn4.FieldName = "caa001";
- this.gridColumn4.MinWidth = 50;
+ this.gridColumn4.MinWidth = 44;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 0;
- this.gridColumn4.Width = 120;
+ this.gridColumn4.VisibleIndex = 1;
+ this.gridColumn4.Width = 105;
//
// gridColumn3
//
this.gridColumn3.Caption = "浠诲姟鍗曞彿";
this.gridColumn3.FieldName = "caa020";
- this.gridColumn3.MinWidth = 50;
+ this.gridColumn3.MinWidth = 44;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 1;
- this.gridColumn3.Width = 125;
+ this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 109;
//
// gridColumn12
//
this.gridColumn12.Caption = "宸ュ崟鎬绘暟";
this.gridColumn12.FieldName = "gdzs";
- this.gridColumn12.MaxWidth = 50;
- this.gridColumn12.MinWidth = 50;
+ this.gridColumn12.MaxWidth = 44;
+ this.gridColumn12.MinWidth = 44;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 2;
- this.gridColumn12.Width = 50;
+ this.gridColumn12.VisibleIndex = 3;
+ this.gridColumn12.Width = 44;
//
// gv_billNo
//
@@ -167,151 +180,152 @@
this.gv_billNo.AppearanceHeader.Options.UseForeColor = true;
this.gv_billNo.Caption = "鏈帓鏁伴噺";
this.gv_billNo.FieldName = "caa012";
- this.gv_billNo.MaxWidth = 50;
- this.gv_billNo.MinWidth = 50;
+ this.gv_billNo.MaxWidth = 44;
+ this.gv_billNo.MinWidth = 44;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.OptionsColumn.ReadOnly = true;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 3;
- this.gv_billNo.Width = 50;
+ this.gv_billNo.VisibleIndex = 4;
+ this.gv_billNo.Width = 44;
//
// gv_supplierItemCode
//
this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
this.gv_supplierItemCode.FieldName = "wlbm";
- this.gv_supplierItemCode.MinWidth = 50;
+ this.gv_supplierItemCode.MinWidth = 44;
this.gv_supplierItemCode.Name = "gv_supplierItemCode";
this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
this.gv_supplierItemCode.Visible = true;
- this.gv_supplierItemCode.VisibleIndex = 4;
- this.gv_supplierItemCode.Width = 100;
+ this.gv_supplierItemCode.VisibleIndex = 5;
+ this.gv_supplierItemCode.Width = 87;
//
// gv_supplierItemName
//
this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
this.gv_supplierItemName.FieldName = "wlmc";
- this.gv_supplierItemName.MinWidth = 50;
+ this.gv_supplierItemName.MinWidth = 44;
this.gv_supplierItemName.Name = "gv_supplierItemName";
this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
this.gv_supplierItemName.Visible = true;
- this.gv_supplierItemName.VisibleIndex = 5;
- this.gv_supplierItemName.Width = 120;
+ this.gv_supplierItemName.VisibleIndex = 6;
+ this.gv_supplierItemName.Width = 105;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
this.gridColumn5.FieldName = "wlgg";
- this.gridColumn5.MinWidth = 50;
+ this.gridColumn5.MinWidth = 44;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
- this.gridColumn5.Width = 250;
+ this.gridColumn5.Width = 219;
//
// gridColumn6
//
this.gridColumn6.Caption = "鍗曚綅";
this.gridColumn6.FieldName = "caa009";
- this.gridColumn6.MaxWidth = 50;
- this.gridColumn6.MinWidth = 50;
+ this.gridColumn6.MaxWidth = 44;
+ this.gridColumn6.MinWidth = 44;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 6;
- this.gridColumn6.Width = 50;
+ this.gridColumn6.VisibleIndex = 7;
+ this.gridColumn6.Width = 44;
//
// gridColumn9
//
this.gridColumn9.Caption = "澶囨敞";
this.gridColumn9.FieldName = "caa016";
- this.gridColumn9.MinWidth = 50;
+ this.gridColumn9.MinWidth = 44;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 7;
- this.gridColumn9.Width = 100;
+ this.gridColumn9.VisibleIndex = 8;
+ this.gridColumn9.Width = 87;
//
// gridColumn8
//
this.gridColumn8.Caption = "棰勮寮�鏃堕棿";
this.gridColumn8.FieldName = "caa010";
- this.gridColumn8.MinWidth = 50;
+ this.gridColumn8.MinWidth = 44;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.OptionsColumn.ReadOnly = true;
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 8;
- this.gridColumn8.Width = 100;
+ this.gridColumn8.VisibleIndex = 9;
+ this.gridColumn8.Width = 87;
//
// gridColumn7
//
this.gridColumn7.Caption = "棰勮瀹屽伐鏃堕棿";
this.gridColumn7.FieldName = "caa011";
- this.gridColumn7.MinWidth = 50;
+ this.gridColumn7.MinWidth = 44;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 9;
- this.gridColumn7.Width = 100;
+ this.gridColumn7.VisibleIndex = 10;
+ this.gridColumn7.Width = 87;
//
// gv_purchaseUnit
//
this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
this.gv_purchaseUnit.Caption = "杞﹂棿";
this.gv_purchaseUnit.FieldName = "dptName";
- this.gv_purchaseUnit.MinWidth = 50;
+ this.gv_purchaseUnit.MinWidth = 44;
this.gv_purchaseUnit.Name = "gv_purchaseUnit";
this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gv_purchaseUnit.Visible = true;
- this.gv_purchaseUnit.VisibleIndex = 10;
- this.gv_purchaseUnit.Width = 100;
+ this.gv_purchaseUnit.VisibleIndex = 11;
+ this.gv_purchaseUnit.Width = 87;
//
// gv_inventoryUnit
//
this.gv_inventoryUnit.AppearanceCell.Options.UseFont = true;
this.gv_inventoryUnit.Caption = "寮�宸ョ姸鎬�";
this.gv_inventoryUnit.FieldName = "gdzt";
- this.gv_inventoryUnit.MinWidth = 50;
+ this.gv_inventoryUnit.MinWidth = 44;
this.gv_inventoryUnit.Name = "gv_inventoryUnit";
this.gv_inventoryUnit.OptionsColumn.AllowEdit = false;
this.gv_inventoryUnit.OptionsColumn.ReadOnly = true;
this.gv_inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
this.gv_inventoryUnit.Visible = true;
- this.gv_inventoryUnit.VisibleIndex = 11;
- this.gv_inventoryUnit.Width = 100;
+ this.gv_inventoryUnit.VisibleIndex = 12;
+ this.gv_inventoryUnit.Width = 87;
//
// gridColumn1
//
this.gridColumn1.Caption = "鐢熶骇缁勭粐";
this.gridColumn1.FieldName = "fSubsidiary";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 22;
this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 82;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐢ㄦ枡娓呭崟";
this.gridColumn2.FieldName = "ylqd";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 22;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 12;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.VisibleIndex = 13;
+ this.gridColumn2.Width = 82;
//
// panelControl1
//
this.panelControl1.Controls.Add(this.btnIn);
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panelControl1.Location = new System.Drawing.Point(0, 642);
+ this.panelControl1.Location = new System.Drawing.Point(0, 500);
+ this.panelControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(1047, 43);
+ this.panelControl1.Size = new System.Drawing.Size(916, 33);
this.panelControl1.TabIndex = 5;
//
// btnIn
@@ -321,30 +335,22 @@
this.btnIn.Appearance.Options.UseFont = true;
this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
- this.btnIn.Location = new System.Drawing.Point(951, 2);
+ this.btnIn.Location = new System.Drawing.Point(832, 2);
+ this.btnIn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnIn.Name = "btnIn";
- this.btnIn.Size = new System.Drawing.Size(94, 39);
+ this.btnIn.Size = new System.Drawing.Size(82, 29);
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾瀵煎叆";
//
- // colChkInt
- //
- 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
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1047, 685);
+ this.ClientSize = new System.Drawing.Size(916, 533);
this.Controls.Add(this.gcMain);
this.Controls.Add(this.panelControl1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "SelectWompba";
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index d7da6bd..654fcb6 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -997,12 +997,6 @@
<Compile Include="UserControl\SelectDeleteBar.Designer.cs">
<DependentUpon>SelectDeleteBar.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\SelectKw.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="UserControl\SelectKw.Designer.cs">
- <DependentUpon>SelectKw.cs</DependentUpon>
- </Compile>
<Compile Include="UserControl\UcDictionaryComBox.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -1756,9 +1750,6 @@
<EmbeddedResource Include="UserControl\SelectDeleteBar.resx">
<DependentUpon>SelectDeleteBar.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\SelectKw.resx">
- <DependentUpon>SelectKw.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcDictionaryComBox.resx">
<DependentUpon>UcDictionaryComBox.cs</DependentUpon>
</EmbeddedResource>
@@ -1881,6 +1872,7 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookDaa.resx">
<DependentUpon>UcLookDaa.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookDepartment.resx">
<DependentUpon>UcLookDepartment.cs</DependentUpon>
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDaa.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookDaa.Designer.cs
index 6c632d0..2abea79 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDaa.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDaa.Designer.cs
@@ -49,12 +49,13 @@
this.lookSearchSupplier.Dock = System.Windows.Forms.DockStyle.Fill;
this.lookSearchSupplier.EditValue = "璇烽�夋嫨";
this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
+ this.lookSearchSupplier.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.lookSearchSupplier.Name = "lookSearchSupplier";
this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
- this.lookSearchSupplier.Size = new System.Drawing.Size(387, 24);
+ this.lookSearchSupplier.Size = new System.Drawing.Size(339, 20);
this.lookSearchSupplier.TabIndex = 10;
//
// searchLookUpEdit1View
@@ -70,6 +71,7 @@
this.gridColumn4,
this.gridColumn5,
this.gridColumn10});
+ this.searchLookUpEdit1View.DetailHeight = 272;
this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
@@ -79,90 +81,107 @@
//
this.gridColumn8.Caption = "浠诲姟鍗曞彿";
this.gridColumn8.FieldName = "daa021";
+ this.gridColumn8.MinWidth = 17;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 0;
+ this.gridColumn8.Width = 66;
//
// gridColumn1
//
this.gridColumn1.Caption = "鐢熶骇杞﹂棿";
this.gridColumn1.FieldName = "dptnName";
+ this.gridColumn1.MinWidth = 17;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 1;
+ this.gridColumn1.Width = 66;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐢熶骇绾垮埆";
this.gridColumn2.FieldName = "xb";
- this.gridColumn2.MinWidth = 80;
+ this.gridColumn2.MinWidth = 70;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.UnboundDataType = typeof(string);
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 2;
- this.gridColumn2.Width = 80;
+ this.gridColumn2.Width = 70;
//
// gridColumn3
//
this.gridColumn3.Caption = "浜у搧缂栫爜";
this.gridColumn3.FieldName = "itemNo";
- this.gridColumn3.MinWidth = 100;
+ this.gridColumn3.MinWidth = 87;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 3;
- this.gridColumn3.Width = 100;
+ this.gridColumn3.Width = 87;
//
// gridColumn6
//
this.gridColumn6.Caption = "鍗曚綅";
this.gridColumn6.FieldName = "fnumber";
+ this.gridColumn6.MinWidth = 17;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 4;
+ this.gridColumn6.Width = 66;
//
// gridColumn9
//
this.gridColumn9.Caption = "浜у搧鍚嶇О";
this.gridColumn9.FieldName = "itemName";
+ this.gridColumn9.MinWidth = 17;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 5;
+ this.gridColumn9.Width = 66;
//
// gridColumn7
//
this.gridColumn7.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn7.FieldName = "itemModel";
+ this.gridColumn7.MinWidth = 17;
this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Width = 66;
//
// gridColumn4
//
this.gridColumn4.Caption = "guid";
this.gridColumn4.FieldName = "guid";
+ this.gridColumn4.MinWidth = 17;
this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Width = 66;
//
// gridColumn5
//
this.gridColumn5.Caption = "宸ュ崟鍙�";
this.gridColumn5.FieldName = "daa001";
+ this.gridColumn5.MinWidth = 17;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 6;
+ this.gridColumn5.Width = 66;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐘舵��";
this.gridColumn10.FieldName = "daa018";
+ this.gridColumn10.MinWidth = 17;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 7;
+ this.gridColumn10.Width = 66;
//
// UcLookDaa
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.lookSearchSupplier);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "UcLookDaa";
- this.Size = new System.Drawing.Size(387, 30);
+ this.Size = new System.Drawing.Size(339, 23);
((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
this.ResumeLayout(false);
--
Gitblit v1.9.3