From ebc92c534291a81c6bc8e365f89799d7cfae0e5d Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 18 十二月 2025 19:43:08 +0800
Subject: [PATCH] 1、更新查询审核和未审核单据
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs | 122 +++++++++++
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 91 +++++--
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 28 ++
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 276 ++++++++++++------------
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx | 129 +++++++----
5 files changed, 429 insertions(+), 217 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
index 2f01e48..e0acd3c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
@@ -22,6 +22,8 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.btnQueryChkClick += ToolBarMenu1_btnQueryChkClick;
+ toolBarMenu1.btnQueryFchkClick += ToolBarMenu1_btnQueryFchkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
this.toolBarMenu1.getXmlConfig();
@@ -127,6 +129,28 @@
_toolCk(0);
}
+ /// <summary>
+ /// 鏌ヨ瀹℃牳
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnQueryChkClick(object sender, EventArgs e)
+ {
+ getPageQueryList(1);
+
+ }
+ /// <summary>
+ /// 鏌ヨ鏈鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnQueryFchkClick(object sender, EventArgs e)
+ {
+ getPageQueryList(0);
+
+ }
/// <summary>
/// 鍒锋柊浜嬩欢
@@ -161,7 +185,7 @@
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
_sbSqlWhere.Append(" and a.receiveOrgId in");
_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
- _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -196,6 +220,102 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void getPageQueryList(int curPage)
+ {
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.receiveOrgId in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(" and isnull(A.STATUS,0) =");
+ _sbSqlWhere.Append(curPage);
+ PageQueryModel pgq = new PageQueryModel(1, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
+ string json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
+ ReturnModel<PageListModel> 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)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageQueryFchkList(int curPage)
+ {
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.receiveOrgId in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+
+ _sbSqlWhere.Append(" and isnull(A.STATUS,0) =0");
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
+ string json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ string strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
+ ReturnModel<PageListModel> 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)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
private void getModel(string strGuid)
{
bool isEdit = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 729d511..eb31456 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -247,6 +247,7 @@
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
this.layout99 = new DevExpress.XtraLayout.LayoutControl();
+ this.ucBtnPrintOne1 = new Gs.DevApp.UserControl.UcBtnPrintOne();
this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
@@ -275,6 +276,7 @@
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvAbtGuid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -323,8 +325,6 @@
this.gv_hbdy = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
- this.ucBtnPrintOne1 = new Gs.DevApp.UserControl.UcBtnPrintOne();
- this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -470,6 +470,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
@@ -479,7 +480,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -1091,7 +1091,7 @@
//
this.xtraTabPage4.Controls.Add(this.gcMxL1);
this.xtraTabPage4.Name = "xtraTabPage4";
- this.xtraTabPage4.Size = new System.Drawing.Size(1353, 390);
+ this.xtraTabPage4.Size = new System.Drawing.Size(1353, 350);
this.xtraTabPage4.Text = "鏉ユ枡鏄庣粏";
//
// gcMxL1
@@ -1106,7 +1106,7 @@
this.repositoryItemButtonEdit5,
this.repositoryItemButtonEdit6,
this.repositoryItemComboBox3});
- this.gcMxL1.Size = new System.Drawing.Size(1353, 390);
+ this.gcMxL1.Size = new System.Drawing.Size(1353, 350);
this.gcMxL1.TabIndex = 2;
this.gcMxL1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMxL1});
@@ -1417,7 +1417,7 @@
//
this.xtraTabPage6.Controls.Add(this.gcMxL3);
this.xtraTabPage6.Name = "xtraTabPage6";
- this.xtraTabPage6.Size = new System.Drawing.Size(1353, 390);
+ this.xtraTabPage6.Size = new System.Drawing.Size(1353, 350);
this.xtraTabPage6.Text = "宸叉墦鏉＄爜鏄庣粏";
//
// gcMxL3
@@ -1428,7 +1428,7 @@
this.gcMxL3.MainView = this.gvMxL3;
this.gcMxL3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMxL3.Name = "gcMxL3";
- this.gcMxL3.Size = new System.Drawing.Size(1353, 390);
+ this.gcMxL3.Size = new System.Drawing.Size(1353, 350);
this.gcMxL3.TabIndex = 1;
this.gcMxL3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMxL3});
@@ -2026,7 +2026,7 @@
this.splitContainerControl1.Panel2.Controls.Add(this.gcMx3);
this.splitContainerControl1.Panel2.Text = "Panel2";
this.splitContainerControl1.Size = new System.Drawing.Size(1353, 447);
- this.splitContainerControl1.SplitterPosition = 190;
+ this.splitContainerControl1.SplitterPosition = 111;
this.splitContainerControl1.TabIndex = 0;
//
// lay99
@@ -2048,7 +2048,7 @@
this.lay99.Name = "lay99";
this.lay99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(684, 503, 650, 400);
this.lay99.Root = this.layoutControlGroup3;
- this.lay99.Size = new System.Drawing.Size(1353, 190);
+ this.lay99.Size = new System.Drawing.Size(1353, 111);
this.lay99.TabIndex = 0;
this.lay99.Text = "layoutControl2";
//
@@ -2056,22 +2056,22 @@
//
this.ucBtnPrintOne2.allClickKey = null;
this.ucBtnPrintOne2.guidKey = null;
- this.ucBtnPrintOne2.Location = new System.Drawing.Point(1011, 12);
+ this.ucBtnPrintOne2.Location = new System.Drawing.Point(999, 12);
this.ucBtnPrintOne2.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrintOne2.Name = "ucBtnPrintOne2";
this.ucBtnPrintOne2.rptParameter = null;
- this.ucBtnPrintOne2.Size = new System.Drawing.Size(330, 52);
+ this.ucBtnPrintOne2.Size = new System.Drawing.Size(325, 28);
this.ucBtnPrintOne2.TabIndex = 485;
//
// layoutControl2
//
this.layoutControl2.Controls.Add(this.txt_iCount_2);
this.layoutControl2.Controls.Add(this.txt_yuliang_2);
- this.layoutControl2.Location = new System.Drawing.Point(678, 68);
+ this.layoutControl2.Location = new System.Drawing.Point(670, 44);
this.layoutControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutControl2.Name = "layoutControl2";
this.layoutControl2.Root = this.layoutControlGroup4;
- this.layoutControl2.Size = new System.Drawing.Size(329, 53);
+ this.layoutControl2.Size = new System.Drawing.Size(325, 28);
this.layoutControl2.TabIndex = 478;
this.layoutControl2.Text = "layoutControl2";
//
@@ -2083,7 +2083,7 @@
this.txt_iCount_2.Properties.Appearance.Options.UseFont = true;
this.txt_iCount_2.Properties.ReadOnly = true;
this.txt_iCount_2.Properties.UseMaskAsDisplayFormat = true;
- this.txt_iCount_2.Size = new System.Drawing.Size(76, 20);
+ this.txt_iCount_2.Size = new System.Drawing.Size(74, 20);
this.txt_iCount_2.StyleController = this.layoutControl2;
this.txt_iCount_2.TabIndex = 264;
this.txt_iCount_2.Tag = "ReadOnly";
@@ -2091,11 +2091,11 @@
//
// txt_yuliang_2
//
- this.txt_yuliang_2.Location = new System.Drawing.Point(250, 2);
+ this.txt_yuliang_2.Location = new System.Drawing.Point(248, 2);
this.txt_yuliang_2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_yuliang_2.Name = "txt_yuliang_2";
this.txt_yuliang_2.Properties.ReadOnly = true;
- this.txt_yuliang_2.Size = new System.Drawing.Size(77, 20);
+ this.txt_yuliang_2.Size = new System.Drawing.Size(75, 20);
this.txt_yuliang_2.StyleController = this.layoutControl2;
this.txt_yuliang_2.TabIndex = 265;
//
@@ -2120,7 +2120,7 @@
this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition5});
this.layoutControlGroup4.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup4.Size = new System.Drawing.Size(329, 53);
+ this.layoutControlGroup4.Size = new System.Drawing.Size(325, 28);
this.layoutControlGroup4.TextVisible = false;
//
// layoutControlItem31
@@ -2128,23 +2128,23 @@
this.layoutControlItem31.Control = this.txt_iCount_2;
this.layoutControlItem31.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem31.Name = "layoutControlItem26";
- this.layoutControlItem31.Size = new System.Drawing.Size(164, 53);
+ this.layoutControlItem31.Size = new System.Drawing.Size(162, 28);
this.layoutControlItem31.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem31.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_yuliang_2;
- this.layoutControlItem32.Location = new System.Drawing.Point(164, 0);
+ this.layoutControlItem32.Location = new System.Drawing.Point(162, 0);
this.layoutControlItem32.Name = "layoutControlItem27";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem32.Size = new System.Drawing.Size(165, 53);
+ this.layoutControlItem32.Size = new System.Drawing.Size(163, 28);
this.layoutControlItem32.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem32.TextSize = new System.Drawing.Size(72, 14);
//
// radOut2
//
- this.radOut2.Location = new System.Drawing.Point(1011, 68);
+ this.radOut2.Location = new System.Drawing.Point(999, 44);
this.radOut2.Margin = new System.Windows.Forms.Padding(0);
this.radOut2.Name = "radOut2";
this.radOut2.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2153,7 +2153,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut2.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut2.Size = new System.Drawing.Size(330, 53);
+ this.radOut2.Size = new System.Drawing.Size(325, 28);
this.radOut2.StyleController = this.lay99;
this.radOut2.TabIndex = 477;
//
@@ -2161,11 +2161,11 @@
//
this.ucBtnPrint2.allClickKey = null;
this.ucBtnPrint2.guidKey = null;
- this.ucBtnPrint2.Location = new System.Drawing.Point(1011, 125);
+ this.ucBtnPrint2.Location = new System.Drawing.Point(999, 76);
this.ucBtnPrint2.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint2.Name = "ucBtnPrint2";
this.ucBtnPrint2.rptParameter = null;
- this.ucBtnPrint2.Size = new System.Drawing.Size(330, 53);
+ this.ucBtnPrint2.Size = new System.Drawing.Size(325, 28);
this.ucBtnPrint2.TabIndex = 6;
//
// txtItemNo
@@ -2174,71 +2174,71 @@
this.txtItemNo.Name = "txtItemNo";
this.txtItemNo.Properties.ReadOnly = true;
this.txtItemNo.Properties.Tag = "ReadOnly";
- this.txtItemNo.Size = new System.Drawing.Size(245, 20);
+ this.txtItemNo.Size = new System.Drawing.Size(241, 20);
this.txtItemNo.StyleController = this.lay99;
this.txtItemNo.TabIndex = 4;
//
// txtItemName
//
- this.txtItemName.Location = new System.Drawing.Point(96, 68);
+ this.txtItemName.Location = new System.Drawing.Point(96, 44);
this.txtItemName.Name = "txtItemName";
this.txtItemName.Properties.ReadOnly = true;
- this.txtItemName.Size = new System.Drawing.Size(245, 20);
+ this.txtItemName.Size = new System.Drawing.Size(241, 20);
this.txtItemName.StyleController = this.lay99;
this.txtItemName.TabIndex = 5;
this.txtItemName.Tag = "ReadOnly";
//
// txt_kQtyHb
//
- this.txt_kQtyHb.Location = new System.Drawing.Point(762, 12);
+ this.txt_kQtyHb.Location = new System.Drawing.Point(754, 12);
this.txt_kQtyHb.Name = "txt_kQtyHb";
this.txt_kQtyHb.Properties.ReadOnly = true;
- this.txt_kQtyHb.Size = new System.Drawing.Size(245, 20);
+ this.txt_kQtyHb.Size = new System.Drawing.Size(241, 20);
this.txt_kQtyHb.StyleController = this.lay99;
this.txt_kQtyHb.TabIndex = 479;
this.txt_kQtyHb.Tag = "ReadOnly";
//
// txt_psnQty_2
//
- this.txt_psnQty_2.Location = new System.Drawing.Point(762, 125);
+ this.txt_psnQty_2.Location = new System.Drawing.Point(754, 76);
this.txt_psnQty_2.Name = "txt_psnQty_2";
- this.txt_psnQty_2.Size = new System.Drawing.Size(245, 20);
+ this.txt_psnQty_2.Size = new System.Drawing.Size(241, 20);
this.txt_psnQty_2.StyleController = this.lay99;
this.txt_psnQty_2.TabIndex = 480;
//
// txtItemModel
//
- this.txtItemModel.Location = new System.Drawing.Point(96, 125);
+ this.txtItemModel.Location = new System.Drawing.Point(96, 76);
this.txtItemModel.Name = "txtItemModel";
this.txtItemModel.Properties.ReadOnly = true;
- this.txtItemModel.Size = new System.Drawing.Size(245, 20);
+ this.txtItemModel.Size = new System.Drawing.Size(241, 20);
this.txtItemModel.StyleController = this.lay99;
this.txtItemModel.TabIndex = 481;
//
// txtQuantityHb
//
- this.txtQuantityHb.Location = new System.Drawing.Point(429, 12);
+ this.txtQuantityHb.Location = new System.Drawing.Point(425, 12);
this.txtQuantityHb.Name = "txtQuantityHb";
this.txtQuantityHb.Properties.ReadOnly = true;
- this.txtQuantityHb.Size = new System.Drawing.Size(245, 20);
+ this.txtQuantityHb.Size = new System.Drawing.Size(241, 20);
this.txtQuantityHb.StyleController = this.lay99;
this.txtQuantityHb.TabIndex = 482;
//
// txt_yQtyHb
//
- this.txt_yQtyHb.Location = new System.Drawing.Point(429, 68);
+ this.txt_yQtyHb.Location = new System.Drawing.Point(425, 44);
this.txt_yQtyHb.Name = "txt_yQtyHb";
this.txt_yQtyHb.Properties.ReadOnly = true;
- this.txt_yQtyHb.Size = new System.Drawing.Size(245, 20);
+ this.txt_yQtyHb.Size = new System.Drawing.Size(241, 20);
this.txt_yQtyHb.StyleController = this.lay99;
this.txt_yQtyHb.TabIndex = 483;
//
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(429, 125);
+ this.txt_releaseNo.Location = new System.Drawing.Point(425, 76);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.ReadOnly = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(245, 20);
+ this.txt_releaseNo.Size = new System.Drawing.Size(241, 20);
this.txt_releaseNo.StyleController = this.lay99;
this.txt_releaseNo.TabIndex = 484;
//
@@ -2285,17 +2285,17 @@
rowDefinition6,
rowDefinition7,
rowDefinition8});
- this.layoutControlGroup3.Size = new System.Drawing.Size(1353, 190);
+ this.layoutControlGroup3.Size = new System.Drawing.Size(1336, 116);
this.layoutControlGroup3.TextVisible = false;
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.layoutControl2;
- this.layoutControlItem33.Location = new System.Drawing.Point(666, 56);
+ this.layoutControlItem33.Location = new System.Drawing.Point(658, 32);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem33.Size = new System.Drawing.Size(333, 57);
+ this.layoutControlItem33.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem33.Text = "鎵撳嵃寮犳暟";
this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem33.TextVisible = false;
@@ -2304,22 +2304,22 @@
//
this.layoutControlItem30.Control = this.radOut2;
this.layoutControlItem30.CustomizationFormText = "鎵撳嵃妯″紡";
- this.layoutControlItem30.Location = new System.Drawing.Point(999, 56);
+ this.layoutControlItem30.Location = new System.Drawing.Point(987, 32);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem30.Size = new System.Drawing.Size(334, 57);
+ this.layoutControlItem30.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem30.TextVisible = false;
//
// layoutControlItem29
//
this.layoutControlItem29.Control = this.ucBtnPrint2;
- this.layoutControlItem29.Location = new System.Drawing.Point(999, 113);
+ this.layoutControlItem29.Location = new System.Drawing.Point(987, 64);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem29.Size = new System.Drawing.Size(334, 57);
+ this.layoutControlItem29.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem29.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem29.TextVisible = false;
@@ -2327,10 +2327,10 @@
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txtItemName;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(333, 57);
+ this.layoutControlItem28.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem28.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem28.TextSize = new System.Drawing.Size(72, 14);
//
@@ -2339,89 +2339,89 @@
this.layoutControlItem9.Control = this.txtItemNo;
this.layoutControlItem9.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.Size = new System.Drawing.Size(333, 56);
+ this.layoutControlItem9.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem9.Text = "鐗╂枡缂栧彿";
this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_kQtyHb;
- this.layoutControlItem34.Location = new System.Drawing.Point(666, 0);
+ this.layoutControlItem34.Location = new System.Drawing.Point(658, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem34.Size = new System.Drawing.Size(333, 56);
+ this.layoutControlItem34.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem34.Text = "鍙墦鍗版暟";
this.layoutControlItem34.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem36
//
this.layoutControlItem36.Control = this.txtItemModel;
- this.layoutControlItem36.Location = new System.Drawing.Point(0, 113);
+ this.layoutControlItem36.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem36.Name = "layoutControlItem36";
this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem36.Size = new System.Drawing.Size(333, 57);
+ this.layoutControlItem36.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem36.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem36.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem37
//
this.layoutControlItem37.Control = this.txtQuantityHb;
- this.layoutControlItem37.Location = new System.Drawing.Point(333, 0);
+ this.layoutControlItem37.Location = new System.Drawing.Point(329, 0);
this.layoutControlItem37.Name = "layoutControlItem37";
this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem37.Size = new System.Drawing.Size(333, 56);
+ this.layoutControlItem37.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem37.Text = "鏀惰揣鎬绘暟";
this.layoutControlItem37.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.txt_yQtyHb;
- this.layoutControlItem38.Location = new System.Drawing.Point(333, 56);
+ this.layoutControlItem38.Location = new System.Drawing.Point(329, 32);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem38.Size = new System.Drawing.Size(333, 57);
+ this.layoutControlItem38.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem38.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem38.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem39
//
this.layoutControlItem39.Control = this.txt_releaseNo;
- this.layoutControlItem39.Location = new System.Drawing.Point(333, 113);
+ this.layoutControlItem39.Location = new System.Drawing.Point(329, 64);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem39.Size = new System.Drawing.Size(333, 57);
+ this.layoutControlItem39.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem39.Text = "妫�楠屽崟鍙�";
this.layoutControlItem39.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.txt_psnQty_2;
- this.layoutControlItem35.Location = new System.Drawing.Point(666, 113);
+ this.layoutControlItem35.Location = new System.Drawing.Point(658, 64);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem35.Size = new System.Drawing.Size(333, 57);
+ this.layoutControlItem35.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem35.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem35.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem40
//
- this.layoutControlItem40.Location = new System.Drawing.Point(999, 0);
+ this.layoutControlItem40.Location = new System.Drawing.Point(987, 0);
this.layoutControlItem40.Name = "layoutControlItem40";
this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem40.Size = new System.Drawing.Size(334, 56);
+ this.layoutControlItem40.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem40.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem40.TextVisible = false;
//
// layoutControlItem41
//
this.layoutControlItem41.Control = this.ucBtnPrintOne2;
- this.layoutControlItem41.Location = new System.Drawing.Point(999, 0);
+ this.layoutControlItem41.Location = new System.Drawing.Point(987, 0);
this.layoutControlItem41.Name = "layoutControlItem41";
this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem41.Size = new System.Drawing.Size(334, 56);
+ this.layoutControlItem41.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem41.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem41.TextVisible = false;
//
@@ -2437,7 +2437,7 @@
this.repositoryItemButtonEdit3,
this.repositoryItemButtonEdit4,
this.repositoryItemComboBox2});
- this.gcMx3.Size = new System.Drawing.Size(1353, 247);
+ this.gcMx3.Size = new System.Drawing.Size(1353, 326);
this.gcMx3.TabIndex = 2;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -2714,7 +2714,7 @@
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split99.Size = new System.Drawing.Size(1353, 447);
- this.split99.SplitterPosition = 136;
+ this.split99.SplitterPosition = 112;
this.split99.TabIndex = 2;
//
// layout99
@@ -2739,19 +2739,30 @@
this.layout99.Name = "layout99";
this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(31, 355, 812, 500);
this.layout99.Root = this.layoutControlGroup1;
- this.layout99.Size = new System.Drawing.Size(1353, 136);
+ this.layout99.Size = new System.Drawing.Size(1353, 112);
this.layout99.TabIndex = 0;
this.layout99.Text = "layoutControl1";
+ //
+ // ucBtnPrintOne1
+ //
+ this.ucBtnPrintOne1.allClickKey = null;
+ this.ucBtnPrintOne1.guidKey = null;
+ this.ucBtnPrintOne1.Location = new System.Drawing.Point(999, 76);
+ this.ucBtnPrintOne1.Margin = new System.Windows.Forms.Padding(0);
+ this.ucBtnPrintOne1.Name = "ucBtnPrintOne1";
+ this.ucBtnPrintOne1.rptParameter = null;
+ this.ucBtnPrintOne1.Size = new System.Drawing.Size(325, 28);
+ this.ucBtnPrintOne1.TabIndex = 478;
//
// layoutControl1
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(678, 89);
+ this.layoutControl1.Location = new System.Drawing.Point(670, 76);
this.layoutControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(329, 35);
+ this.layoutControl1.Size = new System.Drawing.Size(325, 28);
this.layoutControl1.TabIndex = 477;
this.layoutControl1.Text = "layoutControl1";
//
@@ -2763,7 +2774,7 @@
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
this.txt_iCount_1.Properties.ReadOnly = true;
this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(76, 20);
+ this.txt_iCount_1.Size = new System.Drawing.Size(74, 20);
this.txt_iCount_1.StyleController = this.layoutControl1;
this.txt_iCount_1.TabIndex = 264;
this.txt_iCount_1.Tag = "ReadOnly";
@@ -2771,11 +2782,11 @@
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(250, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(248, 2);
this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(77, 20);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(75, 20);
this.txt_yuliang_1.StyleController = this.layoutControl1;
this.txt_yuliang_1.TabIndex = 265;
//
@@ -2800,7 +2811,7 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition9});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(329, 35);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(325, 28);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem26
@@ -2808,17 +2819,17 @@
this.layoutControlItem26.Control = this.txt_iCount_1;
this.layoutControlItem26.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.Size = new System.Drawing.Size(164, 35);
+ this.layoutControlItem26.Size = new System.Drawing.Size(162, 28);
this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem26.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_yuliang_1;
- this.layoutControlItem27.Location = new System.Drawing.Point(164, 0);
+ this.layoutControlItem27.Location = new System.Drawing.Point(162, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem27.Size = new System.Drawing.Size(165, 35);
+ this.layoutControlItem27.Size = new System.Drawing.Size(163, 28);
this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(72, 14);
//
@@ -2837,16 +2848,16 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1010, 48);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(998, 42);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = "rpt_daa";
- this.ucBtnPrint1.Size = new System.Drawing.Size(332, 39);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(327, 32);
this.ucBtnPrint1.TabIndex = 232;
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1012, 10);
+ this.radOut.Location = new System.Drawing.Point(1000, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2855,18 +2866,18 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(331, 38);
+ this.radOut.Size = new System.Drawing.Size(326, 32);
this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 476;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(762, 50);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(754, 44);
this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(245, 20);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(241, 20);
this.txt_psnQty_1.StyleController = this.layout99;
this.txt_psnQty_1.TabIndex = 263;
this.txt_psnQty_1.Tag = "ReadOnly";
@@ -2879,64 +2890,64 @@
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(245, 20);
+ this.txtWlid.Size = new System.Drawing.Size(241, 20);
this.txtWlid.StyleController = this.layout99;
this.txtWlid.TabIndex = 214;
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(96, 50);
+ this.txtWlmc.Location = new System.Drawing.Point(96, 44);
this.txtWlmc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(245, 20);
+ this.txtWlmc.Size = new System.Drawing.Size(241, 20);
this.txtWlmc.StyleController = this.layout99;
this.txtWlmc.TabIndex = 216;
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(96, 89);
+ this.txtWlgg.Location = new System.Drawing.Point(96, 76);
this.txtWlgg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(578, 20);
+ this.txtWlgg.Size = new System.Drawing.Size(570, 20);
this.txtWlgg.StyleController = this.layout99;
this.txtWlgg.TabIndex = 218;
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(762, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(754, 12);
this.txt_kQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(245, 20);
+ this.txt_kQty.Size = new System.Drawing.Size(241, 20);
this.txt_kQty.StyleController = this.layout99;
this.txt_kQty.TabIndex = 224;
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(429, 12);
+ this.txtQuantity.Location = new System.Drawing.Point(425, 12);
this.txtQuantity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(245, 20);
+ this.txtQuantity.Size = new System.Drawing.Size(241, 20);
this.txtQuantity.StyleController = this.layout99;
this.txtQuantity.TabIndex = 220;
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(429, 50);
+ this.txt_yQty.Location = new System.Drawing.Point(425, 44);
this.txt_yQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(245, 20);
+ this.txt_yQty.Size = new System.Drawing.Size(241, 20);
this.txt_yQty.StyleController = this.layout99;
this.txt_yQty.TabIndex = 222;
//
@@ -2993,7 +3004,7 @@
rowDefinition10,
rowDefinition11,
rowDefinition12});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1353, 136);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 116);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem15
@@ -3001,81 +3012,81 @@
this.layoutControlItem15.Control = this.txtWlid;
this.layoutControlItem15.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.Size = new System.Drawing.Size(333, 38);
+ this.layoutControlItem15.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem15.Text = "鐗╂枡缂栧彿";
this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txtWlmc;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 38);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(333, 39);
+ this.layoutControlItem16.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem16.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txtWlgg;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 77);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(666, 39);
+ this.layoutControlItem17.Size = new System.Drawing.Size(658, 32);
this.layoutControlItem17.Text = "鐗╂枡瑙勬牸123";
this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txtQuantity;
- this.layoutControlItem18.Location = new System.Drawing.Point(333, 0);
+ this.layoutControlItem18.Location = new System.Drawing.Point(329, 0);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.Size = new System.Drawing.Size(333, 38);
+ this.layoutControlItem18.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺";
this.layoutControlItem18.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_yQty;
- this.layoutControlItem19.Location = new System.Drawing.Point(333, 38);
+ this.layoutControlItem19.Location = new System.Drawing.Point(329, 32);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(333, 39);
+ this.layoutControlItem19.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_kQty;
- this.layoutControlItem20.Location = new System.Drawing.Point(666, 0);
+ this.layoutControlItem20.Location = new System.Drawing.Point(658, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(333, 38);
+ this.layoutControlItem20.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem20.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_psnQty_1;
- this.layoutControlItem21.Location = new System.Drawing.Point(666, 38);
+ this.layoutControlItem21.Location = new System.Drawing.Point(658, 32);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(333, 39);
+ this.layoutControlItem21.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem21.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.radOut;
- this.layoutControlItem22.Location = new System.Drawing.Point(999, 0);
+ this.layoutControlItem22.Location = new System.Drawing.Point(987, 0);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
- this.layoutControlItem22.Size = new System.Drawing.Size(334, 38);
+ this.layoutControlItem22.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem22.Text = "鑷姩璁＄畻";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -3083,12 +3094,12 @@
// layoutControlItem23
//
this.layoutControlItem23.Control = this.ucBtnPrint1;
- this.layoutControlItem23.Location = new System.Drawing.Point(999, 38);
+ this.layoutControlItem23.Location = new System.Drawing.Point(987, 32);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
- this.layoutControlItem23.Size = new System.Drawing.Size(334, 39);
+ this.layoutControlItem23.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -3096,14 +3107,25 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.layoutControl1;
- this.layoutControlItem25.Location = new System.Drawing.Point(666, 77);
+ this.layoutControlItem25.Location = new System.Drawing.Point(658, 64);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem25.Size = new System.Drawing.Size(333, 39);
+ this.layoutControlItem25.Size = new System.Drawing.Size(329, 32);
this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
+ //
+ // layoutControlItem42
+ //
+ this.layoutControlItem42.Control = this.ucBtnPrintOne1;
+ this.layoutControlItem42.Location = new System.Drawing.Point(987, 64);
+ this.layoutControlItem42.Name = "layoutControlItem42";
+ this.layoutControlItem42.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem42.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem42.Size = new System.Drawing.Size(329, 32);
+ this.layoutControlItem42.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem42.TextVisible = false;
//
// gcMx1
//
@@ -3117,7 +3139,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemButtonEdit2,
this.repositoryItemComboBox1});
- this.gcMx1.Size = new System.Drawing.Size(1353, 301);
+ this.gcMx1.Size = new System.Drawing.Size(1353, 325);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -3635,28 +3657,6 @@
this.gv_hbdy.Visible = true;
this.gv_hbdy.VisibleIndex = 13;
//
- // ucBtnPrintOne1
- //
- this.ucBtnPrintOne1.allClickKey = null;
- this.ucBtnPrintOne1.guidKey = null;
- this.ucBtnPrintOne1.Location = new System.Drawing.Point(1011, 89);
- this.ucBtnPrintOne1.Margin = new System.Windows.Forms.Padding(0);
- this.ucBtnPrintOne1.Name = "ucBtnPrintOne1";
- this.ucBtnPrintOne1.rptParameter = null;
- this.ucBtnPrintOne1.Size = new System.Drawing.Size(330, 35);
- this.ucBtnPrintOne1.TabIndex = 478;
- //
- // layoutControlItem42
- //
- this.layoutControlItem42.Control = this.ucBtnPrintOne1;
- this.layoutControlItem42.Location = new System.Drawing.Point(999, 77);
- this.layoutControlItem42.Name = "layoutControlItem42";
- this.layoutControlItem42.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem42.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem42.Size = new System.Drawing.Size(334, 39);
- this.layoutControlItem42.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem42.TextVisible = false;
- //
// Frm_ArrivalBarcode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -3812,6 +3812,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
@@ -3821,7 +3822,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 8536b36..071ee44 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -79,6 +79,8 @@
this.btnBaoGao = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnBDLingLiao = new DevExpress.XtraBars.BarLargeButtonItem();
this.btnWj = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnPCcxpx = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnRiJiHua = new DevExpress.XtraBars.BarLargeButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -87,8 +89,8 @@
this.barLargeButtonItem5 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem6 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem7 = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnPCcxpx = new DevExpress.XtraBars.BarLargeButtonItem();
- this.btnRiJiHua = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnQueryChk = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.btnQueryFchk = new DevExpress.XtraBars.BarLargeButtonItem();
((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
this.SuspendLayout();
//
@@ -154,9 +156,11 @@
this.btnWj,
this.barButtonItem1,
this.btnPCcxpx,
- this.btnRiJiHua});
+ this.btnRiJiHua,
+ this.btnQueryChk,
+ this.btnQueryFchk});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 82;
+ this.barManager1.MaxItemId = 84;
//
// bar2
//
@@ -216,7 +220,9 @@
new DevExpress.XtraBars.LinkPersistInfo(this.btnBDLingLiao),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnWj, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnPCcxpx, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
- new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnRiJiHua, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph)});
+ new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnRiJiHua, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnQueryChk),
+ new DevExpress.XtraBars.LinkPersistInfo(this.btnQueryFchk)});
this.bar2.OptionsBar.DrawDragBorder = false;
this.bar2.OptionsBar.MultiLine = true;
this.bar2.OptionsBar.UseWholeRow = true;
@@ -666,37 +672,61 @@
this.btnWj.Name = "btnWj";
this.btnWj.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // btnPCcxpx
+ //
+ this.btnPCcxpx.Caption = "閲嶆柊鎺掑簭";
+ this.btnPCcxpx.Id = 80;
+ this.btnPCcxpx.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.sortasc_16x16;
+ this.btnPCcxpx.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.sortasc_32x32;
+ this.btnPCcxpx.Name = "btnPCcxpx";
+ this.btnPCcxpx.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ this.btnPCcxpx.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
+ // btnRiJiHua
+ //
+ this.btnRiJiHua.Caption = "鐢熸垚鏃ヨ鍒�";
+ this.btnRiJiHua.Id = 81;
+ this.btnRiJiHua.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.dayview_16x16;
+ this.btnRiJiHua.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.dayview_32x32;
+ this.btnRiJiHua.Name = "btnRiJiHua";
+ this.btnRiJiHua.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
+ this.btnRiJiHua.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ //
// barDockControlTop
//
this.barDockControlTop.CausesValidation = false;
this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
this.barDockControlTop.Manager = this.barManager1;
- this.barDockControlTop.Size = new System.Drawing.Size(1543, 213);
+ this.barDockControlTop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlTop.Size = new System.Drawing.Size(1350, 171);
//
// barDockControlBottom
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 316);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 246);
this.barDockControlBottom.Manager = this.barManager1;
- this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
+ this.barDockControlBottom.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlBottom.Size = new System.Drawing.Size(1350, 0);
//
// barDockControlLeft
//
this.barDockControlLeft.CausesValidation = false;
this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
- this.barDockControlLeft.Location = new System.Drawing.Point(0, 213);
+ this.barDockControlLeft.Location = new System.Drawing.Point(0, 171);
this.barDockControlLeft.Manager = this.barManager1;
- this.barDockControlLeft.Size = new System.Drawing.Size(0, 103);
+ this.barDockControlLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlLeft.Size = new System.Drawing.Size(0, 75);
//
// barDockControlRight
//
this.barDockControlRight.CausesValidation = false;
this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
- this.barDockControlRight.Location = new System.Drawing.Point(1543, 213);
+ this.barDockControlRight.Location = new System.Drawing.Point(1350, 171);
this.barDockControlRight.Manager = this.barManager1;
- this.barDockControlRight.Size = new System.Drawing.Size(0, 103);
+ this.barDockControlRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlRight.Size = new System.Drawing.Size(0, 75);
//
// barButtonItem1
//
@@ -735,36 +765,35 @@
this.barLargeButtonItem7.Name = "barLargeButtonItem7";
this.barLargeButtonItem7.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
- // btnPCcxpx
+ // btnQueryChk
//
- this.btnPCcxpx.Caption = "閲嶆柊鎺掑簭";
- this.btnPCcxpx.Id = 80;
- this.btnPCcxpx.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.sortasc_16x16;
- this.btnPCcxpx.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.sortasc_32x32;
- this.btnPCcxpx.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
- this.btnPCcxpx.Name = "btnPCcxpx";
- this.btnPCcxpx.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ this.btnQueryChk.Caption = "鏌ヨ瀹℃牳";
+ this.btnQueryChk.Id = 82;
+ this.btnQueryChk.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem8.ImageOptions.Image")));
+ this.btnQueryChk.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem8.ImageOptions.LargeImage")));
+ this.btnQueryChk.Name = "btnQueryChk";
+ this.btnQueryChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
- // btnRiJiHua
+ // btnQueryFchk
//
- this.btnRiJiHua.Caption = "鐢熸垚鏃ヨ鍒�";
- this.btnRiJiHua.Id = 81;
- this.btnRiJiHua.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.dayview_16x16;
- this.btnRiJiHua.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.dayview_32x32;
- this.btnRiJiHua.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
- this.btnRiJiHua.Name = "btnRiJiHua";
- this.btnRiJiHua.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
+ this.btnQueryFchk.Caption = "鏌ヨ鏈鏍�";
+ this.btnQueryFchk.Id = 83;
+ this.btnQueryFchk.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem9.ImageOptions.Image")));
+ this.btnQueryFchk.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem9.ImageOptions.LargeImage")));
+ this.btnQueryFchk.Name = "btnQueryFchk";
+ this.btnQueryFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
// UcToolBarMenu
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.barDockControlLeft);
this.Controls.Add(this.barDockControlRight);
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 316);
+ this.Size = new System.Drawing.Size(1350, 246);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -830,5 +859,7 @@
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem6;
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem7;
private DevExpress.XtraBars.BarLargeButtonItem btnRiJiHua;
+ private DevExpress.XtraBars.BarLargeButtonItem btnQueryChk;
+ private DevExpress.XtraBars.BarLargeButtonItem btnQueryFchk;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 4c9032c..cf632de 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -41,6 +41,9 @@
btnIn.ItemClick += BtnIn_ItemClick;
btnChk.ItemClick += BtnChk_ItemClick;
btnFchk.ItemClick += BtnFchk_ItemClick;
+ btnQueryChk.ItemClick += BtnQueryChk_ItemClick;
+ btnQueryFchk.ItemClick += BtnQueryFchk_ItemClick;
+
btnPiZhun.ItemClick += BtnPiZhun_ItemClick;
btnFPiZhun.ItemClick += BtnFPiZhun_ItemClick;
btnLog.ItemClick += BtnLog_ItemClick;
@@ -178,6 +181,21 @@
btnChkClick(this, e);
}
return;
+ }
+
+ private void BtnQueryChk_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnQueryChkClick != null)
+ btnQueryChkClick(this, e);
+ else
+ return;
+ }
+ private void BtnQueryFchk_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnQueryFchkClick != null)
+ btnQueryFchkClick(this, e);
+ else
+ return;
}
private void BtnFjieAn_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -928,6 +946,16 @@
public event EventHandler btnFChkClick;
/// <summary>
+ /// 鏌ヨ瀹℃牳
+ /// </summary>
+ public event EventHandler btnQueryChkClick;
+ /// <summary>
+ /// 鏌ヨ鍙嶅鏍�
+ /// </summary>
+ public event EventHandler btnQueryFchkClick;
+
+
+ /// <summary>
/// 鎵瑰噯
/// </summary>
public event EventHandler btnPiZhunClick;
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
index 6d80a7f..ec552bc 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
@@ -706,60 +706,93 @@
F2gqAAAAAElFTkSuQmCC
</value>
</data>
- <data name="btnPCcxpx.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="barLargeButtonItem8.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAWdEVYdFRpdGxlAFJhbmdlO0JhcjtDaGFydDtD+F+dAAACl0lEQVQ4T3WSyU9TURTG3x/jypUL
- F7JwYUgkQXFIHJKirRQTRYQKQpCCDFIJRWoL1JQYFVE3BkSMQGmwUClDwiBjIXEh0Y0ySEunN/S1n/ee
- toAxLn7v3Nd+3/dO7jmC/c28m4H215wvRNurNHNo7Upie8mZhbVzFo9fzBCW59NuodExiQSQhD326j8k
- UgBxIoH6Ni8E05MJ+lGUVESlGENFhGqMaoTeVaw3V2Pt+lmqYTGGOEuptY1BaLCPU8CemP2ZhgvD0SSr
- zBzzDmA1/wxCUQUqC6ixeiDwNng7JBaVFMkzFwZT+PQ5kN52wJd3mr3LUNU4qiyjEGqsY9ROiH0lbeDn
- 704rvnbewPpAC4IRGSu6bIhdVixrsxEIK1BYQGXzCIT7Fg+1E4wo2D3A2lM98KMPvg4tGZZysxB2mLCo
- OYlASIYSi6Oi6RMEY8soYmqCTFwYCMvEsl2DxEo7FmyX4GeGhcuZCFmMmL94AjtBGbKiorxx+P8Bcy3n
- kJg3Y6YphwKWjAaMZBzG4r2ivwN4GzJrx9K/hoJn0zB/8DGBhKmGLCRm6jFZl4ntXekAIrYDIo255IEL
- QhlLkZQ48h1TcH2L4Wr7OAk/G48jPlmBkYoMbDHDVkBKIWKTEWFTMtQ5IZSaXBBlFRqbF60TYVx45CHh
- cOlRJMYMcBUfIcOmP8mGP8pqlCZWVDsIoaR+iJbovNmN6qEATpmGyeAx69GjPQT3Qx02dqLEL2bk8HOQ
- 3VdhdT8EQ62TFqfQ4cWxu70osI/tG3ZEBq/7/PzNidBF36piAbdrBmlx+B6koV1gX+Ckp0KwafhDEk2F
- X/TNyo8Q9OV9Tn1ZH/LK3uMaQ8e60JX2Qlvyjrhyp2ePXEOabmiKOd3OP+hrWYEMk1JTAAAAAElFTkSu
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAedEVYdFRpdGxlAERhdGFiYXI7VmlldztGb3JtYXR0
+ aW5nO+m8qMEAAAHxSURBVDhPbdJrUxJRGAfw8zW7TGUzmV0AURIvBZlEYiJGUNObzOpFMxY1U6NimgyJ
+ YxPU58gy5LLshYV/z/MsLG714rfn7M5zm7NHpVfLhczL73j4gn1zpZ/3VfBgtYLlZ6yM1EoZS0+/isST
+ UlHFH++jCzjo4dl7dHuAjuhiNv0ZKpYtycfJyiOPcCWLcDkLzWgTW9amPtChKtHlItRcZk8KcDCbKGc8
+ NE5oWWi02oRXU1abCkRSBSgeg8fpV9Z0S8g7BTrJFupMMx1UxLY7mEnuQkVSRUzf/4SpBULr5MLOQILe
+ xTbCYscxv40JwjnqVrIg49S1E52km4Uaa5o4Zg0T1YYheG+1O1JITS/uom13Mfol5REQSwgcOPyEk3+z
+ ugnTsnEj/hEqRA/D6rhB/oOky+daFL+ODaLjkPA5BW5vDAoc1bjywBGr6b0kAz8FJVf/U2D8LoltibFY
+ /l9zeQQ9NhG8k3cKcIBu2k4nmoJHZNzN7cqo84+ew2pLDtwXXYcKzm7KLbuyn8AIK817XHbdcw2TetPC
+ tZsfoALRDbk0fwf1A4f3+uLiUg//2qszVOB6ZJ3Gact/P8m5Aw65B567YMpBj0y9hxoK5fIXQ+8wFHqL
+ C+T8eM4xlsO54BtxdvS1OBPoW8Np/xpO+V5t/QHvID4D4r+HPQAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="barLargeButtonItem8.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ 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
QmCC
</value>
</data>
- <data name="btnPCcxpx.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="barLargeButtonItem9.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAHnRFWHRUaXRsZQBEYXRhYmFy
+ O1ZpZXc7Rm9ybWF0dGluZzvpvKjBAAAB5klEQVQ4T23SW1NSURQH8P0ty0sCdjMNEaWLWpBJTlqGkY3T
+ S2n10IxFzdSomCZD2UtYnyPLkMvhcC7wb621uR3x4Xf2Ocxe/7Vms1VyLZdZfv0LT16xny3Jl00HeLx2
+ gKVVlkPiRQ6Pnv8Q88/2s2pu5TvqgEYPz7tHvQGoiTpmkl+h4k/35UeMjGnDIQ+j6hBX1rLZVqOU2FIW
+ anb5mw64Muo1FBQGF1RslCoO4dWS1aWAaCIDxWPwOM1kw7SFfNNGXWyjyAxLoxDXrWF6cQ8qmshi6sEX
+ TC4QWm8u7LbN07fYwQ2xq93fwXXCNer2YkbGKRodnaSbjQIrWzhmJQv5UlXwu+3UJEhNPdyD49IhnL8M
+ DJ4QuNThohT/Y0ULlu3i2txnqAg9qnattQn+E3wXWv4eV4mJQ8LnFLqz2Q44KnBy2xErmI2iKv4IKs6f
+ EjBxj8S3xXg83W02jbDHFsJ30zqAN5iWqzvRFDwi426trow6/244zFfkwIOxDajwzJbcMvT5tV5ft54B
+ r7PnUCzbGLn1CSoU25RL07WpsbHLmX7Bf+3wNAVcjW7QOI787530HdDkHnjugiUHPTT5ESoQSaUHIx8Q
+ iLyHn/gmUtp4CgPhd6J/7K3oCzWto3d0HT3BN9v/AS6hPkZrx7emAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="barLargeButtonItem9.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
- 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
- SUVORK5CYII=
+ YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAHnRFWHRUaXRsZQBEYXRhYmFy
+ O1ZpZXc7Rm9ybWF0dGluZzvpvKjBAAAFNElEQVRYR72WeVNUVxDFLYkLblm+VTbNYqKgiUtcohgFxRUE
+ 2QSKHSXKWhENRBQwRhOUJIKUxpiYfAxlnWFxdqbTp/u+9+7AAKV/ZKp+1X3fe9Pn9H137p1l/Fne3vPs
+ wbVb/9JiXAW9c+gx9P5D7aBnYa50OzwT2rqeDrB2CgyktN34m/7vT2PHE2LtFTDwRmuXGohEZikciRmc
+ HNEmRqGE+zoO8TgUNmOOixGPx+nStT9gYKUYaL7+F8XZAIrSV18nYb+LiqlQmIsBu3gwSQyGo2aMGKVZ
+ NvCtbaCp8ym7IiksQkdPEGUlYTcbSChsEVIREQuZsVwzEdfMPRhoaH8MA6tgYEVjx59qgB+ACGUdVzLn
+ sGufEYlRwBEGLBDgwrgWMIIB55qbKy9hYDZOF6488gxc/v6JGMAXIaKC2YkcYXbu1Rng51TYAFHT3XxB
+ JqgxgMjAQN13Q54BvA8YgHuIKHsS2aG4U2w6d+HC6FjFIhpdnHGEZgIRirGB2raHMLAaBlY2XH0sK9Nx
+ rZ1pYXusU2q6DELMyVUIOeIMhIwoBGesa9OOgdZBz8DF9keyMKSIKeR05AnrPe0kURDMBIwIC0DEy6M6
+ NiCPxuJU3TwAA6kwsKqe30dty0OqaWVaBg2JeXXzIFVzLlEYoOqmQariWNVk0Wiw8srGB8plMEAViHzf
+ NVDXNiQLQ6crktCpPX3Ou5RupSMvR2dg6iVHBnEhorFZNvG7Z6CWO8d7cYrodNoiGu3pdJ4VrOKTSfLJ
+ Gc0dItFZKr/0GwysgYHVmFrHAKV/SZSWjC+UrcnY7iIiEDT4regQZgNlDb96BvC+Yrww4FYK7j80hwyP
+ fck4qHy+jfzTRsiKPsnD7jVs+aUX+2FgLQykYoFgZcIpbeFOFhLYm4wDRHsMn6WTj4VEcFqjb15UAyX1
+ 9z0DpQ398l5wE10sKJAAH1LAPrQ2p3GNkDAxxUAUUXJmMiw5NrFzNX0wsE4MlFy4L658U2HpQklTuOh8
+ ti7AFk/QiI6bHHF8EiZCsq/kV/3sGlhTzNOhBtg9P4Dp8ksniJg6zQG6QmERQle2gAPXGJ8KcgRzcgY/
+ 5bOVYmC9GCis7ZM/FBM8AygmUwhBjCUaIVeQixkhdCTFzbUxEfLA2MUP1EBu5V3XwNoCNoBFgZkoqe+X
+ qLnG4jpwz6XIikKtRc09QkOgiN9zoUN1HxWYvIDznPKfPAP51b/IwhhndwlTJtF0xfmYdKhjJUSjbh7k
+ PECj3KULXxvBdX+ARng84uPcF+L9Jko5ZWJgAwysy+MFgYWB6cE0OdM7BlFLQEVMFAEWNNcg4giLmCWq
+ OYOcwYZ3uvS2ZyC34q6cbDBAmzbP4VOijQvxifLhEnzwscswG8CGd+q8GHgTBtbnVNyRhTHKN6Xw9l2G
+ ncq2JUjfsTjOdv7+R2wgINv1yZJbloHyO3L4YHrE8esKLAa2+Pc20YsJNXC8WAy8Nd8Apup1BZbi3Y3J
+ DZwpuy3nPd4Ppikp7H5JWGApYMDHZ052Ua9rYAMWBH4aMOARoGF+eHiCc0Qe48sSzT2MX/B9jTZBem7y
+ 5+OMdQ85Dqzswh5vBk6e/5Gm+Kfh/JEQeCxnu4VfIm/PzCQXAXLM4gQE2DWd3L4meDssdtSjBZ6B1MO5
+ HYPHCnvpGLtSuvmBbsrih7IKblLWOSb/JmXm36AjII8520WH87roG47gUO51JecHyjgDOimD84MchdOd
+ dACc6hB2Z7YMsbYcx8thgsGmgJ8FgLNX4e1X4B0G32HxZSn/Ae1pUh58hUWjAAAAAElFTkSuQmCC
</value>
</data>
<data name="barButtonItem1.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--
Gitblit v1.9.3