From 26d62be6347add2f1392865d46777d626d1f5c2e Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 30 六月 2025 17:07:50 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 20
DevApp/Gs.DevApp/Resources/bofolder_16x16.png | 0
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs | 247 +++++++
DevApp/Gs.DevApp/Resources/insert_16x16.png | 0
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.resx | 126 ++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 5
DevApp/Gs.DevApp/Properties/Resources.resx | 104 +-
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs | 1326 ++++++++++++++++++++++++++++++++++++++++++
DevApp/Gs.DevApp/Program.cs | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 1
10 files changed, 1,774 insertions(+), 59 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
index aa53814..2fcf88b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
@@ -29,10 +29,1332 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_documentStatus = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_documentType = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_businessType = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.bandedGridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_closeStatus = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.bandedGridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_purchaseDept = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_purchaser = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvcol6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_guid = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemNo2 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
+ this.txt_mrmodeTxt = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
+ this.txt_erpCheckBy = new DevExpress.XtraEditors.TextEdit();
+ this.btnZsm = new DevExpress.XtraEditors.SimpleButton();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+ this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1pricingQty = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1pricingUnit = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1purchaseQty = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx100 = new DevExpress.XtraLayout.LayoutControl();
+ this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint();
+ this.txt_zQty98 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_yQty98 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_kQty98 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_iCount_98 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem43 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem44 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.xtraTabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.Panel2.SuspendLayout();
+ this.splitMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+ this.tabMx.SuspendLayout();
+ this.tabMxPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ this.tabMxPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).BeginInit();
+ this.splitMx98.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).BeginInit();
+ this.splitMx98.Panel2.SuspendLayout();
+ this.splitMx98.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx100)).BeginInit();
+ this.layoutMx100.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ this.SuspendLayout();
+ //
+ // toolBarMenu1
+ //
+ this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
+ this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.guidKey = null;
+ this.toolBarMenu1.isSetBtn = false;
+ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.rptParameter = "rpt_rohin{}";
+ this.toolBarMenu1.Size = new System.Drawing.Size(1365, 80);
+ this.toolBarMenu1.TabIndex = 0;
+ this.toolBarMenu1.xlsInService = null;
+ this.toolBarMenu1.xlsOutParameter = "xlsOut_rohin{}";
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1365, 602);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1363, 570);
+ 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.Name = "split1";
+ //
+ // split1.Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain1);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Size = new System.Drawing.Size(1363, 570);
+ this.split1.SplitterPosition = 0;
+ this.split1.TabIndex = 0;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.Size = new System.Drawing.Size(1363, 519);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.HeaderPanel.Options.UseFont = true;
+ 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 = 30;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_billNo,
+ this.gv_documentStatus,
+ this.gv_documentType,
+ this.gv_businessType,
+ this.bandedGridColumn1,
+ this.gv_closeStatus,
+ this.bandedGridColumn2,
+ this.gv_purchaseDept,
+ this.gv_purchaser,
+ this.gvcol6});
+ this.gridView1.GridControl = this.gcMain1;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.AllowHtmlDrawHeaders = true;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_billNo
+ //
+ this.gv_billNo.AppearanceCell.Options.UseFont = true;
+ this.gv_billNo.Caption = "妫�楠屽崟鍙�";
+ this.gv_billNo.FieldName = "releaseNo";
+ this.gv_billNo.MinWidth = 25;
+ 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 = 0;
+ this.gv_billNo.Width = 120;
+ //
+ // gv_documentStatus
+ //
+ this.gv_documentStatus.AppearanceCell.Options.UseFont = true;
+ this.gv_documentStatus.Caption = "浜у搧缂栫爜";
+ this.gv_documentStatus.FieldName = "itemNo2";
+ this.gv_documentStatus.MinWidth = 25;
+ this.gv_documentStatus.Name = "gv_documentStatus";
+ this.gv_documentStatus.OptionsColumn.AllowEdit = false;
+ this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS";
+ this.gv_documentStatus.Visible = true;
+ this.gv_documentStatus.VisibleIndex = 1;
+ this.gv_documentStatus.Width = 70;
+ //
+ // gv_documentType
+ //
+ this.gv_documentType.AppearanceCell.Options.UseFont = true;
+ this.gv_documentType.Caption = "杩斿伐宸ュ簭";
+ this.gv_documentType.FieldName = "fggx";
+ this.gv_documentType.MinWidth = 25;
+ this.gv_documentType.Name = "gv_documentType";
+ this.gv_documentType.OptionsColumn.AllowEdit = false;
+ this.gv_documentType.Tag = "query_a.DOCUMENT_TYPE";
+ this.gv_documentType.Visible = true;
+ this.gv_documentType.VisibleIndex = 2;
+ this.gv_documentType.Width = 80;
+ //
+ // gv_businessType
+ //
+ this.gv_businessType.AppearanceCell.Options.UseFont = true;
+ this.gv_businessType.Caption = "寮�鍗曟棩鏈�";
+ this.gv_businessType.FieldName = "createDate";
+ this.gv_businessType.MinWidth = 25;
+ this.gv_businessType.Name = "gv_businessType";
+ this.gv_businessType.OptionsColumn.AllowEdit = false;
+ this.gv_businessType.Tag = "query_a.BUSINESS_TYPE";
+ this.gv_businessType.Visible = true;
+ this.gv_businessType.VisibleIndex = 3;
+ this.gv_businessType.Width = 80;
+ //
+ // bandedGridColumn1
+ //
+ this.bandedGridColumn1.Caption = "寮�鍗曚汉";
+ this.bandedGridColumn1.FieldName = "createBy";
+ this.bandedGridColumn1.MinWidth = 25;
+ this.bandedGridColumn1.Name = "bandedGridColumn1";
+ this.bandedGridColumn1.OptionsColumn.AllowEdit = false;
+ this.bandedGridColumn1.Tag = "query_a.suppName";
+ this.bandedGridColumn1.Visible = true;
+ this.bandedGridColumn1.VisibleIndex = 4;
+ this.bandedGridColumn1.Width = 134;
+ //
+ // gv_closeStatus
+ //
+ this.gv_closeStatus.AppearanceCell.Options.UseFont = true;
+ this.gv_closeStatus.Caption = "杩斿伐鏁伴噺";
+ this.gv_closeStatus.FieldName = "fbatchQty";
+ this.gv_closeStatus.MinWidth = 25;
+ this.gv_closeStatus.Name = "gv_closeStatus";
+ this.gv_closeStatus.OptionsColumn.AllowEdit = false;
+ this.gv_closeStatus.Tag = "query_a.CLOSE_STATUS";
+ this.gv_closeStatus.Visible = true;
+ this.gv_closeStatus.VisibleIndex = 5;
+ this.gv_closeStatus.Width = 80;
+ //
+ // bandedGridColumn2
+ //
+ this.bandedGridColumn2.Caption = "鐢熸垚鏉＄爜鏁�";
+ this.bandedGridColumn2.FieldName = "departmentname";
+ this.bandedGridColumn2.MinWidth = 25;
+ this.bandedGridColumn2.Name = "bandedGridColumn2";
+ this.bandedGridColumn2.OptionsColumn.AllowEdit = false;
+ this.bandedGridColumn2.Tag = "query_a.departmentname";
+ this.bandedGridColumn2.Visible = true;
+ this.bandedGridColumn2.VisibleIndex = 6;
+ this.bandedGridColumn2.Width = 80;
+ //
+ // gv_purchaseDept
+ //
+ this.gv_purchaseDept.AppearanceCell.Options.UseFont = true;
+ this.gv_purchaseDept.Caption = "浜у搧鍚嶇О";
+ this.gv_purchaseDept.FieldName = "itemName";
+ this.gv_purchaseDept.MinWidth = 25;
+ this.gv_purchaseDept.Name = "gv_purchaseDept";
+ this.gv_purchaseDept.OptionsColumn.AllowEdit = false;
+ this.gv_purchaseDept.Tag = "query_a.PURCHASE_DEPT";
+ this.gv_purchaseDept.Visible = true;
+ this.gv_purchaseDept.VisibleIndex = 7;
+ this.gv_purchaseDept.Width = 50;
+ //
+ // gv_purchaser
+ //
+ this.gv_purchaser.AppearanceCell.Options.UseFont = true;
+ this.gv_purchaser.Caption = "浜у搧瑙勬牸";
+ this.gv_purchaser.FieldName = "itemModel";
+ this.gv_purchaser.MinWidth = 25;
+ this.gv_purchaser.Name = "gv_purchaser";
+ this.gv_purchaser.OptionsColumn.AllowEdit = false;
+ this.gv_purchaser.Tag = "query_a.PURCHASER";
+ this.gv_purchaser.Visible = true;
+ this.gv_purchaser.VisibleIndex = 8;
+ this.gv_purchaser.Width = 60;
+ //
+ // gvcol6
+ //
+ this.gvcol6.Caption = "涓婚敭GUID";
+ this.gvcol6.FieldName = "guid";
+ this.gvcol6.MinWidth = 25;
+ this.gvcol6.Name = "gvcol6";
+ this.gvcol6.Width = 94;
+ //
+ // 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.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(1363, 39);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.Size = new System.Drawing.Size(1363, 570);
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+ //
+ // splitMx1
+ //
+ 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";
+ //
+ // splitMx1.Panel1
+ //
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.Panel2
+ //
+ 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(1363, 570);
+ this.splitMx1.SplitterPosition = 123;
+ this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_releaseNo);
+ this.layoutMx1.Controls.Add(this.txt_guid);
+ this.layoutMx1.Controls.Add(this.txt_itemName);
+ this.layoutMx1.Controls.Add(this.txt_itemNo2);
+ this.layoutMx1.Controls.Add(this.txt_createBy);
+ this.layoutMx1.Controls.Add(this.txt_createDate);
+ this.layoutMx1.Controls.Add(this.txt_fbatchQty);
+ this.layoutMx1.Controls.Add(this.txt_mrmodeTxt);
+ this.layoutMx1.Controls.Add(this.txt_itemModel);
+ this.layoutMx1.Controls.Add(this.txt_erpCheckBy);
+ this.layoutMx1.Controls.Add(this.btnZsm);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem3,
+ this.layoutControlItem4});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(656, 429, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1363, 123);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(672, 12);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(326, 25);
+ this.lbGuid.TabIndex = 230;
+ this.lbGuid.Text = "lbGuid";
+ //
+ // txt_releaseNo
+ //
+ this.txt_releaseNo.Location = new System.Drawing.Point(99, 12);
+ this.txt_releaseNo.Name = "txt_releaseNo";
+ this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_releaseNo.Size = new System.Drawing.Size(244, 24);
+ this.txt_releaseNo.StyleController = this.layoutMx1;
+ this.txt_releaseNo.TabIndex = 213;
+ //
+ // txt_guid
+ //
+ this.txt_guid.Location = new System.Drawing.Point(759, 12);
+ this.txt_guid.Name = "txt_guid";
+ this.txt_guid.Size = new System.Drawing.Size(239, 24);
+ this.txt_guid.StyleController = this.layoutMx1;
+ this.txt_guid.TabIndex = 229;
+ //
+ // txt_itemName
+ //
+ this.txt_itemName.Location = new System.Drawing.Point(770, 12);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Size = new System.Drawing.Size(245, 24);
+ this.txt_itemName.StyleController = this.layoutMx1;
+ this.txt_itemName.TabIndex = 231;
+ //
+ // txt_itemNo2
+ //
+ this.txt_itemNo2.Location = new System.Drawing.Point(434, 12);
+ this.txt_itemNo2.Name = "txt_itemNo2";
+ this.txt_itemNo2.Size = new System.Drawing.Size(245, 24);
+ this.txt_itemNo2.StyleController = this.layoutMx1;
+ this.txt_itemNo2.TabIndex = 232;
+ //
+ // txt_createBy
+ //
+ this.txt_createBy.Location = new System.Drawing.Point(770, 46);
+ this.txt_createBy.Name = "txt_createBy";
+ this.txt_createBy.Size = new System.Drawing.Size(245, 24);
+ this.txt_createBy.StyleController = this.layoutMx1;
+ this.txt_createBy.TabIndex = 233;
+ //
+ // txt_createDate
+ //
+ this.txt_createDate.Location = new System.Drawing.Point(1106, 46);
+ this.txt_createDate.Name = "txt_createDate";
+ this.txt_createDate.Size = new System.Drawing.Size(245, 24);
+ this.txt_createDate.StyleController = this.layoutMx1;
+ this.txt_createDate.TabIndex = 234;
+ //
+ // txt_fbatchQty
+ //
+ this.txt_fbatchQty.Location = new System.Drawing.Point(99, 46);
+ this.txt_fbatchQty.Name = "txt_fbatchQty";
+ this.txt_fbatchQty.Size = new System.Drawing.Size(244, 24);
+ this.txt_fbatchQty.StyleController = this.layoutMx1;
+ this.txt_fbatchQty.TabIndex = 236;
+ //
+ // txt_mrmodeTxt
+ //
+ this.txt_mrmodeTxt.Location = new System.Drawing.Point(434, 46);
+ this.txt_mrmodeTxt.Name = "txt_mrmodeTxt";
+ this.txt_mrmodeTxt.Size = new System.Drawing.Size(245, 24);
+ this.txt_mrmodeTxt.StyleController = this.layoutMx1;
+ this.txt_mrmodeTxt.TabIndex = 237;
+ //
+ // txt_itemModel
+ //
+ this.txt_itemModel.Location = new System.Drawing.Point(1106, 12);
+ this.txt_itemModel.Name = "txt_itemModel";
+ this.txt_itemModel.Size = new System.Drawing.Size(245, 24);
+ this.txt_itemModel.StyleController = this.layoutMx1;
+ this.txt_itemModel.TabIndex = 238;
+ //
+ // txt_erpCheckBy
+ //
+ this.txt_erpCheckBy.Location = new System.Drawing.Point(99, 80);
+ this.txt_erpCheckBy.Name = "txt_erpCheckBy";
+ this.txt_erpCheckBy.Size = new System.Drawing.Size(244, 24);
+ this.txt_erpCheckBy.StyleController = this.layoutMx1;
+ this.txt_erpCheckBy.TabIndex = 241;
+ //
+ // btnZsm
+ //
+ this.btnZsm.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.insert_16x16;
+ this.btnZsm.Location = new System.Drawing.Point(347, 80);
+ this.btnZsm.Name = "btnZsm";
+ this.btnZsm.Size = new System.Drawing.Size(116, 27);
+ this.btnZsm.StyleController = this.layoutMx1;
+ this.btnZsm.TabIndex = 242;
+ this.btnZsm.Text = "鐢熸垚杩芥函鐮�";
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.lbGuid;
+ this.layoutControlItem3.Location = new System.Drawing.Point(660, 0);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem3.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem3.Text = "lbGuid";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem3.TextVisible = false;
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_guid;
+ this.layoutControlItem4.Location = new System.Drawing.Point(660, 0);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem4.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem4.Text = "涓婚敭GUID";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
+ //
+ // Root
+ //
+ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem1,
+ this.layoutControlItem5,
+ this.layoutControlItem2,
+ this.layoutControlItem6,
+ this.layoutControlItem9,
+ this.layoutControlItem10,
+ this.layoutControlItem7,
+ this.layoutControlItem11,
+ this.layoutControlItem14,
+ this.layoutControlItem8});
+ this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.Root.Name = "Root";
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
+ this.Root.Size = new System.Drawing.Size(1363, 123);
+ this.Root.TextVisible = false;
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_releaseNo;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(335, 34);
+ this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_itemNo2;
+ this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(336, 34);
+ this.layoutControlItem5.Text = "浜у搧缂栫爜";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_itemName;
+ this.layoutControlItem2.Location = new System.Drawing.Point(671, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem2.Size = new System.Drawing.Size(336, 34);
+ this.layoutControlItem2.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_createBy;
+ this.layoutControlItem6.Location = new System.Drawing.Point(671, 34);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(336, 34);
+ this.layoutControlItem6.Text = "寮�鍗曚汉";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_fbatchQty;
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 34);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem9.Size = new System.Drawing.Size(335, 34);
+ this.layoutControlItem9.Text = "闇�杩斿伐鏁伴噺";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_mrmodeTxt;
+ this.layoutControlItem10.Location = new System.Drawing.Point(335, 34);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem10.Size = new System.Drawing.Size(336, 34);
+ this.layoutControlItem10.Text = "杩斿伐宸ュ簭";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_createDate;
+ this.layoutControlItem7.Location = new System.Drawing.Point(1007, 34);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem7.Size = new System.Drawing.Size(336, 34);
+ this.layoutControlItem7.Text = "寮�鍗曟棩鏈�";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_itemModel;
+ this.layoutControlItem11.Location = new System.Drawing.Point(1007, 0);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.Size = new System.Drawing.Size(336, 34);
+ this.layoutControlItem11.Text = "浜у搧瑙勬牸";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_erpCheckBy;
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 68);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(335, 35);
+ this.layoutControlItem14.Text = "宸茶繑宸ユ暟閲�";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.btnZsm;
+ this.layoutControlItem8.Location = new System.Drawing.Point(335, 68);
+ this.layoutControlItem8.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem8.MinSize = new System.Drawing.Size(86, 31);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(336, 35);
+ this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem8.Text = "鐢熸垚杩芥函鐮�";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem8.TextVisible = false;
+ //
+ // tabMx
+ //
+ this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Name = "tabMx";
+ this.tabMx.SelectedTabPage = this.tabMxPage1;
+ this.tabMx.Size = new System.Drawing.Size(1363, 435);
+ this.tabMx.TabIndex = 3;
+ this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.tabMxPage1,
+ this.tabMxPage2});
+ //
+ // tabMxPage1
+ //
+ this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Name = "tabMxPage1";
+ this.tabMxPage1.Size = new System.Drawing.Size(1361, 403);
+ this.tabMxPage1.Text = "鍗℃澘鏄庣粏";
+ //
+ // gcMx1
+ //
+ this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.Location = new System.Drawing.Point(0, 0);
+ this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Name = "gcMx1";
+ this.gcMx1.Size = new System.Drawing.Size(1361, 403);
+ this.gcMx1.TabIndex = 0;
+ this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx1});
+ //
+ // gvMx1
+ //
+ this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx1.ColumnPanelRowHeight = 60;
+ this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn3,
+ this.gvMx1itemId,
+ this.gridColumn2,
+ this.gridColumn1,
+ this.gvMx1pricingQty,
+ this.gvMx1pricingUnit,
+ this.gvMx1purchaseQty});
+ this.gvMx1.GridControl = this.gcMx1;
+ this.gvMx1.Name = "gvMx1";
+ this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鍗℃澘鏉＄爜";
+ this.gridColumn3.FieldName = "tbBarcode";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 0;
+ this.gridColumn3.Width = 115;
+ //
+ // gvMx1itemId
+ //
+ this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
+ this.gvMx1itemId.Caption = "鐗╂枡ID";
+ this.gvMx1itemId.FieldName = "itemId";
+ this.gvMx1itemId.MinWidth = 25;
+ this.gvMx1itemId.Name = "gvMx1itemId";
+ this.gvMx1itemId.Tag = "query_a.ITEM_ID";
+ this.gvMx1itemId.Width = 100;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn2.FieldName = "itemNo";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 46;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn1.FieldName = "itemName";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 2;
+ this.gridColumn1.Width = 55;
+ //
+ // gvMx1pricingQty
+ //
+ this.gvMx1pricingQty.AppearanceCell.Options.UseFont = true;
+ this.gvMx1pricingQty.Caption = "宸ュ崟鍙�";
+ this.gvMx1pricingQty.FieldName = "daa001";
+ this.gvMx1pricingQty.MinWidth = 25;
+ this.gvMx1pricingQty.Name = "gvMx1pricingQty";
+ this.gvMx1pricingQty.Tag = "query_a.PRICING_QTY";
+ this.gvMx1pricingQty.Width = 25;
+ //
+ // gvMx1pricingUnit
+ //
+ this.gvMx1pricingUnit.AppearanceCell.Options.UseFont = true;
+ this.gvMx1pricingUnit.Caption = "绾垮埆";
+ this.gvMx1pricingUnit.FieldName = "lineName";
+ this.gvMx1pricingUnit.MinWidth = 25;
+ this.gvMx1pricingUnit.Name = "gvMx1pricingUnit";
+ this.gvMx1pricingUnit.Tag = "query_a.PRICING_UNIT";
+ this.gvMx1pricingUnit.Width = 25;
+ //
+ // gvMx1purchaseQty
+ //
+ this.gvMx1purchaseQty.AppearanceCell.Options.UseFont = true;
+ this.gvMx1purchaseQty.Caption = "鏁伴噺";
+ this.gvMx1purchaseQty.FieldName = "tmQty";
+ this.gvMx1purchaseQty.MinWidth = 25;
+ this.gvMx1purchaseQty.Name = "gvMx1purchaseQty";
+ this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY";
+ this.gvMx1purchaseQty.Visible = true;
+ this.gvMx1purchaseQty.VisibleIndex = 3;
+ this.gvMx1purchaseQty.Width = 25;
+ //
+ // tabMxPage2
+ //
+ this.tabMxPage2.Controls.Add(this.splitMx98);
+ this.tabMxPage2.Name = "tabMxPage2";
+ this.tabMxPage2.Size = new System.Drawing.Size(1361, 403);
+ this.tabMxPage2.Text = "杩芥函鐮佹槑缁�";
+ //
+ // splitMx98
+ //
+ this.splitMx98.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx98.Horizontal = false;
+ this.splitMx98.Location = new System.Drawing.Point(0, 0);
+ this.splitMx98.Name = "splitMx98";
+ //
+ // splitMx98.Panel1
+ //
+ this.splitMx98.Panel1.Controls.Add(this.layoutMx100);
+ this.splitMx98.Panel1.Text = "Panel1";
+ //
+ // splitMx98.Panel2
+ //
+ this.splitMx98.Panel2.Controls.Add(this.gcMx2);
+ this.splitMx98.Panel2.Text = "Panel2";
+ this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx98.Size = new System.Drawing.Size(1361, 403);
+ this.splitMx98.SplitterPosition = 56;
+ this.splitMx98.TabIndex = 2;
+ //
+ // layoutMx100
+ //
+ this.layoutMx100.Controls.Add(this.ucBtnPrint98);
+ this.layoutMx100.Controls.Add(this.txt_zQty98);
+ this.layoutMx100.Controls.Add(this.txt_yQty98);
+ this.layoutMx100.Controls.Add(this.txt_kQty98);
+ this.layoutMx100.Controls.Add(this.txt_iCount_98);
+ this.layoutMx100.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx100.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx100.Name = "layoutMx100";
+ this.layoutMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(454, 530, 812, 500);
+ this.layoutMx100.Root = this.layoutControlGroup1;
+ this.layoutMx100.Size = new System.Drawing.Size(1361, 56);
+ this.layoutMx100.TabIndex = 0;
+ this.layoutMx100.Text = "layoutControl1";
+ //
+ // ucBtnPrint98
+ //
+ this.ucBtnPrint98.allClickKey = null;
+ this.ucBtnPrint98.guidKey = null;
+ this.ucBtnPrint98.Location = new System.Drawing.Point(1084, 12);
+ this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
+ this.ucBtnPrint98.Name = "ucBtnPrint98";
+ this.ucBtnPrint98.rptParameter = null;
+ this.ucBtnPrint98.Size = new System.Drawing.Size(265, 32);
+ this.ucBtnPrint98.TabIndex = 9;
+ //
+ // txt_zQty98
+ //
+ this.txt_zQty98.Location = new System.Drawing.Point(114, 12);
+ this.txt_zQty98.Name = "txt_zQty98";
+ this.txt_zQty98.Properties.ReadOnly = true;
+ this.txt_zQty98.Size = new System.Drawing.Size(162, 24);
+ this.txt_zQty98.StyleController = this.layoutMx100;
+ this.txt_zQty98.TabIndex = 4;
+ //
+ // txt_yQty98
+ //
+ this.txt_yQty98.Location = new System.Drawing.Point(382, 12);
+ this.txt_yQty98.Name = "txt_yQty98";
+ this.txt_yQty98.Properties.ReadOnly = true;
+ this.txt_yQty98.Size = new System.Drawing.Size(162, 24);
+ this.txt_yQty98.StyleController = this.layoutMx100;
+ this.txt_yQty98.TabIndex = 5;
+ //
+ // txt_kQty98
+ //
+ this.txt_kQty98.Location = new System.Drawing.Point(650, 12);
+ this.txt_kQty98.Name = "txt_kQty98";
+ this.txt_kQty98.Properties.ReadOnly = true;
+ this.txt_kQty98.Size = new System.Drawing.Size(162, 24);
+ this.txt_kQty98.StyleController = this.layoutMx100;
+ this.txt_kQty98.TabIndex = 6;
+ //
+ // txt_iCount_98
+ //
+ this.txt_iCount_98.Location = new System.Drawing.Point(918, 12);
+ this.txt_iCount_98.Name = "txt_iCount_98";
+ this.txt_iCount_98.Size = new System.Drawing.Size(162, 24);
+ this.txt_iCount_98.StyleController = this.layoutMx100;
+ this.txt_iCount_98.TabIndex = 7;
+ //
+ // layoutControlGroup1
+ //
+ this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup1.GroupBordersVisible = false;
+ this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem42,
+ this.layoutControlItem43,
+ this.layoutControlItem44,
+ this.layoutControlItem45,
+ this.layoutControlItem13});
+ this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup1.Name = "Root";
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9});
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition4});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1361, 56);
+ this.layoutControlGroup1.TextVisible = false;
+ //
+ // layoutControlItem42
+ //
+ this.layoutControlItem42.Control = this.txt_zQty98;
+ this.layoutControlItem42.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem42.CustomizationFormText = "宸ュ崟鎬婚噺";
+ this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem42.Name = "layoutControlItem42";
+ this.layoutControlItem42.Size = new System.Drawing.Size(268, 36);
+ this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
+ this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem43
+ //
+ this.layoutControlItem43.Control = this.txt_yQty98;
+ this.layoutControlItem43.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem43.CustomizationFormText = "宸叉墦鍗版暟";
+ this.layoutControlItem43.Location = new System.Drawing.Point(268, 0);
+ this.layoutControlItem43.Name = "layoutControlItem43";
+ this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem43.Size = new System.Drawing.Size(268, 36);
+ this.layoutControlItem43.Text = "宸叉墦鍗版暟";
+ this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem44
+ //
+ this.layoutControlItem44.Control = this.txt_kQty98;
+ this.layoutControlItem44.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
+ this.layoutControlItem44.Location = new System.Drawing.Point(536, 0);
+ this.layoutControlItem44.Name = "layoutControlItem44";
+ this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem44.Size = new System.Drawing.Size(268, 36);
+ this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�";
+ this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem45
+ //
+ this.layoutControlItem45.Control = this.txt_iCount_98;
+ this.layoutControlItem45.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem45.CustomizationFormText = "鏈鎵撳嵃寮犳暟";
+ this.layoutControlItem45.Location = new System.Drawing.Point(804, 0);
+ this.layoutControlItem45.Name = "layoutControlItem45";
+ this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem45.Size = new System.Drawing.Size(268, 36);
+ this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
+ this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.ucBtnPrint98;
+ this.layoutControlItem13.Location = new System.Drawing.Point(1072, 0);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem13.Size = new System.Drawing.Size(269, 36);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
+ //
+ // gcMx2
+ //
+ this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.Location = new System.Drawing.Point(0, 0);
+ this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Name = "gcMx2";
+ this.gcMx2.Size = new System.Drawing.Size(1361, 335);
+ this.gcMx2.TabIndex = 1;
+ this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx2});
+ //
+ // gvMx2
+ //
+ this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx2.ColumnPanelRowHeight = 60;
+ this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn13,
+ this.gridColumn14,
+ this.gridColumn15,
+ this.gridColumn16,
+ this.gridColumn17,
+ this.gridColumn22,
+ this.gridColumn47,
+ this.gridColumn48,
+ this.gridColumn12,
+ this.gridColumn18});
+ this.gvMx2.GridControl = this.gcMx2;
+ this.gvMx2.Name = "gvMx2";
+ this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx2.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "ERP涓ID";
+ this.gridColumn13.FieldName = "ebelnK3id";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 0;
+ this.gridColumn13.Width = 46;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.AppearanceCell.Options.UseFont = true;
+ this.gridColumn14.Caption = "鐗╂枡ID";
+ this.gridColumn14.FieldName = "itemId";
+ this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Tag = "query_a.ITEM_ID";
+ this.gridColumn14.Width = 100;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn15.FieldName = "itemNo";
+ this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 2;
+ this.gridColumn15.Width = 46;
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn16.FieldName = "itemName";
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 3;
+ this.gridColumn16.Width = 55;
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.AppearanceCell.Options.UseFont = true;
+ this.gridColumn17.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn17.FieldName = "itemModel";
+ this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Tag = "query_a.PRICING_QTY";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 4;
+ this.gridColumn17.Width = 25;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.AppearanceCell.Options.UseFont = true;
+ this.gridColumn22.Caption = "鍒拌揣鏁伴噺";
+ this.gridColumn22.FieldName = "quantity";
+ this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Tag = "query_a.PURCHASE_QTY";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 5;
+ this.gridColumn22.Width = 25;
+ //
+ // gridColumn47
+ //
+ this.gridColumn47.Caption = "鏀舵枡浜�";
+ this.gridColumn47.FieldName = "createBy";
+ this.gridColumn47.MinWidth = 25;
+ this.gridColumn47.Name = "gridColumn47";
+ this.gridColumn47.Visible = true;
+ this.gridColumn47.VisibleIndex = 7;
+ this.gridColumn47.Width = 43;
+ //
+ // gridColumn48
+ //
+ this.gridColumn48.Caption = "鏀舵枡鏃堕棿";
+ this.gridColumn48.FieldName = "createDate";
+ this.gridColumn48.MinWidth = 25;
+ this.gridColumn48.Name = "gridColumn48";
+ this.gridColumn48.Visible = true;
+ this.gridColumn48.VisibleIndex = 8;
+ this.gridColumn48.Width = 94;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "鍒拌揣鍗曞彿";
+ this.gridColumn12.FieldName = "dhdh";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 1;
+ this.gridColumn12.Width = 94;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn18.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn18.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn18.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn18.Caption = "瀹炴敹鏁伴噺";
+ this.gridColumn18.FieldName = "sjQuantity";
+ this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 6;
+ this.gridColumn18.Width = 94;
+ //
+ // Frm_WomFanGong
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Text = "Frm_WomFanGong";
- }
+ this.ClientSize = new System.Drawing.Size(1365, 682);
+ this.Controls.Add(this.xtraTabControl1);
+ this.Controls.Add(this.toolBarMenu1);
+ this.Name = "Frm_WomFanGong";
+ this.Text = "閲囪喘璁㈠崟";
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ this.xtraTabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ this.splitMx1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+ this.tabMx.ResumeLayout(false);
+ this.tabMxPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ this.tabMxPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).EndInit();
+ this.splitMx98.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).EndInit();
+ this.splitMx98.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).EndInit();
+ this.splitMx98.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx100)).EndInit();
+ this.layoutMx100.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ this.ResumeLayout(false);
+ }
#endregion
+ private UserControl.UcToolBarMenu toolBarMenu1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_documentStatus;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_documentType;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_businessType;
+ private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
+ private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseDept;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_purchaser;
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+ private DevExpress.XtraLayout.LayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraEditors.TextEdit txt_releaseNo;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraTab.XtraTabControl tabMx;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1pricingQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1pricingUnit;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1purchaseQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvcol6;
+ private DevExpress.XtraEditors.TextEdit txt_guid;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraEditors.TextEdit txt_itemName;
+ private DevExpress.XtraEditors.TextEdit txt_itemNo2;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraEditors.TextEdit txt_createDate;
+ private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
+ private DevExpress.XtraEditors.TextEdit txt_mrmodeTxt;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraEditors.TextEdit txt_itemModel;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraEditors.TextEdit txt_erpCheckBy;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+ private DevExpress.XtraGrid.GridControl gcMx2;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.XtraEditors.SimpleButton btnZsm;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx98;
+ private DevExpress.XtraLayout.LayoutControl layoutMx100;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraEditors.TextEdit txt_zQty98;
+ private DevExpress.XtraEditors.TextEdit txt_yQty98;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem42;
+ private DevExpress.XtraEditors.TextEdit txt_kQty98;
+ private DevExpress.XtraEditors.TextEdit txt_iCount_98;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem43;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem44;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem45;
+ private UserControl.UcBtnPrint ucBtnPrint98;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
index 786d887..3b8a6ab 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
@@ -1,21 +1,258 @@
-锘縰sing DevExpress.XtraEditors;
+锘縰sing DevExpress.Utils.MVVM.Services;
+using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraLayout.Customization;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
+
namespace Gs.DevApp.DevFrm.WOM
{
public partial class Frm_WomFanGong : DevExpress.XtraEditors.XtraForm
{
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
+ private readonly string _webServiceName = "FanGongManager/";
public Frm_WomFanGong()
{
InitializeComponent();
+ toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "docStusTxt", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }, lbGuid);
+ getPageList(1);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ btnZsm.Click += (s, e) =>
+ {
+ if (!MsgHelper.AskQuestion("纭畾鐢熸垚鏂扮殑杩芥函鐮佸悧锛�"))
+ return;
+ var _obj = new
+ {
+ guid = lbGuid.Text.Trim(),
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "CreateTrace",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ getModel(lbGuid.Text.Trim());
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ };
}
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ Task.Delay(100);
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage);
+ }
+
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ }
+
+ /// <summary>
+ /// 鏌ヨ鍥炶皟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ _filterList = e.FilterList;
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim());
+ else
+ {
+ //_filterList.Clear();
+ //if (gridView1.ActiveFilter.Count > 0)
+ //{
+ // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ // gridView1.ActiveFilter.Clear();
+ // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ //}
+ //getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ }
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
+ "asc", "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ _webServiceName + "GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain1.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
+ private void getModel(string strGuid)
+ {
+ bool isEdit = false;
+ if (toolBarMenu1.currentAction == "add") return;
+ if (toolBarMenu1.currentAction == "edit") isEdit = true;
+ if (string.IsNullOrEmpty(strGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ var _obj = new
+ {
+ guid = strGuid //涓诲缓
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "GetModel",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ var dy = _rtn.rtnData;
+ lbGuid.Text = strGuid;
+ var gvList = new List<GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit,
+ gvList);
+ var _job = JObject.Parse(strJson);
+ var array = new JArray();
+ foreach (var a in _job["rtnData"]["list"]) array.Add(a);
+ var dt = JsonConvert.DeserializeObject<DataTable>(
+ array.ToString());
+ if (dt.Rows.Count > 0)
+ {
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = dt;
+ gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
+ }
+ else
+ {
+ UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ }
+
+ var array2 = new JArray();
+ foreach (var a in _job["rtnData"]["list2"]) array2.Add(a);
+ var dt2 = JsonConvert.DeserializeObject<DataTable>(
+ array2.ToString());
+ if (dt2.Rows.Count > 0)
+ {
+ gcMx2.BindingContext = new BindingContext();
+ gcMx2.DataSource = dt2;
+ gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
+ }
+ else
+ {
+ UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ }
+ }
+ else
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.resx b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.resx
new file mode 100644
index 0000000..e7132ea
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.resx
@@ -0,0 +1,126 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>25</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 3b0582d..ae6642c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -2912,7 +2912,6 @@
this.txt_iCount_100.Location = new System.Drawing.Point(940, 12);
this.txt_iCount_100.Name = "txt_iCount_100";
this.txt_iCount_100.Size = new System.Drawing.Size(170, 24);
- this.txt_iCount_100.StyleController = this.layMx100;
this.txt_iCount_100.TabIndex = 7;
//
// btnDesign
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index edb345c..cb55ffd 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1745,6 +1745,9 @@
<EmbeddedResource Include="DevFrm\WOM\Frm_MesWorkProd.resx">
<DependentUpon>Frm_MesWorkProd.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WOM\Frm_WomFanGong.resx">
+ <DependentUpon>Frm_WomFanGong.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\WOM\ShowJieAn.resx">
<DependentUpon>ShowJieAn.cs</DependentUpon>
</EmbeddedResource>
@@ -2257,6 +2260,8 @@
<None Include="Resources\dayview_16x16.png" />
<None Include="Resources\addfile_32x32.png" />
<None Include="Resources\fullstackedbar3d_16x16.png" />
+ <None Include="Resources\bofolder_16x16.png" />
+ <None Include="Resources\insert_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index cb50951..4dd0414 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -51,8 +51,8 @@
fmLogin.ShowDialog();
if (fmLogin.DialogResult == DialogResult.OK)
{
- Application.Run(new DevFrm.User.SysMenu());
- return;
+ //Application.Run(new DevFrm.User.SysMenu());
+ //return;
bool IsWeight = false;
try
{
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 7121f6a..f6b87f3 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -343,6 +343,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap bofolder_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("bofolder_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap boperson_16x16 {
get {
object obj = ResourceManager.GetObject("boperson_16x16", resourceCulture);
@@ -1603,6 +1613,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap insert_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("insert_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap insertdatafield_16x16 {
get {
object obj = ResourceManager.GetObject("insertdatafield_16x16", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 44b6c7b..18ad3f8 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -259,14 +259,19 @@
<data name="alignhorizontalcenter1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\alignhorizontalcenter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
+ <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bouser_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bouser_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -280,8 +285,13 @@
<data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap,
+ <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -310,16 +320,17 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="sendpdf_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sendpdf_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="checkbox2_32x323" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_32x323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="operatingsystem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\operatingsystem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -332,8 +343,8 @@
<data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap,
+ <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -365,8 +376,10 @@
<data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
@@ -539,13 +552,13 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap,
+ <data name="addfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\addfooter_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="addfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\addfooter_32x32.png;System.Drawing.Bitmap,
+ <data name="groupbyresource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\groupbyresource_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -590,11 +603,6 @@
<data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -609,6 +617,11 @@
</data>
<data name="ico_check" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ico_check.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="3dcylinder_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3dcylinder_32x32.png;System.Drawing.Bitmap,
@@ -628,8 +641,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -756,6 +769,9 @@
<data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
+ <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -873,11 +889,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="wraptext2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wraptext2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -913,14 +924,16 @@
<data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
- <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="bodetails_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bodetails_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="bodepartment_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bodepartment_32x32.png;System.Drawing.Bitmap,
+ <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -939,10 +952,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="bofolder_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bofolder_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1044,10 +1055,8 @@
<data name="pencolor_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pencolor_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="fullstackedbar3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\fullstackedbar3d_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="convert_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\convert_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1128,11 +1137,6 @@
<data name="trackingchanges_previous_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_previous_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="print_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\print_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -1159,8 +1163,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="botask_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\botask_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1173,7 +1179,7 @@
<data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="fullstackedbar3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\fullstackedbar3d_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="insert_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\insert_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/bofolder_16x16.png b/DevApp/Gs.DevApp/Resources/bofolder_16x16.png
new file mode 100644
index 0000000..a5fd847
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/bofolder_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/insert_16x16.png b/DevApp/Gs.DevApp/Resources/insert_16x16.png
new file mode 100644
index 0000000..6449b3e
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/insert_16x16.png
Binary files differ
--
Gitblit v1.9.3