From ed546f521cb8db95d092ff67e076cededd53e725 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 21 十二月 2024 11:25:40 +0800
Subject: [PATCH] 各种细节
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.cs | 1
DevApp/Gs.DevApp/Gs.DevApp.csproj | 12
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 18
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs | 1
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx | 0
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 29 +
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 354 ++++++++++------------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs | 227 ++++++--------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 173 ++++------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 1
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs | 57 +-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.resx | 0
13 files changed, 418 insertions(+), 458 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
similarity index 99%
rename from DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
rename to DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 5ebea79..6cfa6e7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -602,6 +602,7 @@
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = "0,0,0,0,000prc_cgdhd_submit";
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -1043,7 +1044,6 @@
this.xtraTabPage2.Controls.Add(this.tabMx);
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
-
this.xtraTabPage2.Size = new System.Drawing.Size(1231, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
@@ -1259,6 +1259,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesInvItemArn";
+ this.Text = "閲囪喘鍒拌揣鍗�";
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
similarity index 89%
rename from DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
rename to DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 234d055..76da4de 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -3,6 +3,7 @@
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
+using DevExpress.RichEdit.Export;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
@@ -32,11 +33,20 @@
toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
-
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, 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.SetGridViewParameterMx(gvMx1);
//璁剧疆缁勭粐
this.txt_receiveOrgId.EditChanged += (s, e) =>
{
@@ -103,19 +113,7 @@
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>
@@ -172,43 +170,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billNo, gridView1, "billNo");
- toolBarMenu1.guidKey = rowGuid;
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎾ゅ洖宸叉彁浜ょ殑妫�楠屽悧锛�"))
- return;
-
- var _obj = new
- {
- guid = rowGuid,
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "EditModelSubmitF",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
- if (_rtn.rtnCode > 0)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
- else
- getPageList(1);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
-
+ _toolCk("EditModelSubmitF");
}
/// <summary>
@@ -218,41 +180,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billNo, gridView1, "billNo");
- toolBarMenu1.guidKey = rowGuid;
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎻愪氦妫�楠屽悧锛�"))
- return;
- var _obj = new
- {
- guid = rowGuid,
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "EditModelSubmit",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
- if (_rtn.rtnCode > 0)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
- else
- getPageList(1);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
+ _toolCk("EditModelSubmit");
}
/// <summary>
/// 鍙栨秷浜嬩欢
@@ -313,7 +241,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();
@@ -334,7 +262,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
- string rowGuid = "", rowName = "";
+ string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
lbGuid, txt_billNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
@@ -342,8 +270,8 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
- getModel(rowGuid, true, 1);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
}
/// <summary>
@@ -353,12 +281,12 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
lbGuid.Text = "";
- var gridViews = new List<GridView>();
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gridViews.Add(gvMx1);
- UtilityHelper.CleanValueByControl(panel1.Controls, true, gridViews);
- UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
/// <summary>
@@ -493,14 +421,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 //涓诲缓
@@ -581,7 +511,7 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -635,5 +565,50 @@
}
}
+
+
+ /// <summary>
+ /// 妫�楠屽拰鍙嶆楠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(string _meth)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_billNo, gridView1, "billNo");
+ toolBarMenu1.guidKey = rowGuid;
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎿嶄綔鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ guid = rowGuid,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + _meth,
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim());
+ else
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.resx b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx
similarity index 100%
rename from DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.resx
rename to DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
similarity index 98%
rename from DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs
rename to DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
index 1afa484..a3e775b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -29,7 +29,6 @@
/// </summary>
private void InitializeComponent()
{
- this.gvMx2itemInId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -156,6 +155,7 @@
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -179,20 +179,8 @@
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
- //
- // gvMx2itemInId
- //
- this.gvMx2itemInId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2itemInId.AppearanceCell.Options.UseFont = true;
- this.gvMx2itemInId.Caption = "鍏ュ簱鍗昳d";
- this.gvMx2itemInId.FieldName = "itemInId";
- this.gvMx2itemInId.MinWidth = 50;
- this.gvMx2itemInId.Name = "gvMx2itemInId";
- this.gvMx2itemInId.Tag = "query_a.ITEM_IN_ID";
- this.gvMx2itemInId.Visible = true;
- this.gvMx2itemInId.VisibleIndex = 8;
- this.gvMx2itemInId.Width = 94;
//
// gvMx2itemId
//
@@ -337,7 +325,6 @@
this.gvMx2unit,
this.gvMx2ebeln,
this.gvMx2workNo,
- this.gvMx2itemInId,
this.gvMx2ebelnK3id,
this.gvMx2lineK3id});
this.gvMx2.GridControl = this.gcMx2;
@@ -405,12 +392,12 @@
this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
this.gvMx1workNo.Caption = "閲囪喘鍗曞彿";
this.gvMx1workNo.FieldName = "workNo";
- this.gvMx1workNo.MinWidth = 50;
+ this.gvMx1workNo.MinWidth = 100;
this.gvMx1workNo.Name = "gvMx1workNo";
this.gvMx1workNo.Tag = "query_a.WORK_NO";
this.gvMx1workNo.Visible = true;
this.gvMx1workNo.VisibleIndex = 2;
- this.gvMx1workNo.Width = 94;
+ this.gvMx1workNo.Width = 100;
//
// gvMx1unit
//
@@ -431,12 +418,12 @@
this.gvMx1itemSname.AppearanceCell.Options.UseFont = true;
this.gvMx1itemSname.Caption = "鐗╂枡鍚嶇О";
this.gvMx1itemSname.FieldName = "itemName";
- this.gvMx1itemSname.MinWidth = 50;
+ this.gvMx1itemSname.MinWidth = 250;
this.gvMx1itemSname.Name = "gvMx1itemSname";
this.gvMx1itemSname.Tag = "query_a.ITEM_SNAME";
this.gvMx1itemSname.Visible = true;
this.gvMx1itemSname.VisibleIndex = 5;
- this.gvMx1itemSname.Width = 94;
+ this.gvMx1itemSname.Width = 250;
//
// gvMx1depotSectionCode
//
@@ -470,12 +457,12 @@
this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx1itemNo.Caption = "瑙勬牸鍨嬪彿";
this.gvMx1itemNo.FieldName = "itemModel";
- this.gvMx1itemNo.MinWidth = 50;
+ this.gvMx1itemNo.MinWidth = 250;
this.gvMx1itemNo.Name = "gvMx1itemNo";
this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
this.gvMx1itemNo.Visible = true;
this.gvMx1itemNo.VisibleIndex = 6;
- this.gvMx1itemNo.Width = 94;
+ this.gvMx1itemNo.Width = 250;
//
// gvMx1quantity
//
@@ -496,12 +483,12 @@
this.gvMx1cItemCode.AppearanceCell.Options.UseFont = true;
this.gvMx1cItemCode.Caption = "鐗╂枡缂栫爜";
this.gvMx1cItemCode.FieldName = "itemNo";
- this.gvMx1cItemCode.MinWidth = 50;
+ this.gvMx1cItemCode.MinWidth = 100;
this.gvMx1cItemCode.Name = "gvMx1cItemCode";
this.gvMx1cItemCode.Tag = "query_a.C_ITEM_CODE";
this.gvMx1cItemCode.Visible = true;
this.gvMx1cItemCode.VisibleIndex = 3;
- this.gvMx1cItemCode.Width = 94;
+ this.gvMx1cItemCode.Width = 100;
//
// gvMx1itemBarcode
//
@@ -509,12 +496,12 @@
this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx1itemBarcode.FieldName = "itemBarcode";
- this.gvMx1itemBarcode.MinWidth = 50;
+ this.gvMx1itemBarcode.MinWidth = 250;
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
this.gvMx1itemBarcode.VisibleIndex = 1;
- this.gvMx1itemBarcode.Width = 94;
+ this.gvMx1itemBarcode.Width = 250;
//
// gvMx1guid
//
@@ -716,6 +703,7 @@
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = "";
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -1668,7 +1656,6 @@
this.xtraTabPage2.Controls.Add(this.tabMx);
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
-
this.xtraTabPage2.Size = new System.Drawing.Size(1346, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
@@ -1769,14 +1756,27 @@
this.lbGuid.TabIndex = 1;
this.lbGuid.Visible = false;
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(961, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 6;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
// Frm_MesInvItemIns
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1348, 682);
+ this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesInvItemIns";
+ this.Text = "閲囪喘鍏ュ簱鍗�";
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
@@ -1801,6 +1801,7 @@
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -1814,9 +1815,6 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraTab.XtraTabControl tabMx;
-
- //BQCreateConrolObejct
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemInId;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemId;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2lineK3id;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2ebelnK3id;
@@ -1942,5 +1940,6 @@
private UserControl.UcLookSupplier txt_suppId;
private UserControl.UcLookCk txt_depotsId;
private DevExpress.XtraEditors.CheckEdit txt_status;
+ private System.Windows.Forms.PictureBox picCheckBox;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
similarity index 65%
rename from DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs
rename to DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
index e4a9323..693ef48 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
@@ -7,6 +7,7 @@
using System.Collections.Generic;
using System.Data;
using System.Drawing;
+using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -22,36 +23,30 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
-
- getPageList(1, UtilityHelper.GetPageSize());
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status2", "", (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;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- {
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- string str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- Font f = new Font("寰蒋闆呴粦", 16);
- Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
- e.Graphics.DrawString(str, f, Brushes.Gray, r);
- };
}
- /// <summary>
- /// 鍙屽嚮浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
+
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
- if (!string.IsNullOrEmpty(rowGuid))
- getModel(rowGuid, false, 999);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Task.Delay(100);
+ getPageList(1);
}
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -59,7 +54,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
/// 鏌ヨ浜嬩欢
@@ -68,7 +63,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -80,7 +78,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
/// <summary>
@@ -90,43 +88,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billNo, gridView1);
- //toolBarMenu1.guidKey = rowGuid;
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- var _obj = new
- {
- guid = rowGuid,
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "EditModelSubmit",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
- else
- getPageList(1, UtilityHelper.GetPageSize());
- }
- else
- {
- MsgHelper.Warning(_rtn.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
-
+ _toolCk("EditModelSubmit");
}
/// <summary>
@@ -137,45 +99,8 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billNo, gridView1);
- // toolBarMenu1.guidKey = rowGuid;
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- //MsgHelper.Warning(rowGuid);
-
- var _obj = new
- {
- guid = rowGuid,
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeApprove",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
- else
- getPageList(1, UtilityHelper.GetPageSize());
- }
- else
- {
- MsgHelper.Warning(_rtn.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
-
+ _toolCk("DeApprove");
+
}
/// <summary>
@@ -186,24 +111,29 @@
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
else
- getPageList(1, UtilityHelper.GetPageSize());
+ {
+ _filterList.Clear();
+ if (gridView1.ActiveFilter.Count > 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ }
+ getPageList(1);
+ }
}
/// <summary>
///
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage, int pageSize)
+ private void getPageList(int curPage)
{
-
- System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- foreach (FilterEntity itm in _filterList)
- {
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'");
- }
- PageQueryModel pgq = new PageQueryModel(curPage, pageSize, "create_date", "asc", "", _sbSqlWhere.ToString());
+
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
@@ -213,13 +143,18 @@
{
DataTable dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- int dddd = dd.rtnData.pages;//鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.setTxt();
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
}
else
{
@@ -232,15 +167,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))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
-
var _obj = new
{
guid = strGuid,//涓诲缓
@@ -301,5 +237,50 @@
}
}
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(string _meth)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_billNo, gridView1, "billNo");
+ toolBarMenu1.guidKey = rowGuid;
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎿嶄綔鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ guid = rowGuid,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + _meth,
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim());
+ else
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.resx b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.resx
similarity index 100%
rename from DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemIns.resx
rename to DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.resx
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 8603773..31bd889 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -1,7 +1,7 @@
/* Create By GS EasyCode */
namespace Gs.DevApp.DevFrm
{
- partial class Frm_MesItemQtrk
+ partial class Frm_MesItemQtrk
{
/// <summary>
/// Required designer variable.
@@ -29,18 +29,15 @@
/// </summary>
private void InitializeComponent()
{
- 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();
+ 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();
this.gvMx1qd010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd008 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd007 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1qd006 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1qd005 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd004 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd002 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -50,8 +47,6 @@
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -60,6 +55,8 @@
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
@@ -141,9 +138,9 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
this.panelMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
@@ -176,19 +173,6 @@
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
- // gvMx1qd011
- //
- this.gvMx1qd011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1qd011.AppearanceCell.Options.UseFont = true;
- this.gvMx1qd011.Caption = "瀹岀粨鏍囪瘑 ";
- this.gvMx1qd011.FieldName = "qd011";
- this.gvMx1qd011.MinWidth = 50;
- this.gvMx1qd011.Name = "gvMx1qd011";
- this.gvMx1qd011.Tag = "query_a.qd011";
- this.gvMx1qd011.Visible = true;
- this.gvMx1qd011.VisibleIndex = 14;
- this.gvMx1qd011.Width = 94;
- //
// gvMx1qd010
//
this.gvMx1qd010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -199,12 +183,12 @@
this.gvMx1qd010.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1qd010.Caption = "澶囨敞 ";
this.gvMx1qd010.FieldName = "qd010";
- this.gvMx1qd010.MinWidth = 50;
+ this.gvMx1qd010.MinWidth = 250;
this.gvMx1qd010.Name = "gvMx1qd010";
this.gvMx1qd010.Tag = "query_a.qd010";
this.gvMx1qd010.Visible = true;
- this.gvMx1qd010.VisibleIndex = 13;
- this.gvMx1qd010.Width = 94;
+ this.gvMx1qd010.VisibleIndex = 5;
+ this.gvMx1qd010.Width = 250;
//
// gvMx1qd009
//
@@ -214,9 +198,11 @@
this.gvMx1qd009.FieldName = "qd009";
this.gvMx1qd009.MinWidth = 50;
this.gvMx1qd009.Name = "gvMx1qd009";
+ this.gvMx1qd009.OptionsColumn.AllowEdit = false;
+ this.gvMx1qd009.OptionsColumn.ReadOnly = true;
this.gvMx1qd009.Tag = "query_a.qd009";
this.gvMx1qd009.Visible = true;
- this.gvMx1qd009.VisibleIndex = 12;
+ this.gvMx1qd009.VisibleIndex = 7;
this.gvMx1qd009.Width = 94;
//
// gvMx1qd008
@@ -227,9 +213,11 @@
this.gvMx1qd008.FieldName = "qd008";
this.gvMx1qd008.MinWidth = 50;
this.gvMx1qd008.Name = "gvMx1qd008";
+ this.gvMx1qd008.OptionsColumn.AllowEdit = false;
+ this.gvMx1qd008.OptionsColumn.ReadOnly = true;
this.gvMx1qd008.Tag = "query_a.qd008";
this.gvMx1qd008.Visible = true;
- this.gvMx1qd008.VisibleIndex = 11;
+ this.gvMx1qd008.VisibleIndex = 6;
this.gvMx1qd008.Width = 94;
//
// gvMx1qd007
@@ -244,36 +232,10 @@
this.gvMx1qd007.FieldName = "qd007";
this.gvMx1qd007.MinWidth = 50;
this.gvMx1qd007.Name = "gvMx1qd007";
- this.gvMx1qd007.Tag = "query_a.qd007";
+ this.gvMx1qd007.Tag = "yz_quantity_0";
this.gvMx1qd007.Visible = true;
- this.gvMx1qd007.VisibleIndex = 10;
+ this.gvMx1qd007.VisibleIndex = 4;
this.gvMx1qd007.Width = 94;
- //
- // gvMx1qd006
- //
- this.gvMx1qd006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1qd006.AppearanceCell.Options.UseFont = true;
- this.gvMx1qd006.Caption = "璁″垝鏁伴噺 ";
- this.gvMx1qd006.FieldName = "qd006";
- this.gvMx1qd006.MinWidth = 50;
- this.gvMx1qd006.Name = "gvMx1qd006";
- this.gvMx1qd006.Tag = "query_a.qd006";
- this.gvMx1qd006.Visible = true;
- this.gvMx1qd006.VisibleIndex = 9;
- this.gvMx1qd006.Width = 94;
- //
- // gvMx1qd005
- //
- this.gvMx1qd005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1qd005.AppearanceCell.Options.UseFont = true;
- this.gvMx1qd005.Caption = "棰滆壊 ";
- this.gvMx1qd005.FieldName = "qd005";
- this.gvMx1qd005.MinWidth = 50;
- this.gvMx1qd005.Name = "gvMx1qd005";
- this.gvMx1qd005.Tag = "query_a.qd005";
- this.gvMx1qd005.Visible = true;
- this.gvMx1qd005.VisibleIndex = 8;
- this.gvMx1qd005.Width = 94;
//
// gvMx1qd004
//
@@ -281,12 +243,14 @@
this.gvMx1qd004.AppearanceCell.Options.UseFont = true;
this.gvMx1qd004.Caption = "瑙勬牸鍨嬪彿 ";
this.gvMx1qd004.FieldName = "qd004";
- this.gvMx1qd004.MinWidth = 50;
+ this.gvMx1qd004.MinWidth = 250;
this.gvMx1qd004.Name = "gvMx1qd004";
+ this.gvMx1qd004.OptionsColumn.AllowEdit = false;
+ this.gvMx1qd004.OptionsColumn.ReadOnly = true;
this.gvMx1qd004.Tag = "query_a.qd004";
this.gvMx1qd004.Visible = true;
- this.gvMx1qd004.VisibleIndex = 7;
- this.gvMx1qd004.Width = 94;
+ this.gvMx1qd004.VisibleIndex = 3;
+ this.gvMx1qd004.Width = 250;
//
// gvMx1qd003
//
@@ -294,12 +258,14 @@
this.gvMx1qd003.AppearanceCell.Options.UseFont = true;
this.gvMx1qd003.Caption = "鐗╂枡鍚嶇О ";
this.gvMx1qd003.FieldName = "qd003";
- this.gvMx1qd003.MinWidth = 50;
+ this.gvMx1qd003.MinWidth = 150;
this.gvMx1qd003.Name = "gvMx1qd003";
+ this.gvMx1qd003.OptionsColumn.AllowEdit = false;
+ this.gvMx1qd003.OptionsColumn.ReadOnly = true;
this.gvMx1qd003.Tag = "query_a.qd003";
this.gvMx1qd003.Visible = true;
- this.gvMx1qd003.VisibleIndex = 6;
- this.gvMx1qd003.Width = 94;
+ this.gvMx1qd003.VisibleIndex = 2;
+ this.gvMx1qd003.Width = 150;
//
// gvMx1qd002
//
@@ -307,12 +273,14 @@
this.gvMx1qd002.AppearanceCell.Options.UseFont = true;
this.gvMx1qd002.Caption = "鐗╂枡缂栧彿 ";
this.gvMx1qd002.FieldName = "qd002";
- this.gvMx1qd002.MinWidth = 50;
+ this.gvMx1qd002.MinWidth = 150;
this.gvMx1qd002.Name = "gvMx1qd002";
+ this.gvMx1qd002.OptionsColumn.AllowEdit = false;
+ this.gvMx1qd002.OptionsColumn.ReadOnly = true;
this.gvMx1qd002.Tag = "query_a.qd002";
this.gvMx1qd002.Visible = true;
- this.gvMx1qd002.VisibleIndex = 5;
- this.gvMx1qd002.Width = 94;
+ this.gvMx1qd002.VisibleIndex = 1;
+ this.gvMx1qd002.Width = 150;
//
// gvMx1qd001
//
@@ -322,9 +290,9 @@
this.gvMx1qd001.FieldName = "qd001";
this.gvMx1qd001.MinWidth = 50;
this.gvMx1qd001.Name = "gvMx1qd001";
+ this.gvMx1qd001.OptionsColumn.AllowEdit = false;
+ this.gvMx1qd001.OptionsColumn.ReadOnly = true;
this.gvMx1qd001.Tag = "query_a.qd001";
- this.gvMx1qd001.Visible = true;
- this.gvMx1qd001.VisibleIndex = 3;
this.gvMx1qd001.Width = 94;
//
// gvMx1qtrkGuid
@@ -335,9 +303,9 @@
this.gvMx1qtrkGuid.FieldName = "qtrkGuid";
this.gvMx1qtrkGuid.MinWidth = 50;
this.gvMx1qtrkGuid.Name = "gvMx1qtrkGuid";
+ this.gvMx1qtrkGuid.OptionsColumn.AllowEdit = false;
+ this.gvMx1qtrkGuid.OptionsColumn.ReadOnly = true;
this.gvMx1qtrkGuid.Tag = "query_a.qtrkGuid";
- this.gvMx1qtrkGuid.Visible = true;
- this.gvMx1qtrkGuid.VisibleIndex = 2;
this.gvMx1qtrkGuid.Width = 94;
//
// gvMx1guid
@@ -348,9 +316,9 @@
this.gvMx1guid.FieldName = "guid";
this.gvMx1guid.MinWidth = 50;
this.gvMx1guid.Name = "gvMx1guid";
+ this.gvMx1guid.OptionsColumn.AllowEdit = false;
+ this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Visible = true;
- this.gvMx1guid.VisibleIndex = 1;
this.gvMx1guid.Width = 94;
//
// tabMxPage1
@@ -380,19 +348,16 @@
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1qtrkGuid,
- this.gvMxDel,
this.gvMx1qd001,
this.gridColumn1,
this.gvMx1qd002,
this.gvMx1qd003,
this.gvMx1qd004,
- this.gvMx1qd005,
- this.gvMx1qd006,
this.gvMx1qd007,
+ this.gvMx1qd010,
this.gvMx1qd008,
this.gvMx1qd009,
- this.gvMx1qd010,
- this.gvMx1qd011});
+ this.gvMxDel});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -400,37 +365,20 @@
this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
- // gvMxDel
- //
- this.gvMxDel.Caption = "绉诲嚭";
- this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
- this.gvMxDel.Name = "gvMxDel";
- this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 0;
- this.gvMxDel.Width = 94;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- 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, 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);
- //
// gridColumn1
//
+ this.gridColumn1.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn1.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn1.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn1.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn1.Caption = "鐗╂枡ID";
this.gridColumn1.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
this.gridColumn1.FieldName = "itemId";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 100;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.VisibleIndex = 0;
+ this.gridColumn1.Width = 100;
//
// repositoryItemSearchLookUpEdit1
//
@@ -507,6 +455,27 @@
this.gridColumn11.VisibleIndex = 4;
this.gridColumn11.Width = 120;
//
+ // gvMxDel
+ //
+ this.gvMxDel.Caption = "绉诲嚭";
+ this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.Name = "gvMxDel";
+ this.gvMxDel.Visible = true;
+ this.gvMxDel.VisibleIndex = 8;
+ this.gvMxDel.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.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)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
// panelMx1
//
this.panelMx1.Controls.Add(this.lbMxGuid);
@@ -534,11 +503,12 @@
//
// lbMxGuid
//
- this.lbMxGuid.Location = new System.Drawing.Point(552, 75);
+ this.lbMxGuid.Location = new System.Drawing.Point(835, 7);
this.lbMxGuid.Name = "lbMxGuid";
this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
this.lbMxGuid.TabIndex = 229;
this.lbMxGuid.Text = "lbMxGuid";
+ this.lbMxGuid.Visible = false;
//
// txt_iCount_1
//
@@ -850,28 +820,30 @@
this.gv_qt015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_qt015.AppearanceCell.Options.UseFont = true;
this.gv_qt015.Caption = "瀹℃牳鐘舵�� ";
- this.gv_qt015.FieldName = "qt015";
+ this.gv_qt015.FieldName = "isSh";
+ this.gv_qt015.MaxWidth = 50;
this.gv_qt015.MinWidth = 50;
this.gv_qt015.Name = "gv_qt015";
this.gv_qt015.OptionsColumn.AllowEdit = false;
this.gv_qt015.Tag = "query_a.qt015";
this.gv_qt015.Visible = true;
- this.gv_qt015.VisibleIndex = 14;
- this.gv_qt015.Width = 94;
+ this.gv_qt015.VisibleIndex = 0;
+ this.gv_qt015.Width = 50;
//
// gv_qt014
//
this.gv_qt014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_qt014.AppearanceCell.Options.UseFont = true;
this.gv_qt014.Caption = "瀹岀粨鏍囪瘑 ";
- this.gv_qt014.FieldName = "qt014";
+ this.gv_qt014.FieldName = "isWj";
+ this.gv_qt014.MaxWidth = 50;
this.gv_qt014.MinWidth = 50;
this.gv_qt014.Name = "gv_qt014";
this.gv_qt014.OptionsColumn.AllowEdit = false;
this.gv_qt014.Tag = "query_a.qt014";
this.gv_qt014.Visible = true;
- this.gv_qt014.VisibleIndex = 13;
- this.gv_qt014.Width = 94;
+ this.gv_qt014.VisibleIndex = 1;
+ this.gv_qt014.Width = 50;
//
// gv_qt013
//
@@ -884,7 +856,7 @@
this.gv_qt013.OptionsColumn.AllowEdit = false;
this.gv_qt013.Tag = "query_a.qt013";
this.gv_qt013.Visible = true;
- this.gv_qt013.VisibleIndex = 12;
+ this.gv_qt013.VisibleIndex = 14;
this.gv_qt013.Width = 94;
//
// gv_qt012
@@ -898,7 +870,7 @@
this.gv_qt012.OptionsColumn.AllowEdit = false;
this.gv_qt012.Tag = "query_a.qt012";
this.gv_qt012.Visible = true;
- this.gv_qt012.VisibleIndex = 11;
+ this.gv_qt012.VisibleIndex = 13;
this.gv_qt012.Width = 94;
//
// gv_qt011
@@ -912,7 +884,7 @@
this.gv_qt011.OptionsColumn.AllowEdit = false;
this.gv_qt011.Tag = "query_a.qt011";
this.gv_qt011.Visible = true;
- this.gv_qt011.VisibleIndex = 10;
+ this.gv_qt011.VisibleIndex = 12;
this.gv_qt011.Width = 94;
//
// lb_qt010
@@ -945,7 +917,7 @@
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
- this.gv_qt010.VisibleIndex = 9;
+ this.gv_qt010.VisibleIndex = 11;
this.gv_qt010.Width = 94;
//
// lb_qt009
@@ -969,7 +941,7 @@
this.gv_qt009.OptionsColumn.AllowEdit = false;
this.gv_qt009.Tag = "query_a.qt009";
this.gv_qt009.Visible = true;
- this.gv_qt009.VisibleIndex = 8;
+ this.gv_qt009.VisibleIndex = 10;
this.gv_qt009.Width = 94;
//
// gv_qt008
@@ -983,7 +955,7 @@
this.gv_qt008.OptionsColumn.AllowEdit = false;
this.gv_qt008.Tag = "query_a.qt008";
this.gv_qt008.Visible = true;
- this.gv_qt008.VisibleIndex = 7;
+ this.gv_qt008.VisibleIndex = 9;
this.gv_qt008.Width = 94;
//
// gv_qt006
@@ -997,7 +969,7 @@
this.gv_qt006.OptionsColumn.AllowEdit = false;
this.gv_qt006.Tag = "query_a.qt006";
this.gv_qt006.Visible = true;
- this.gv_qt006.VisibleIndex = 6;
+ this.gv_qt006.VisibleIndex = 8;
this.gv_qt006.Width = 94;
//
// gv_qt005
@@ -1011,7 +983,7 @@
this.gv_qt005.OptionsColumn.AllowEdit = false;
this.gv_qt005.Tag = "query_a.qt005";
this.gv_qt005.Visible = true;
- this.gv_qt005.VisibleIndex = 5;
+ this.gv_qt005.VisibleIndex = 7;
this.gv_qt005.Width = 94;
//
// lb_qt004
@@ -1044,7 +1016,7 @@
this.gv_qt004.OptionsColumn.AllowEdit = false;
this.gv_qt004.Tag = "query_a.qt004";
this.gv_qt004.Visible = true;
- this.gv_qt004.VisibleIndex = 4;
+ this.gv_qt004.VisibleIndex = 6;
this.gv_qt004.Width = 94;
//
// lb_qt003
@@ -1077,7 +1049,7 @@
this.gv_qt003.OptionsColumn.AllowEdit = false;
this.gv_qt003.Tag = "query_a.qt003";
this.gv_qt003.Visible = true;
- this.gv_qt003.VisibleIndex = 3;
+ this.gv_qt003.VisibleIndex = 5;
this.gv_qt003.Width = 94;
//
// lb_qt002
@@ -1106,13 +1078,13 @@
this.gv_qt002.AppearanceCell.Options.UseFont = true;
this.gv_qt002.Caption = "瀹℃牳鏃ユ湡 ";
this.gv_qt002.FieldName = "qt002";
- this.gv_qt002.MinWidth = 50;
+ this.gv_qt002.MinWidth = 180;
this.gv_qt002.Name = "gv_qt002";
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
- this.gv_qt002.VisibleIndex = 2;
- this.gv_qt002.Width = 94;
+ this.gv_qt002.VisibleIndex = 4;
+ this.gv_qt002.Width = 180;
//
// gv_qt001
//
@@ -1120,13 +1092,13 @@
this.gv_qt001.AppearanceCell.Options.UseFont = true;
this.gv_qt001.Caption = "鐢宠鏃ユ湡 ";
this.gv_qt001.FieldName = "qt001";
- this.gv_qt001.MinWidth = 50;
+ this.gv_qt001.MinWidth = 180;
this.gv_qt001.Name = "gv_qt001";
this.gv_qt001.OptionsColumn.AllowEdit = false;
this.gv_qt001.Tag = "query_a.qt001";
this.gv_qt001.Visible = true;
- this.gv_qt001.VisibleIndex = 1;
- this.gv_qt001.Width = 94;
+ this.gv_qt001.VisibleIndex = 3;
+ this.gv_qt001.Width = 200;
//
// lb_qtck
//
@@ -1154,13 +1126,13 @@
this.gv_qtck.AppearanceCell.Options.UseFont = true;
this.gv_qtck.Caption = "鐢宠鍗曞彿 ";
this.gv_qtck.FieldName = "qtck";
- this.gv_qtck.MinWidth = 50;
+ this.gv_qtck.MinWidth = 180;
this.gv_qtck.Name = "gv_qtck";
this.gv_qtck.OptionsColumn.AllowEdit = false;
this.gv_qtck.Tag = "query_a.qtck";
this.gv_qtck.Visible = true;
- this.gv_qtck.VisibleIndex = 0;
- this.gv_qtck.Width = 94;
+ this.gv_qtck.VisibleIndex = 2;
+ this.gv_qtck.Width = 180;
//
// toolBarMenu1
//
@@ -1191,9 +1163,14 @@
//
// gridView1
//
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_qt015,
+ this.gv_qt014,
this.gv_qtck,
this.gv_qt001,
this.gv_qt002,
@@ -1207,8 +1184,6 @@
this.gv_qt011,
this.gv_qt012,
this.gv_qt013,
- this.gv_qt014,
- this.gv_qt015,
this.gv_qt016,
this.gv_qt017,
this.gv_qt018,
@@ -1390,6 +1365,7 @@
this.labelControl11.Size = new System.Drawing.Size(45, 18);
this.labelControl11.TabIndex = 130;
this.labelControl11.Text = "涓婚敭锛�";
+ this.labelControl11.Visible = false;
//
// lbGuid
//
@@ -1398,6 +1374,7 @@
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
+ this.lbGuid.Visible = false;
//
// lb_qt011
//
@@ -1433,9 +1410,9 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
this.panelMx1.ResumeLayout(false);
this.panelMx1.PerformLayout();
@@ -1472,7 +1449,7 @@
}
#endregion
- private UserControl.UcToolBarMenu toolBarMenu1;
+ private UserControl.UcToolBarMenu toolBarMenu1;
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
@@ -1482,76 +1459,71 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.LabelControl labelControl11;
- private DevExpress.XtraTab.XtraTabControl tabMx;
-
- //BQCreateConrolObejct
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd011;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd010;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd009;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd008;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd007;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd006;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd005;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd004;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd003;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd002;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd001;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1qtrkGuid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-private DevExpress.XtraEditors.LabelControl lb_qt021;
-private DevExpress.XtraEditors.TextEdit txt_qt021;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt021;
+ private DevExpress.XtraTab.XtraTabControl tabMx;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd010;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd009;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd008;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd007;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd004;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd003;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd002;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1qd001;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1qtrkGuid;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraEditors.LabelControl lb_qt021;
+ private DevExpress.XtraEditors.TextEdit txt_qt021;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt021;
-private DevExpress.XtraEditors.LabelControl lb_qt020;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt020;
+ private DevExpress.XtraEditors.LabelControl lb_qt020;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt020;
-private DevExpress.XtraEditors.LabelControl lb_qt019;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt019;
+ private DevExpress.XtraEditors.LabelControl lb_qt019;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt019;
-private DevExpress.XtraEditors.LabelControl lb_qt018;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt018;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt017;
+ private DevExpress.XtraEditors.LabelControl lb_qt018;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt018;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt017;
-private DevExpress.XtraEditors.LabelControl lb_qt016;
-private DevExpress.XtraEditors.TextEdit txt_qt016;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt016;
+ private DevExpress.XtraEditors.LabelControl lb_qt016;
+ private DevExpress.XtraEditors.TextEdit txt_qt016;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt016;
-private DevExpress.XtraEditors.LabelControl lb_qt015;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt015;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt014;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt013;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt012;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt011;
+ private DevExpress.XtraEditors.LabelControl lb_qt015;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt015;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt014;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt013;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt012;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt011;
-private DevExpress.XtraEditors.LabelControl lb_qt010;
-private DevExpress.XtraEditors.TextEdit txt_qt010;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt010;
+ private DevExpress.XtraEditors.LabelControl lb_qt010;
+ private DevExpress.XtraEditors.TextEdit txt_qt010;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt010;
-private DevExpress.XtraEditors.LabelControl lb_qt009;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt009;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt008;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt006;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt005;
+ private DevExpress.XtraEditors.LabelControl lb_qt009;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt009;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt008;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt006;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt005;
-private DevExpress.XtraEditors.LabelControl lb_qt004;
-private DevExpress.XtraEditors.TextEdit txt_qt004;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt004;
+ private DevExpress.XtraEditors.LabelControl lb_qt004;
+ private DevExpress.XtraEditors.TextEdit txt_qt004;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt004;
-private DevExpress.XtraEditors.LabelControl lb_qt003;
-private DevExpress.XtraEditors.TextEdit txt_qt003;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt003;
+ private DevExpress.XtraEditors.LabelControl lb_qt003;
+ private DevExpress.XtraEditors.TextEdit txt_qt003;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt003;
-private DevExpress.XtraEditors.LabelControl lb_qt002;
-private DevExpress.XtraEditors.TextEdit txt_qt002;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt002;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qt001;
+ private DevExpress.XtraEditors.LabelControl lb_qt002;
+ private DevExpress.XtraEditors.TextEdit txt_qt002;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt002;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qt001;
-private DevExpress.XtraEditors.LabelControl lb_qtck;
-private DevExpress.XtraEditors.TextEdit txt_qtck;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qtck;
+ private DevExpress.XtraEditors.LabelControl lb_qtck;
+ private DevExpress.XtraEditors.TextEdit txt_qtck;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_qtck;
private DevExpress.XtraEditors.ComboBoxEdit txt_qt020;
private DevExpress.XtraEditors.ComboBoxEdit txt_qt019;
private DevExpress.XtraEditors.CheckEdit txt_qt015;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index cb08df1..97c8615 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -7,10 +7,9 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
-using System.Windows.Media.Animation;
+
namespace Gs.DevApp.DevFrm
{
@@ -32,6 +31,7 @@
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "qt015", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -325,12 +325,12 @@
if (row != null)
{
Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
- //string _msl = row["quantity"].ToString();
- //if (string.IsNullOrEmpty(_msl))
- //{
- // MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
- // return;
- //}
+ string _msl = row["qd007"].ToString();
+ if (string.IsNullOrEmpty(_msl))
+ {
+ MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
+ return;
+ }
_obj.list.Add(new
{
Guid = _guid,
@@ -455,12 +455,12 @@
private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
{
-
SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
gvMx1.SetFocusedRowCellValue("qd002", SelectedDataRow["itemNo"]);
gvMx1.SetFocusedRowCellValue("qd003", SelectedDataRow["itemName"]);
gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
+ gvMx1.SetFocusedRowCellValue("qd009", SelectedDataRow["dwName"]);
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.cs
index 3291eca..e3667ed 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.cs
@@ -26,6 +26,7 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index 96fcd0b..b1de19b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -29,6 +29,7 @@
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "tbl013", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs
index afb14d7..8d26e98 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs
@@ -28,6 +28,7 @@
toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 6ad0317..0d2c08c 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -510,10 +510,10 @@
<Compile Include="DevFrm\BasicData\Frm_MesDepot.Designer.cs">
<DependentUpon>Frm_MesDepot.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\Warehouse\Frm_MesInvItemArn.cs">
+ <Compile Include="DevFrm\Rk\Frm_MesInvItemArn.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\Warehouse\Frm_MesInvItemArn.Designer.cs">
+ <Compile Include="DevFrm\Rk\Frm_MesInvItemArn.Designer.cs">
<DependentUpon>Frm_MesInvItemArn.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Warehouse\Frm_InitialBarcode.cs">
@@ -522,10 +522,10 @@
<Compile Include="DevFrm\Warehouse\Frm_InitialBarcode.Designer.cs">
<DependentUpon>Frm_InitialBarcode.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\Warehouse\Frm_MesInvItemIns.cs">
+ <Compile Include="DevFrm\Rk\Frm_MesInvItemIns.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\Warehouse\Frm_MesInvItemIns.Designer.cs">
+ <Compile Include="DevFrm\Rk\Frm_MesInvItemIns.Designer.cs">
<DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Ck\Frm_MesInvItemOuts_SQ.cs">
@@ -942,13 +942,13 @@
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesDepot.resx">
<DependentUpon>Frm_MesDepot.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesInvItemArn.resx">
+ <EmbeddedResource Include="DevFrm\Rk\Frm_MesInvItemArn.resx">
<DependentUpon>Frm_MesInvItemArn.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Warehouse\Frm_InitialBarcode.resx">
<DependentUpon>Frm_InitialBarcode.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesInvItemIns.resx">
+ <EmbeddedResource Include="DevFrm\Rk\Frm_MesInvItemIns.resx">
<DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Ck\Frm_MesInvItemOuts_SQ.resx">
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index bd91ba9..6cb3967 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -603,6 +603,17 @@
txt.Enabled = false;
continue;
}
+ //鑷畾daa
+ if (colType is UcLookDaa)
+ {
+ var txt = colType as UcLookDaa;
+ txt.SetIdOrCode(strVal);
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
+ continue;
+ }
if (colType is SimpleButton)
{
var txt = colType as SimpleButton;
@@ -823,6 +834,14 @@
txt.Enabled = !isEdt;
continue;
}
+ //鑷畾daa
+ if (ctrl is UcLookDaa)
+ {
+ var txt = ctrl as UcLookDaa;
+ txt.SetIdOrCode("-1");
+ txt.Enabled = !isEdt;
+ continue;
+ }
if (ctrl is SimpleButton)
{
var txt = ctrl as SimpleButton;
@@ -1040,6 +1059,16 @@
txt.Enabled = false;
continue;
}
+ //鑷畾daa
+ if (ctrl is UcLookDaa)
+ {
+ var txt = ctrl as UcLookDaa;
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
+ continue;
+ }
}
}
--
Gitblit v1.9.3