From efce6f32ed2631903727a9919b681f4ab5fac346 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 17 十二月 2024 08:08:27 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs | 6
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 295 ++++++++++++++++++++++++++--
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs | 19 +
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs | 37 +--
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs | 6
DevApp/Gs.DevApp/Gs.DevApp.csproj | 6
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs | 35 +-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 78 +++++++
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs | 23 +
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs | 44 +--
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 29 ++
11 files changed, 460 insertions(+), 118 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
index 3822239..51f7a5b 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
@@ -20,8 +20,17 @@
InitializeComponent();
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ });
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ });
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
@@ -44,7 +53,7 @@
var rowGuid =
UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
if (!string.IsNullOrEmpty(rowGuid))
- getModel(rowGuid, false, 999);
+ getModel(rowGuid);
}
/// <summary>
@@ -91,7 +100,7 @@
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
else
{
_filterList.Clear();
@@ -148,14 +157,16 @@
}
}
- private void getModel(string strGuid, bool isEdit, int tabIdx)
+ 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;
}
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
guid = strGuid //涓诲缓
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
index bfbfc71..37c3f53 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
@@ -16,14 +16,22 @@
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesItemsManager/";
-
public Frm_MesItems()
{
InitializeComponent();
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ });
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ });
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
@@ -33,19 +41,6 @@
Task.Delay(100);
getPageList(1);
}
- /// <summary>
- /// 鍙屽嚮浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
- {
- var rowGuid =
- UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
- if (!string.IsNullOrEmpty(rowGuid))
- getModel(rowGuid, false, 999);
- }
-
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -90,7 +85,7 @@
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
else
{
_filterList.Clear();
@@ -110,7 +105,6 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc",
"", _sbSqlWhere.ToString());
@@ -148,15 +142,16 @@
}
}
- private void getModel(string strGuid, bool isEdit, int tabIdx)
+ 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;
}
-
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
guid = strGuid //涓诲缓
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
index 68f933c..8582308 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
@@ -24,7 +24,14 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
- getModel(value, false, 999);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ });
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -81,7 +88,7 @@
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
else
{
_filterList.Clear();
@@ -143,14 +150,16 @@
/// <param name="strGuid">涓婚敭</param>
/// <param name="isEdit">鏄惁鍙紪杈�</param>
/// <param name="tabIdx">閫夐」鍗″簭鍙�</param>
- private void getModel(string strGuid, bool isEdit, int tabIdx)
+ 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 //涓诲缓
@@ -177,7 +186,5 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
index 638ef0a..481a6c3 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -369,13 +369,13 @@
this.gv_startDate.AppearanceCell.Options.UseFont = true;
this.gv_startDate.Caption = "浠诲矖寮�濮嬫棩鏈�";
this.gv_startDate.FieldName = "startDate";
- this.gv_startDate.MinWidth = 50;
+ this.gv_startDate.MinWidth = 180;
this.gv_startDate.Name = "gv_startDate";
this.gv_startDate.OptionsColumn.AllowEdit = false;
this.gv_startDate.Tag = "query_a.start_date";
this.gv_startDate.Visible = true;
this.gv_startDate.VisibleIndex = 9;
- this.gv_startDate.Width = 94;
+ this.gv_startDate.Width = 180;
//
// lb_phoneNumber
//
@@ -644,6 +644,7 @@
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -741,7 +742,6 @@
//
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
-
this.xtraTabPage2.Size = new System.Drawing.Size(1001, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
index 306f1c3..7b00723 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
@@ -23,12 +23,19 @@
InitializeComponent();
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-
- gridView1.CustomDrawRowIndicator +=
- GridView1_CustomDrawRowIndicator;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ });
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ });
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -36,25 +43,6 @@
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
Task.Delay(100);
getPageList(1);
- }
- private void GridView1_CustomDrawRowIndicator(object sender,
- RowIndicatorCustomDrawEventArgs e)
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
-
- /// <summary>
- /// 鍙屽嚮浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
- {
- var rowGuid =
- UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
- if (!string.IsNullOrEmpty(rowGuid))
- getModel(rowGuid, false, 999);
}
/// <summary>
@@ -102,7 +90,7 @@
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
else
{
_filterList.Clear();
@@ -122,7 +110,6 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date",
"asc", "", _sbSqlWhere.ToString());
@@ -161,15 +148,16 @@
}
- private void getModel(string strGuid, bool isEdit, int tabIdx)
+ 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;
}
-
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
guid = strGuid //涓诲缓
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
index 0ba885d..e470952 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -516,18 +516,19 @@
this.gv_id.AppearanceCell.Options.UseFont = true;
this.gv_id.Caption = "渚涘簲鍟咺D";
this.gv_id.FieldName = "id";
- this.gv_id.MinWidth = 70;
+ this.gv_id.MinWidth = 80;
this.gv_id.Name = "gv_id";
this.gv_id.OptionsColumn.AllowEdit = false;
this.gv_id.Tag = "query_a.id";
this.gv_id.UnboundDataType = typeof(string);
this.gv_id.Visible = true;
this.gv_id.VisibleIndex = 1;
- this.gv_id.Width = 70;
+ this.gv_id.Width = 80;
//
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -635,7 +636,6 @@
//
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
-
this.xtraTabPage2.Size = new System.Drawing.Size(990, 510);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
index af75179..e4b69ef 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
@@ -21,8 +21,17 @@
InitializeComponent();
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ });
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ });
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
@@ -31,19 +40,6 @@
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
Task.Delay(100);
getPageList(1);
- }
-
- /// <summary>
- /// 鍙屽嚮浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
- {
- var rowGuid =
- UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
- if (!string.IsNullOrEmpty(rowGuid))
- getModel(rowGuid, false, 999);
}
/// <summary>
@@ -90,7 +86,7 @@
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
else
{
_filterList.Clear();
@@ -146,15 +142,16 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
- private void getModel(string strGuid, bool isEdit, int tabIdx)
+ 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;
}
-
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
guid = strGuid //涓诲缓
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 0ae0b8d..8603773 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1qd011 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd009 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -60,6 +60,24 @@
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
+ this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
+ this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
+ this.kyPrtQty = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
+ this.txtYdy = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+ this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
+ this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
+ this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
+ this.txtWlid = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
this.lb_qt021 = new DevExpress.XtraEditors.LabelControl();
this.txt_qt021 = new DevExpress.XtraEditors.TextEdit();
this.gv_qt021 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -83,7 +101,6 @@
this.txt_qt010 = new DevExpress.XtraEditors.TextEdit();
this.gv_qt010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_qt009 = new DevExpress.XtraEditors.LabelControl();
- this.txt_qt009 = new DevExpress.XtraEditors.TextEdit();
this.gv_qt009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_qt008 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_qt006 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -109,7 +126,9 @@
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_qt009 = new Gs.DevApp.UserControl.UcLookDepartment();
this.txt_qt015 = new DevExpress.XtraEditors.CheckEdit();
this.txt_qt018 = new Gs.DevApp.UserControl.UcLookSupplier();
this.txt_qt011 = new Gs.DevApp.UserControl.UcLookCk();
@@ -125,10 +144,19 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
+ this.panelMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt021.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt010.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt009.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt004.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt003.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).BeginInit();
@@ -328,20 +356,21 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Controls.Add(this.panelMx1);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1124, 372);
- this.tabMxPage1.Text = "鏄庣粏1";
+ this.tabMxPage1.Text = "鐗╂枡鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.Location = new System.Drawing.Point(0, 0);
+ this.gcMx1.Location = new System.Drawing.Point(0, 98);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.repositoryItemSearchLookUpEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 372);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 274);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -384,10 +413,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -477,6 +506,181 @@
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 4;
this.gridColumn11.Width = 120;
+ //
+ // panelMx1
+ //
+ this.panelMx1.Controls.Add(this.lbMxGuid);
+ this.panelMx1.Controls.Add(this.txt_iCount_1);
+ this.panelMx1.Controls.Add(this.labelControl14);
+ this.panelMx1.Controls.Add(this.txt_psnQty_1);
+ this.panelMx1.Controls.Add(this.labelControl12);
+ this.panelMx1.Controls.Add(this.kyPrtQty);
+ this.panelMx1.Controls.Add(this.labelControl13);
+ this.panelMx1.Controls.Add(this.txtYdy);
+ this.panelMx1.Controls.Add(this.labelControl1);
+ this.panelMx1.Controls.Add(this.txtQuantity);
+ this.panelMx1.Controls.Add(this.labelControl10);
+ this.panelMx1.Controls.Add(this.txtWlgg);
+ this.panelMx1.Controls.Add(this.labelControl9);
+ this.panelMx1.Controls.Add(this.txtWlmc);
+ this.panelMx1.Controls.Add(this.labelControl8);
+ this.panelMx1.Controls.Add(this.txtWlid);
+ this.panelMx1.Controls.Add(this.labelControl7);
+ this.panelMx1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panelMx1.Location = new System.Drawing.Point(0, 0);
+ this.panelMx1.Name = "panelMx1";
+ this.panelMx1.Size = new System.Drawing.Size(1124, 98);
+ this.panelMx1.TabIndex = 2;
+ //
+ // lbMxGuid
+ //
+ this.lbMxGuid.Location = new System.Drawing.Point(552, 75);
+ this.lbMxGuid.Name = "lbMxGuid";
+ this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
+ this.lbMxGuid.TabIndex = 229;
+ this.lbMxGuid.Text = "lbMxGuid";
+ //
+ // txt_iCount_1
+ //
+ this.txt_iCount_1.Location = new System.Drawing.Point(654, 34);
+ this.txt_iCount_1.Name = "txt_iCount_1";
+ this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
+ this.txt_iCount_1.Size = new System.Drawing.Size(96, 28);
+ this.txt_iCount_1.TabIndex = 228;
+ //
+ // labelControl14
+ //
+ this.labelControl14.Location = new System.Drawing.Point(543, 39);
+ this.labelControl14.Name = "labelControl14";
+ this.labelControl14.Size = new System.Drawing.Size(105, 18);
+ this.labelControl14.TabIndex = 227;
+ this.labelControl14.Text = "鎵撳嵃鏉＄爜寮犳暟锛�";
+ //
+ // txt_psnQty_1
+ //
+ this.txt_psnQty_1.Location = new System.Drawing.Point(654, 4);
+ this.txt_psnQty_1.Name = "txt_psnQty_1";
+ this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
+ this.txt_psnQty_1.Size = new System.Drawing.Size(96, 28);
+ this.txt_psnQty_1.TabIndex = 226;
+ //
+ // labelControl12
+ //
+ this.labelControl12.Location = new System.Drawing.Point(543, 9);
+ this.labelControl12.Name = "labelControl12";
+ this.labelControl12.Size = new System.Drawing.Size(105, 18);
+ this.labelControl12.TabIndex = 225;
+ this.labelControl12.Text = "姣忓紶鏉＄爜鏁伴噺锛�";
+ //
+ // kyPrtQty
+ //
+ this.kyPrtQty.Location = new System.Drawing.Point(430, 65);
+ this.kyPrtQty.Name = "kyPrtQty";
+ this.kyPrtQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.kyPrtQty.Properties.Appearance.Options.UseFont = true;
+ this.kyPrtQty.Properties.ReadOnly = true;
+ this.kyPrtQty.Size = new System.Drawing.Size(96, 28);
+ this.kyPrtQty.TabIndex = 224;
+ //
+ // labelControl13
+ //
+ this.labelControl13.Location = new System.Drawing.Point(332, 70);
+ this.labelControl13.Name = "labelControl13";
+ this.labelControl13.Size = new System.Drawing.Size(90, 18);
+ this.labelControl13.TabIndex = 223;
+ this.labelControl13.Text = "鍙墦鍗版�绘暟锛�";
+ //
+ // txtYdy
+ //
+ this.txtYdy.Location = new System.Drawing.Point(430, 34);
+ this.txtYdy.Name = "txtYdy";
+ this.txtYdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txtYdy.Properties.Appearance.Options.UseFont = true;
+ this.txtYdy.Properties.ReadOnly = true;
+ this.txtYdy.Size = new System.Drawing.Size(96, 28);
+ this.txtYdy.TabIndex = 222;
+ //
+ // labelControl1
+ //
+ this.labelControl1.Location = new System.Drawing.Point(332, 39);
+ this.labelControl1.Name = "labelControl1";
+ this.labelControl1.Size = new System.Drawing.Size(90, 18);
+ this.labelControl1.TabIndex = 221;
+ this.labelControl1.Text = "宸叉墦鍗版�婚噺锛�";
+ //
+ // txtQuantity
+ //
+ this.txtQuantity.Location = new System.Drawing.Point(430, 4);
+ this.txtQuantity.Name = "txtQuantity";
+ this.txtQuantity.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txtQuantity.Properties.Appearance.Options.UseFont = true;
+ this.txtQuantity.Properties.ReadOnly = true;
+ this.txtQuantity.Size = new System.Drawing.Size(96, 28);
+ this.txtQuantity.TabIndex = 220;
+ //
+ // labelControl10
+ //
+ this.labelControl10.Location = new System.Drawing.Point(317, 9);
+ this.labelControl10.Name = "labelControl10";
+ this.labelControl10.Size = new System.Drawing.Size(105, 18);
+ this.labelControl10.TabIndex = 219;
+ this.labelControl10.Text = "鏈鐢宠鎬婚噺锛�";
+ //
+ // txtWlgg
+ //
+ this.txtWlgg.Location = new System.Drawing.Point(90, 65);
+ this.txtWlgg.Name = "txtWlgg";
+ this.txtWlgg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txtWlgg.Properties.Appearance.Options.UseFont = true;
+ this.txtWlgg.Properties.ReadOnly = true;
+ this.txtWlgg.Size = new System.Drawing.Size(215, 28);
+ this.txtWlgg.TabIndex = 218;
+ //
+ // labelControl9
+ //
+ this.labelControl9.Location = new System.Drawing.Point(11, 70);
+ this.labelControl9.Name = "labelControl9";
+ this.labelControl9.Size = new System.Drawing.Size(75, 18);
+ this.labelControl9.TabIndex = 217;
+ this.labelControl9.Text = "鐗╂枡瑙勬牸锛�";
+ //
+ // txtWlmc
+ //
+ this.txtWlmc.Location = new System.Drawing.Point(90, 34);
+ this.txtWlmc.Name = "txtWlmc";
+ this.txtWlmc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txtWlmc.Properties.Appearance.Options.UseFont = true;
+ this.txtWlmc.Properties.ReadOnly = true;
+ this.txtWlmc.Size = new System.Drawing.Size(215, 28);
+ this.txtWlmc.TabIndex = 216;
+ //
+ // labelControl8
+ //
+ this.labelControl8.Location = new System.Drawing.Point(11, 39);
+ this.labelControl8.Name = "labelControl8";
+ this.labelControl8.Size = new System.Drawing.Size(75, 18);
+ this.labelControl8.TabIndex = 215;
+ this.labelControl8.Text = "鐗╂枡鍚嶇О锛�";
+ //
+ // txtWlid
+ //
+ this.txtWlid.Location = new System.Drawing.Point(90, 4);
+ this.txtWlid.Name = "txtWlid";
+ this.txtWlid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txtWlid.Properties.Appearance.Options.UseFont = true;
+ this.txtWlid.Properties.ReadOnly = true;
+ this.txtWlid.Size = new System.Drawing.Size(215, 28);
+ this.txtWlid.TabIndex = 214;
+ //
+ // labelControl7
+ //
+ this.labelControl7.Location = new System.Drawing.Point(25, 9);
+ this.labelControl7.Name = "labelControl7";
+ this.labelControl7.Size = new System.Drawing.Size(61, 18);
+ this.labelControl7.TabIndex = 213;
+ this.labelControl7.Text = "鐗╂枡ID锛�";
//
// lb_qt021
//
@@ -754,15 +958,6 @@
this.lb_qt009.TabIndex = 235;
this.lb_qt009.Text = "鐢宠閮ㄩ棬 ";
//
- // txt_qt009
- //
- this.txt_qt009.Location = new System.Drawing.Point(95, 52);
- this.txt_qt009.Name = "txt_qt009";
- this.txt_qt009.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_qt009.Properties.Appearance.Options.UseFont = true;
- this.txt_qt009.Size = new System.Drawing.Size(228, 28);
- this.txt_qt009.TabIndex = 235;
- //
// gv_qt009
//
this.gv_qt009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -976,7 +1171,7 @@
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
- this.toolBarMenu1.rptParameter = null;
+ this.toolBarMenu1.rptParameter = "rpt_Qtrk{}";
this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
@@ -1076,11 +1271,19 @@
this.tabMx.Size = new System.Drawing.Size(1126, 404);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage1});
+ this.tabMxPage1,
+ this.xtraTabPage3});
+ //
+ // xtraTabPage3
+ //
+ this.xtraTabPage3.Name = "xtraTabPage3";
+ this.xtraTabPage3.Size = new System.Drawing.Size(1124, 372);
+ this.xtraTabPage3.Text = "鏉＄爜鏄庣粏";
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_qt009);
this.panel1.Controls.Add(this.txt_qt015);
this.panel1.Controls.Add(this.txt_qt018);
this.panel1.Controls.Add(this.txt_qt011);
@@ -1100,7 +1303,6 @@
this.panel1.Controls.Add(this.lb_qt010);
this.panel1.Controls.Add(this.txt_qt010);
this.panel1.Controls.Add(this.lb_qt009);
- this.panel1.Controls.Add(this.txt_qt009);
this.panel1.Controls.Add(this.lb_qt004);
this.panel1.Controls.Add(this.txt_qt004);
this.panel1.Controls.Add(this.lb_qt003);
@@ -1115,6 +1317,14 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1126, 166);
this.panel1.TabIndex = 1;
+ //
+ // txt_qt009
+ //
+ this.txt_qt009.IsReadly = false;
+ this.txt_qt009.Location = new System.Drawing.Point(95, 51);
+ this.txt_qt009.Name = "txt_qt009";
+ this.txt_qt009.Size = new System.Drawing.Size(228, 30);
+ this.txt_qt009.TabIndex = 304;
//
// txt_qt015
//
@@ -1138,7 +1348,7 @@
// txt_qt011
//
this.txt_qt011.IsReadly = false;
- this.txt_qt011.Location = new System.Drawing.Point(425, 51);
+ this.txt_qt011.Location = new System.Drawing.Point(425, 52);
this.txt_qt011.Margin = new System.Windows.Forms.Padding(0);
this.txt_qt011.Name = "txt_qt011";
this.txt_qt011.Size = new System.Drawing.Size(150, 28);
@@ -1226,10 +1436,20 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
+ this.panelMx1.ResumeLayout(false);
+ this.panelMx1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt021.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt016.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt010.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qt009.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt004.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt003.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt002.Properties)).EndInit();
@@ -1311,7 +1531,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_qt010;
private DevExpress.XtraEditors.LabelControl lb_qt009;
-private DevExpress.XtraEditors.TextEdit txt_qt009;
private DevExpress.XtraGrid.Columns.GridColumn gv_qt009;
private DevExpress.XtraGrid.Columns.GridColumn gv_qt008;
private DevExpress.XtraGrid.Columns.GridColumn gv_qt006;
@@ -1350,5 +1569,25 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private UserControl.UcLookDepartment txt_qt009;
+ private DevExpress.XtraEditors.PanelControl panelMx1;
+ private DevExpress.XtraEditors.LabelControl lbMxGuid;
+ private DevExpress.XtraEditors.TextEdit txt_iCount_1;
+ private DevExpress.XtraEditors.LabelControl labelControl14;
+ private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
+ private DevExpress.XtraEditors.LabelControl labelControl12;
+ private DevExpress.XtraEditors.TextEdit kyPrtQty;
+ private DevExpress.XtraEditors.LabelControl labelControl13;
+ private DevExpress.XtraEditors.TextEdit txtYdy;
+ private DevExpress.XtraEditors.LabelControl labelControl1;
+ private DevExpress.XtraEditors.TextEdit txtQuantity;
+ private DevExpress.XtraEditors.LabelControl labelControl10;
+ private DevExpress.XtraEditors.TextEdit txtWlgg;
+ private DevExpress.XtraEditors.LabelControl labelControl9;
+ private DevExpress.XtraEditors.TextEdit txtWlmc;
+ private DevExpress.XtraEditors.LabelControl labelControl8;
+ private DevExpress.XtraEditors.TextEdit txtWlid;
+ private DevExpress.XtraEditors.LabelControl labelControl7;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 38cfbce..f055670 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -30,7 +30,9 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
+ toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
+ toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "qt015", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -43,6 +45,8 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ txt_qt011.getSuppler("");
+ txt_qt018.getSuppler("");
//璁剧疆浠撳簱閫夋嫨
this.txt_qt011.EditChanged += (s, e) =>
{
@@ -73,7 +77,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
+ gcMx1.MouseClick += GcMx1_MouseClick;
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -114,6 +118,56 @@
{
_filterList = e.FilterList;
getPageList(1);
+ }
+ private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_qtck, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ toolBarMenu1.rptParameter = "rpt_Qtrk{}";
+ }
+ private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
+ {
+ //toolBarMenu1.guidKey = "";
+ //string rowGuid, rowName;
+ //(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ // lbGuid, txt_itemName, gridView1);
+ //toolBarMenu1.guidKey = rowGuid;
+ //if (xtraTabControl1.SelectedTabPageIndex == 0)
+ //{
+ // getModel(rowGuid, false, 999);
+ // this.toolBarMenu1.rptParameter = "return false";
+ // return;
+ //}
+ //if (string.IsNullOrEmpty(txt_suppNo_1.GetCode()))
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨渚涘簲鍟嗭紒");
+ // txt_suppNo_1.Focus();
+ // this.toolBarMenu1.rptParameter = "return false";
+ // return;
+ //}
+ //if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
+ // txt_iCount_1.Focus();
+ // this.toolBarMenu1.rptParameter = "return false";
+ // return;
+ //}
+ //if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
+ // txt_psnQty_1.Focus();
+ // this.toolBarMenu1.rptParameter = "return false";
+ // return;
+ //}
+ //this.toolBarMenu1.rptParameter = "rpt_ItemInv{" + txt_createDate1.Text.Trim()
+ // + "," + txt_tc_1.Checked.ToString().ToUpper()
+ // + "," + txt_suppNo_1.GetId()
+ // + "," + txt_iCount_1.Text.Trim()
+ // + "," + txt_psnQty_1.Text.Trim()
+ // + "}";
}
/// <summary>
@@ -254,7 +308,7 @@
inRklx = txt_qt020.Text.Trim(),//鍏ュ簱绫诲瀷
inGys = inGys,//渚涘簲鍟�
inCjId = inCjId,//鍏ュ簱浠撳簱
- inDepart = txt_qt009.Text.Trim(),//鐢宠閮ㄩ棬
+ inDepart = txt_qt009.GetId(),//鐢宠閮ㄩ棬
inXsdh = txt_qt021.Text.Trim(),//閿�鍞崟鍙�
inRkyy = txt_qt010.Text.Trim(),//鍏ュ簱鍘熷洜
list = new List<dynamic>(),
@@ -527,6 +581,22 @@
}
-
+ private void GcMx1_MouseClick(object sender, MouseEventArgs e)
+ {
+ string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gvMx1, e, "guid");
+ if (string.IsNullOrEmpty(rowGuid))
+ return;
+ lbMxGuid.Text = rowGuid;
+ toolBarMenu1.guidKey = rowGuid;
+ var info = gvMx1.CalcHitInfo(e.Location);
+ var view = info.View;
+ var row = view.GetDataRow(info.RowHandle);
+ txtWlid.Text = row["itemId"].ToString();
+ txtWlgg.Text = row["qd004"].ToString();
+ txtWlmc.Text = row["qd003"].ToString();
+ txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺
+ txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
+ kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 495f0bb..81374dd 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -839,9 +839,15 @@
<EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrk.resx">
<DependentUpon>Frm_MesItemQtrk.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemQtrk_Rk.resx">
+ <DependentUpon>Frm_MesItemQtrk_Rk.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rk\Frm_MesItemTbl.resx">
<DependentUpon>Frm_MesItemTbl.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rk\Frm_MesItemTbl_RK.resx">
+ <DependentUpon>Frm_MesItemTbl_RK.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\RptPreview.resx">
<DependentUpon>RptPreview.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index f0ca4fd..be8520e 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -592,6 +592,17 @@
txt.Enabled = false;
continue;
}
+ //鑷畾閮ㄩ棬
+ if (colType is UcLookDepartment)
+ {
+ var txt = colType as UcLookDepartment;
+ txt.SetIdOrCode(strVal);
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
+ continue;
+ }
if (colType is SimpleButton)
{
var txt = colType as SimpleButton;
@@ -804,6 +815,14 @@
txt.Enabled = !isEdt;
continue;
}
+ //鑷畾閮ㄩ棬
+ if (ctrl is UcLookDepartment)
+ {
+ var txt = ctrl as UcLookDepartment;
+ txt.SetIdOrCode("-1");
+ txt.Enabled = !isEdt;
+ continue;
+ }
if (ctrl is SimpleButton)
{
var txt = ctrl as SimpleButton;
@@ -1011,6 +1030,16 @@
txt.Enabled = false;
continue;
}
+ //鑷畾閮ㄩ棬
+ if (ctrl is UcLookDepartment)
+ {
+ var txt = ctrl as UcLookDepartment;
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
+ continue;
+ }
}
}
--
Gitblit v1.9.3