From d48678b5f13f51369a545d959e21ba81b551e45a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 06 十二月 2024 17:28:59 +0800
Subject: [PATCH] 精细化
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 78 ++--
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | 32 +-
DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs | 7
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 662 +++++++++++++++++++++----------------------
DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 33 -
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 1
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 33 ++
8 files changed, 436 insertions(+), 412 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 1311a03..9ff99f4 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -13,6 +13,7 @@
using System.Data;
using System.Drawing;
using System.Net;
+using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -36,15 +37,9 @@
toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
gcMx1.MouseClick += GcMx1_MouseClick;
- getPageList(1, UtilityHelper.GetPageSize());
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.CustomDrawRowIndicator += (s, e) =>
- {
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- {
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- }
- };
this.gvMx1.IndicatorWidth = 50;
gvMx1.CustomDrawRowIndicator += (s, e) =>
{
@@ -61,13 +56,6 @@
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);
- };
gvMx2.OptionsFind.ShowSearchNavButtons = false;
gvMx2.OptionsView.ShowGroupPanel = false;
gvMx3.OptionsFind.ShowSearchNavButtons = false;
@@ -83,7 +71,12 @@
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
}
-
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ Task.Delay(100);
+ getPageList(1);
+ }
private void GcMx1_MouseClick(object sender, MouseEventArgs e)
{
string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gvMx1, e, "guid");
@@ -231,7 +224,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
/// 鏌ヨ浜嬩欢
@@ -240,7 +233,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();
}
@@ -252,7 +248,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
/// <summary>
/// 鏃ュ織浜嬩欢
@@ -304,7 +300,7 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
}
catch (Exception ex)
@@ -350,7 +346,7 @@
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
@@ -370,7 +366,16 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
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>
/// 淇敼浜嬩欢
@@ -452,15 +457,11 @@
/// </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
{
@@ -470,13 +471,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
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
index edf242f..1abf666 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -29,16 +29,16 @@
/// </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();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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 editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1okRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1isdepsIn = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -511,10 +511,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.reset_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.reset_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.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)});
+ 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.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -532,10 +532,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 4ebc6a4..a89f5ed 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -1,18 +1,14 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraWaitForm;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
-using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -37,15 +33,14 @@
toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSearMx(gvMx1);
//璁剧疆缁勭粐
this.txt_receiveOrgId.EditChanged += (s, e) =>
{
string _orgId = txt_receiveOrgId.GetId();
- if (string.IsNullOrEmpty(_orgId))
- return;
txt_suppId.getSuppler(_orgId);
txt_depotsId.getSuppler(_orgId);
};
@@ -100,12 +95,12 @@
};
frm.ShowDialog();
};
-
}
- private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- Task.Delay(100);
+ Task.Delay(100);
getPageList(1);
}
/// <summary>
@@ -175,7 +170,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -189,7 +184,7 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎾ゅ洖宸叉彁浜ょ殑妫�楠屽悧锛�"))
return;
-
+
var _obj = new
{
guid = rowGuid,
@@ -213,7 +208,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
+
}
/// <summary>
@@ -221,7 +216,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
{
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -241,7 +236,7 @@
};
try
{
- var strJson = UtilityHelper.HttpPost("",
+ var strJson = UtilityHelper.HttpPost("",
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
@@ -459,7 +454,7 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
+ private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
@@ -601,7 +596,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private void repositoryItemButtonEdit2_ButtonClick(object sender, ButtonPressedEventArgs e)
+ private void repositoryItemButtonEdit2_ButtonClick(object sender, ButtonPressedEventArgs e)
{
var rowhandle = gvMx1.FocusedRowHandle;
if (rowhandle < 0)
@@ -619,7 +614,7 @@
}
var lst = new List<string>();
lst.Add(mxGuid);
-
+
var _obj = lst;
try
{
@@ -637,7 +632,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
+
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 8778db2..3942304 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -74,8 +74,6 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
- this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gv_fSubsidiary = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_paymentParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_transportMethod = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -83,57 +81,29 @@
this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_checkFalg = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_factory = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_documentStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_documentType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_businessType = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_purchaseDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_supplier = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_closeStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_purchaseDept = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_qtyAcceptance = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_purchaser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_qualityReq = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_cancellationStatus = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_cancellationPerson = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_cancellationDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_remarks = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_changereason = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_settlementParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_erpCheckBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_erpCheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -143,6 +113,35 @@
this.panel1 = new System.Windows.Forms.Panel();
this.lbGuid = new DevExpress.XtraEditors.LabelControl();
this.txt_supplier = new Gs.DevApp.UserControl.UcLookSupplier();
+ this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -756,7 +755,6 @@
this.gridBand28});
this.gridView1.ColumnPanelRowHeight = 30;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
- this.gv_fSubsidiary,
this.bandedGridColumn1,
this.gv_factory,
this.gv_billNo,
@@ -795,33 +793,6 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowColumnHeaders = false;
this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // gridBand29
- //
- this.gridBand29.Caption = "鏀舵枡缁勭粐";
- this.gridBand29.Columns.Add(this.gv_fSubsidiary);
- this.gridBand29.Columns.Add(this.gv_paymentParty);
- this.gridBand29.Columns.Add(this.gv_transportMethod);
- this.gridBand29.Columns.Add(this.gv_lastupdateDate);
- this.gridBand29.Columns.Add(this.gv_lastupdateBy);
- this.gridBand29.Columns.Add(this.gv_checkDate);
- this.gridBand29.Columns.Add(this.gv_checkBy);
- this.gridBand29.Columns.Add(this.gv_checkFalg);
- this.gridBand29.MinWidth = 250;
- this.gridBand29.Name = "gridBand29";
- this.gridBand29.VisibleIndex = 0;
- this.gridBand29.Width = 250;
- //
- // gv_fSubsidiary
- //
- this.gv_fSubsidiary.Caption = "鏀舵枡缁勭粐";
- this.gv_fSubsidiary.FieldName = "fSubsidiary";
- this.gv_fSubsidiary.MinWidth = 25;
- this.gv_fSubsidiary.Name = "gv_fSubsidiary";
- this.gv_fSubsidiary.OptionsColumn.AllowEdit = false;
- this.gv_fSubsidiary.Tag = "org.fnamber";
- this.gv_fSubsidiary.Visible = true;
- this.gv_fSubsidiary.Width = 250;
//
// gv_paymentParty
//
@@ -907,15 +878,6 @@
this.gv_checkFalg.Tag = "query_a.CHECK_FALG";
this.gv_checkFalg.Width = 100;
//
- // gridBand1
- //
- this.gridBand1.Caption = "ERPID鍙�";
- this.gridBand1.Columns.Add(this.gv_factory);
- this.gridBand1.MinWidth = 80;
- this.gridBand1.Name = "gridBand1";
- this.gridBand1.VisibleIndex = 1;
- this.gridBand1.Width = 80;
- //
// gv_factory
//
this.gv_factory.Caption = "ERPID鍙�";
@@ -926,15 +888,6 @@
this.gv_factory.Tag = "query_a.ebelnK3id";
this.gv_factory.Visible = true;
this.gv_factory.Width = 80;
- //
- // gridBand2
- //
- this.gridBand2.Caption = "閲囪喘鍗曞彿";
- this.gridBand2.Columns.Add(this.gv_billNo);
- this.gridBand2.MinWidth = 120;
- this.gridBand2.Name = "gridBand2";
- this.gridBand2.VisibleIndex = 2;
- this.gridBand2.Width = 120;
//
// gv_billNo
//
@@ -949,18 +902,6 @@
this.gv_billNo.Visible = true;
this.gv_billNo.Width = 120;
//
- // gridBand3
- //
- this.gridBand3.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand3.Caption = "鍗曟嵁鐘舵��:A鍒涘缓,B瀹℃牳涓�,C宸插鏍�,D閲嶆柊瀹℃牳,Z鏆傚瓨";
- this.gridBand3.Columns.Add(this.gv_documentStatus);
- this.gridBand3.MinWidth = 130;
- this.gridBand3.Name = "gridBand3";
- this.gridBand3.RowCount = 2;
- this.gridBand3.VisibleIndex = 3;
- this.gridBand3.Width = 130;
- //
// gv_documentStatus
//
this.gv_documentStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -973,17 +914,6 @@
this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS";
this.gv_documentStatus.Visible = true;
this.gv_documentStatus.Width = 130;
- //
- // gridBand4
- //
- this.gridBand4.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand4.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand4.Caption = "鍗曟嵁绫诲瀷:1閲囪喘,2濮斿";
- this.gridBand4.Columns.Add(this.gv_documentType);
- this.gridBand4.MinWidth = 80;
- this.gridBand4.Name = "gridBand4";
- this.gridBand4.VisibleIndex = 4;
- this.gridBand4.Width = 80;
//
// gv_documentType
//
@@ -998,15 +928,6 @@
this.gv_documentType.Visible = true;
this.gv_documentType.Width = 80;
//
- // gridBand5
- //
- this.gridBand5.Caption = "涓氬姟绫诲瀷";
- this.gridBand5.Columns.Add(this.gv_businessType);
- this.gridBand5.MinWidth = 80;
- this.gridBand5.Name = "gridBand5";
- this.gridBand5.VisibleIndex = 5;
- this.gridBand5.Width = 80;
- //
// gv_businessType
//
this.gv_businessType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1019,15 +940,6 @@
this.gv_businessType.Tag = "query_a.BUSINESS_TYPE";
this.gv_businessType.Visible = true;
this.gv_businessType.Width = 80;
- //
- // gridBand8
- //
- this.gridBand8.Caption = "閲囪喘鏃ユ湡";
- this.gridBand8.Columns.Add(this.gv_purchaseDate);
- this.gridBand8.MinWidth = 170;
- this.gridBand8.Name = "gridBand8";
- this.gridBand8.VisibleIndex = 6;
- this.gridBand8.Width = 170;
//
// gv_purchaseDate
//
@@ -1042,27 +954,6 @@
this.gv_purchaseDate.Visible = true;
this.gv_purchaseDate.Width = 170;
//
- // gridBand6
- //
- this.gridBand6.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand6.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand6.Caption = "渚涘簲鍟�";
- this.gridBand6.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand11,
- this.gridBand7});
- this.gridBand6.MinWidth = 200;
- this.gridBand6.Name = "gridBand6";
- this.gridBand6.VisibleIndex = 7;
- this.gridBand6.Width = 200;
- //
- // gridBand11
- //
- this.gridBand11.Caption = "ID";
- this.gridBand11.Columns.Add(this.gv_supplier);
- this.gridBand11.Name = "gridBand11";
- this.gridBand11.VisibleIndex = 0;
- this.gridBand11.Width = 66;
- //
// gv_supplier
//
this.gv_supplier.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1076,15 +967,6 @@
this.gv_supplier.Visible = true;
this.gv_supplier.Width = 66;
//
- // gridBand7
- //
- this.gridBand7.Caption = "鍚嶇О";
- this.gridBand7.Columns.Add(this.bandedGridColumn1);
- this.gridBand7.MinWidth = 100;
- this.gridBand7.Name = "gridBand7";
- this.gridBand7.VisibleIndex = 1;
- this.gridBand7.Width = 134;
- //
// bandedGridColumn1
//
this.bandedGridColumn1.Caption = "渚涘簲鍟嗗悕绉�";
@@ -1095,17 +977,6 @@
this.bandedGridColumn1.Tag = "query_a.suppName";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.Width = 134;
- //
- // gridBand9
- //
- this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand9.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand9.Caption = "鍏抽棴鏍囪瘑:A鏄�,B鍚�";
- this.gridBand9.Columns.Add(this.gv_closeStatus);
- this.gridBand9.MinWidth = 80;
- this.gridBand9.Name = "gridBand9";
- this.gridBand9.VisibleIndex = 8;
- this.gridBand9.Width = 80;
//
// gv_closeStatus
//
@@ -1120,28 +991,6 @@
this.gv_closeStatus.Visible = true;
this.gv_closeStatus.Width = 80;
//
- // gridBand10
- //
- this.gridBand10.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand10.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand10.Caption = "閲囪喘閮ㄩ棬";
- this.gridBand10.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand12,
- this.gridBand13});
- this.gridBand10.MinWidth = 100;
- this.gridBand10.Name = "gridBand10";
- this.gridBand10.VisibleIndex = 9;
- this.gridBand10.Width = 130;
- //
- // gridBand12
- //
- this.gridBand12.Caption = "缂栧彿";
- this.gridBand12.Columns.Add(this.gv_purchaseDept);
- this.gridBand12.MinWidth = 50;
- this.gridBand12.Name = "gridBand12";
- this.gridBand12.VisibleIndex = 0;
- this.gridBand12.Width = 50;
- //
// gv_purchaseDept
//
this.gv_purchaseDept.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1155,15 +1004,6 @@
this.gv_purchaseDept.Visible = true;
this.gv_purchaseDept.Width = 50;
//
- // gridBand13
- //
- this.gridBand13.Caption = "鍚嶇О";
- this.gridBand13.Columns.Add(this.bandedGridColumn2);
- this.gridBand13.MinWidth = 80;
- this.gridBand13.Name = "gridBand13";
- this.gridBand13.VisibleIndex = 1;
- this.gridBand13.Width = 80;
- //
// bandedGridColumn2
//
this.bandedGridColumn2.Caption = "閲囪喘閮ㄩ棬鍚嶇О";
@@ -1174,17 +1014,6 @@
this.bandedGridColumn2.Tag = "query_a.departmentname";
this.bandedGridColumn2.Visible = true;
this.bandedGridColumn2.Width = 80;
- //
- // gridBand14
- //
- this.gridBand14.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridBand14.Caption = "鏁伴噺楠屾敹";
- this.gridBand14.Columns.Add(this.gv_qtyAcceptance);
- this.gridBand14.MinWidth = 50;
- this.gridBand14.Name = "gridBand14";
- this.gridBand14.VisibleIndex = 10;
- this.gridBand14.Width = 50;
//
// gv_qtyAcceptance
//
@@ -1199,15 +1028,6 @@
this.gv_qtyAcceptance.Visible = true;
this.gv_qtyAcceptance.Width = 50;
//
- // gridBand15
- //
- this.gridBand15.Caption = "閲囪喘鍛�";
- this.gridBand15.Columns.Add(this.gv_purchaser);
- this.gridBand15.MinWidth = 60;
- this.gridBand15.Name = "gridBand15";
- this.gridBand15.VisibleIndex = 11;
- this.gridBand15.Width = 60;
- //
// gv_purchaser
//
this.gv_purchaser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1220,15 +1040,6 @@
this.gv_purchaser.Tag = "query_a.PURCHASER";
this.gv_purchaser.Visible = true;
this.gv_purchaser.Width = 60;
- //
- // gridBand16
- //
- this.gridBand16.Caption = "璐ㄩ噺瑕佹眰";
- this.gridBand16.Columns.Add(this.gv_qualityReq);
- this.gridBand16.MinWidth = 80;
- this.gridBand16.Name = "gridBand16";
- this.gridBand16.VisibleIndex = 12;
- this.gridBand16.Width = 80;
//
// gv_qualityReq
//
@@ -1243,28 +1054,6 @@
this.gv_qualityReq.Visible = true;
this.gv_qualityReq.Width = 80;
//
- // gridBand17
- //
- this.gridBand17.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand17.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand17.Caption = "浣滃簾鐘舵��";
- this.gridBand17.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand19,
- this.gridBand18,
- this.gridBand20});
- this.gridBand17.Name = "gridBand17";
- this.gridBand17.VisibleIndex = 13;
- this.gridBand17.Width = 300;
- //
- // gridBand19
- //
- this.gridBand19.Caption = "浣滃簾鐘舵��";
- this.gridBand19.Columns.Add(this.gv_cancellationStatus);
- this.gridBand19.MinWidth = 60;
- this.gridBand19.Name = "gridBand19";
- this.gridBand19.VisibleIndex = 0;
- this.gridBand19.Width = 60;
- //
// gv_cancellationStatus
//
this.gv_cancellationStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1277,15 +1066,6 @@
this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
this.gv_cancellationStatus.Visible = true;
this.gv_cancellationStatus.Width = 60;
- //
- // gridBand18
- //
- this.gridBand18.Caption = "浣滃簾浜�";
- this.gridBand18.Columns.Add(this.gv_cancellationPerson);
- this.gridBand18.MinWidth = 60;
- this.gridBand18.Name = "gridBand18";
- this.gridBand18.VisibleIndex = 1;
- this.gridBand18.Width = 60;
//
// gv_cancellationPerson
//
@@ -1300,15 +1080,6 @@
this.gv_cancellationPerson.Visible = true;
this.gv_cancellationPerson.Width = 60;
//
- // gridBand20
- //
- this.gridBand20.Caption = "浣滃簾鏃ユ湡";
- this.gridBand20.Columns.Add(this.gv_cancellationDate);
- this.gridBand20.MinWidth = 180;
- this.gridBand20.Name = "gridBand20";
- this.gridBand20.VisibleIndex = 2;
- this.gridBand20.Width = 180;
- //
// gv_cancellationDate
//
this.gv_cancellationDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1321,27 +1092,6 @@
this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
this.gv_cancellationDate.Visible = true;
this.gv_cancellationDate.Width = 180;
- //
- // gridBand21
- //
- this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand21.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand21.Caption = "鍒涘缓淇℃伅";
- this.gridBand21.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand25,
- this.gridBand22});
- this.gridBand21.Name = "gridBand21";
- this.gridBand21.VisibleIndex = 14;
- this.gridBand21.Width = 260;
- //
- // gridBand25
- //
- this.gridBand25.Caption = "鍒涘缓浜�";
- this.gridBand25.Columns.Add(this.gv_createBy);
- this.gridBand25.MinWidth = 80;
- this.gridBand25.Name = "gridBand25";
- this.gridBand25.VisibleIndex = 0;
- this.gridBand25.Width = 80;
//
// gv_createBy
//
@@ -1356,15 +1106,6 @@
this.gv_createBy.Visible = true;
this.gv_createBy.Width = 80;
//
- // gridBand22
- //
- this.gridBand22.Caption = "鍒涘缓鏃ユ湡";
- this.gridBand22.Columns.Add(this.gv_createDate);
- this.gridBand22.MinWidth = 180;
- this.gridBand22.Name = "gridBand22";
- this.gridBand22.VisibleIndex = 1;
- this.gridBand22.Width = 180;
- //
// gv_createDate
//
this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1377,15 +1118,6 @@
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
this.gv_createDate.Width = 180;
- //
- // gridBand23
- //
- this.gridBand23.Caption = "澶囨敞";
- this.gridBand23.Columns.Add(this.gv_remarks);
- this.gridBand23.MinWidth = 100;
- this.gridBand23.Name = "gridBand23";
- this.gridBand23.VisibleIndex = 15;
- this.gridBand23.Width = 100;
//
// gv_remarks
//
@@ -1400,15 +1132,6 @@
this.gv_remarks.Visible = true;
this.gv_remarks.Width = 100;
//
- // gridBand24
- //
- this.gridBand24.Caption = "鍙樻洿鍘熷洜";
- this.gridBand24.Columns.Add(this.gv_changereason);
- this.gridBand24.MinWidth = 100;
- this.gridBand24.Name = "gridBand24";
- this.gridBand24.VisibleIndex = 16;
- this.gridBand24.Width = 100;
- //
// gv_changereason
//
this.gv_changereason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1421,28 +1144,6 @@
this.gv_changereason.Tag = "query_a.CHANGEREASON";
this.gv_changereason.Visible = true;
this.gv_changereason.Width = 100;
- //
- // gridBand28
- //
- this.gridBand28.AppearanceHeader.Options.UseTextOptions = true;
- this.gridBand28.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.gridBand28.Caption = "ERP瀹℃牳淇℃伅";
- this.gridBand28.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
- this.gridBand27,
- this.gridBand26});
- this.gridBand28.Name = "gridBand28";
- this.gridBand28.VisibleIndex = 17;
- this.gridBand28.Width = 260;
- //
- // gridBand27
- //
- this.gridBand27.Caption = "瀹℃牳浜�";
- this.gridBand27.Columns.Add(this.gv_settlementParty);
- this.gridBand27.Columns.Add(this.gv_erpCheckBy);
- this.gridBand27.MinWidth = 80;
- this.gridBand27.Name = "gridBand27";
- this.gridBand27.VisibleIndex = 0;
- this.gridBand27.Width = 80;
//
// gv_settlementParty
//
@@ -1468,15 +1169,6 @@
this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY";
this.gv_erpCheckBy.Visible = true;
this.gv_erpCheckBy.Width = 80;
- //
- // gridBand26
- //
- this.gridBand26.Caption = "ERP瀹℃牳鏃堕棿";
- this.gridBand26.Columns.Add(this.gv_erpCheckDate);
- this.gridBand26.MinWidth = 180;
- this.gridBand26.Name = "gridBand26";
- this.gridBand26.VisibleIndex = 1;
- this.gridBand26.Width = 180;
//
// gv_erpCheckDate
//
@@ -1578,6 +1270,301 @@
this.txt_supplier.Name = "txt_supplier";
this.txt_supplier.Size = new System.Drawing.Size(305, 30);
this.txt_supplier.TabIndex = 227;
+ //
+ // gridBand29
+ //
+ this.gridBand29.Caption = "鏀舵枡缁勭粐";
+ this.gridBand29.Columns.Add(this.gv_paymentParty);
+ this.gridBand29.Columns.Add(this.gv_transportMethod);
+ this.gridBand29.Columns.Add(this.gv_lastupdateDate);
+ this.gridBand29.Columns.Add(this.gv_lastupdateBy);
+ this.gridBand29.Columns.Add(this.gv_checkDate);
+ this.gridBand29.Columns.Add(this.gv_checkBy);
+ this.gridBand29.Columns.Add(this.gv_checkFalg);
+ this.gridBand29.MinWidth = 250;
+ this.gridBand29.Name = "gridBand29";
+ this.gridBand29.Visible = false;
+ this.gridBand29.VisibleIndex = -1;
+ this.gridBand29.Width = 250;
+ //
+ // gridBand1
+ //
+ this.gridBand1.Caption = "ERPID鍙�";
+ this.gridBand1.Columns.Add(this.gv_factory);
+ this.gridBand1.MinWidth = 80;
+ this.gridBand1.Name = "gridBand1";
+ this.gridBand1.VisibleIndex = 0;
+ this.gridBand1.Width = 80;
+ //
+ // gridBand2
+ //
+ this.gridBand2.Caption = "閲囪喘鍗曞彿";
+ this.gridBand2.Columns.Add(this.gv_billNo);
+ this.gridBand2.MinWidth = 120;
+ this.gridBand2.Name = "gridBand2";
+ this.gridBand2.VisibleIndex = 1;
+ this.gridBand2.Width = 120;
+ //
+ // gridBand3
+ //
+ this.gridBand3.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand3.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand3.Caption = "鍗曟嵁鐘舵��:A鍒涘缓,B瀹℃牳涓�,C宸插鏍�,D閲嶆柊瀹℃牳,Z鏆傚瓨";
+ this.gridBand3.Columns.Add(this.gv_documentStatus);
+ this.gridBand3.MinWidth = 130;
+ this.gridBand3.Name = "gridBand3";
+ this.gridBand3.RowCount = 2;
+ this.gridBand3.VisibleIndex = 2;
+ this.gridBand3.Width = 130;
+ //
+ // gridBand4
+ //
+ this.gridBand4.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand4.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand4.Caption = "鍗曟嵁绫诲瀷:1閲囪喘,2濮斿";
+ this.gridBand4.Columns.Add(this.gv_documentType);
+ this.gridBand4.MinWidth = 80;
+ this.gridBand4.Name = "gridBand4";
+ this.gridBand4.VisibleIndex = 3;
+ this.gridBand4.Width = 80;
+ //
+ // gridBand5
+ //
+ this.gridBand5.Caption = "涓氬姟绫诲瀷";
+ this.gridBand5.Columns.Add(this.gv_businessType);
+ this.gridBand5.MinWidth = 80;
+ this.gridBand5.Name = "gridBand5";
+ this.gridBand5.VisibleIndex = 4;
+ this.gridBand5.Width = 80;
+ //
+ // gridBand8
+ //
+ this.gridBand8.Caption = "閲囪喘鏃ユ湡";
+ this.gridBand8.Columns.Add(this.gv_purchaseDate);
+ this.gridBand8.MinWidth = 170;
+ this.gridBand8.Name = "gridBand8";
+ this.gridBand8.VisibleIndex = 5;
+ this.gridBand8.Width = 170;
+ //
+ // gridBand6
+ //
+ this.gridBand6.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand6.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand6.Caption = "渚涘簲鍟�";
+ this.gridBand6.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand11,
+ this.gridBand7});
+ this.gridBand6.MinWidth = 200;
+ this.gridBand6.Name = "gridBand6";
+ this.gridBand6.VisibleIndex = 6;
+ this.gridBand6.Width = 200;
+ //
+ // gridBand11
+ //
+ this.gridBand11.Caption = "ID";
+ this.gridBand11.Columns.Add(this.gv_supplier);
+ this.gridBand11.Name = "gridBand11";
+ this.gridBand11.VisibleIndex = 0;
+ this.gridBand11.Width = 66;
+ //
+ // gridBand7
+ //
+ this.gridBand7.Caption = "鍚嶇О";
+ this.gridBand7.Columns.Add(this.bandedGridColumn1);
+ this.gridBand7.MinWidth = 100;
+ this.gridBand7.Name = "gridBand7";
+ this.gridBand7.VisibleIndex = 1;
+ this.gridBand7.Width = 134;
+ //
+ // gridBand9
+ //
+ this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand9.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand9.Caption = "鍏抽棴鏍囪瘑:A鏄�,B鍚�";
+ this.gridBand9.Columns.Add(this.gv_closeStatus);
+ this.gridBand9.MinWidth = 80;
+ this.gridBand9.Name = "gridBand9";
+ this.gridBand9.VisibleIndex = 7;
+ this.gridBand9.Width = 80;
+ //
+ // gridBand10
+ //
+ this.gridBand10.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand10.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand10.Caption = "閲囪喘閮ㄩ棬";
+ this.gridBand10.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand12,
+ this.gridBand13});
+ this.gridBand10.MinWidth = 100;
+ this.gridBand10.Name = "gridBand10";
+ this.gridBand10.VisibleIndex = 8;
+ this.gridBand10.Width = 130;
+ //
+ // gridBand12
+ //
+ this.gridBand12.Caption = "缂栧彿";
+ this.gridBand12.Columns.Add(this.gv_purchaseDept);
+ this.gridBand12.MinWidth = 50;
+ this.gridBand12.Name = "gridBand12";
+ this.gridBand12.VisibleIndex = 0;
+ this.gridBand12.Width = 50;
+ //
+ // gridBand13
+ //
+ this.gridBand13.Caption = "鍚嶇О";
+ this.gridBand13.Columns.Add(this.bandedGridColumn2);
+ this.gridBand13.MinWidth = 80;
+ this.gridBand13.Name = "gridBand13";
+ this.gridBand13.VisibleIndex = 1;
+ this.gridBand13.Width = 80;
+ //
+ // gridBand14
+ //
+ this.gridBand14.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand14.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridBand14.Caption = "鏁伴噺楠屾敹";
+ this.gridBand14.Columns.Add(this.gv_qtyAcceptance);
+ this.gridBand14.MinWidth = 50;
+ this.gridBand14.Name = "gridBand14";
+ this.gridBand14.VisibleIndex = 9;
+ this.gridBand14.Width = 50;
+ //
+ // gridBand15
+ //
+ this.gridBand15.Caption = "閲囪喘鍛�";
+ this.gridBand15.Columns.Add(this.gv_purchaser);
+ this.gridBand15.MinWidth = 60;
+ this.gridBand15.Name = "gridBand15";
+ this.gridBand15.VisibleIndex = 10;
+ this.gridBand15.Width = 60;
+ //
+ // gridBand16
+ //
+ this.gridBand16.Caption = "璐ㄩ噺瑕佹眰";
+ this.gridBand16.Columns.Add(this.gv_qualityReq);
+ this.gridBand16.MinWidth = 80;
+ this.gridBand16.Name = "gridBand16";
+ this.gridBand16.VisibleIndex = 11;
+ this.gridBand16.Width = 80;
+ //
+ // gridBand17
+ //
+ this.gridBand17.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand17.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand17.Caption = "浣滃簾鐘舵��";
+ this.gridBand17.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand19,
+ this.gridBand18,
+ this.gridBand20});
+ this.gridBand17.Name = "gridBand17";
+ this.gridBand17.VisibleIndex = 12;
+ this.gridBand17.Width = 300;
+ //
+ // gridBand19
+ //
+ this.gridBand19.Caption = "浣滃簾鐘舵��";
+ this.gridBand19.Columns.Add(this.gv_cancellationStatus);
+ this.gridBand19.MinWidth = 60;
+ this.gridBand19.Name = "gridBand19";
+ this.gridBand19.VisibleIndex = 0;
+ this.gridBand19.Width = 60;
+ //
+ // gridBand18
+ //
+ this.gridBand18.Caption = "浣滃簾浜�";
+ this.gridBand18.Columns.Add(this.gv_cancellationPerson);
+ this.gridBand18.MinWidth = 60;
+ this.gridBand18.Name = "gridBand18";
+ this.gridBand18.VisibleIndex = 1;
+ this.gridBand18.Width = 60;
+ //
+ // gridBand20
+ //
+ this.gridBand20.Caption = "浣滃簾鏃ユ湡";
+ this.gridBand20.Columns.Add(this.gv_cancellationDate);
+ this.gridBand20.MinWidth = 180;
+ this.gridBand20.Name = "gridBand20";
+ this.gridBand20.VisibleIndex = 2;
+ this.gridBand20.Width = 180;
+ //
+ // gridBand21
+ //
+ this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand21.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand21.Caption = "鍒涘缓淇℃伅";
+ this.gridBand21.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand25,
+ this.gridBand22});
+ this.gridBand21.Name = "gridBand21";
+ this.gridBand21.VisibleIndex = 13;
+ this.gridBand21.Width = 260;
+ //
+ // gridBand25
+ //
+ this.gridBand25.Caption = "鍒涘缓浜�";
+ this.gridBand25.Columns.Add(this.gv_createBy);
+ this.gridBand25.MinWidth = 80;
+ this.gridBand25.Name = "gridBand25";
+ this.gridBand25.VisibleIndex = 0;
+ this.gridBand25.Width = 80;
+ //
+ // gridBand22
+ //
+ this.gridBand22.Caption = "鍒涘缓鏃ユ湡";
+ this.gridBand22.Columns.Add(this.gv_createDate);
+ this.gridBand22.MinWidth = 180;
+ this.gridBand22.Name = "gridBand22";
+ this.gridBand22.VisibleIndex = 1;
+ this.gridBand22.Width = 180;
+ //
+ // gridBand23
+ //
+ this.gridBand23.Caption = "澶囨敞";
+ this.gridBand23.Columns.Add(this.gv_remarks);
+ this.gridBand23.MinWidth = 100;
+ this.gridBand23.Name = "gridBand23";
+ this.gridBand23.VisibleIndex = 14;
+ this.gridBand23.Width = 100;
+ //
+ // gridBand24
+ //
+ this.gridBand24.Caption = "鍙樻洿鍘熷洜";
+ this.gridBand24.Columns.Add(this.gv_changereason);
+ this.gridBand24.MinWidth = 100;
+ this.gridBand24.Name = "gridBand24";
+ this.gridBand24.VisibleIndex = 15;
+ this.gridBand24.Width = 100;
+ //
+ // gridBand28
+ //
+ this.gridBand28.AppearanceHeader.Options.UseTextOptions = true;
+ this.gridBand28.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.gridBand28.Caption = "ERP瀹℃牳淇℃伅";
+ this.gridBand28.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand27,
+ this.gridBand26});
+ this.gridBand28.Name = "gridBand28";
+ this.gridBand28.VisibleIndex = 16;
+ this.gridBand28.Width = 260;
+ //
+ // gridBand27
+ //
+ this.gridBand27.Caption = "瀹℃牳浜�";
+ this.gridBand27.Columns.Add(this.gv_settlementParty);
+ this.gridBand27.Columns.Add(this.gv_erpCheckBy);
+ this.gridBand27.MinWidth = 80;
+ this.gridBand27.Name = "gridBand27";
+ this.gridBand27.VisibleIndex = 0;
+ this.gridBand27.Width = 80;
+ //
+ // gridBand26
+ //
+ this.gridBand26.Caption = "ERP瀹℃牳鏃堕棿";
+ this.gridBand26.Columns.Add(this.gv_erpCheckDate);
+ this.gridBand26.MinWidth = 180;
+ this.gridBand26.Name = "gridBand26";
+ this.gridBand26.VisibleIndex = 1;
+ this.gridBand26.Width = 180;
//
// Frm_MesRohIn
//
@@ -1693,7 +1680,6 @@
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
private UserControl.UcLookSupplier txt_supplier;
private DevExpress.XtraEditors.LabelControl lbGuid;
- private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_fSubsidiary;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand29;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index fe9d21d..69b73a2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -29,6 +29,7 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ txt_supplier.getSuppler("");
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 73cc569..e88ab78 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1399,6 +1399,39 @@
};
}
}
+
+ /// <summary>
+ /// 璁剧疆鏄庣粏grid鏍峰紡
+ /// </summary>
+ /// <param name="gridView1"></param>
+ /// <param name="btnChkIco"></param>
+ /// <param name="fm"></param>
+ /// <param name="fileName"></param>
+ /// <param name="icoName"></param>
+ public static void SetGridSearMx(GridView gridView1)
+ {
+ gridView1.OptionsFilter.AllowFilterEditor = false;
+ gridView1.OptionsFilter.ShowCustomFunctions = DevExpress.Utils.DefaultBoolean.False;
+ gridView1.OptionsCustomization.AllowFilter = false;
+ gridView1.OptionsFind.ShowSearchNavButtons = false;
+ gridView1.OptionsView.ShowAutoFilterRow = false;
+ gridView1.OptionsView.ShowGroupPanel = false;
+ gridView1.IndicatorWidth = 40;
+ gridView1.CustomDrawRowIndicator += (s, e) =>
+ {
+ if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+ e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ };
+ gridView1.CustomDrawEmptyForeground += (s, e) =>
+ {
+ var str = "鏆傛棤鏄庣粏鏁版嵁!";
+ var f = new Font("寰蒋闆呴粦", 16);
+ var 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);
+ };
+ }
+
#endregion
public static bool IsNumeric(string str)
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs
index e2f75e3..40e44cd 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs
@@ -80,7 +80,7 @@
this.gridColumn1.MaxWidth = 100;
this.gridColumn1.MinWidth = 80;
this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.UnboundDataType = typeof(short);
+ this.gridColumn1.UnboundDataType = typeof(string);
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 1;
this.gridColumn1.Width = 100;
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
index cc836f9..46135d3 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Data;
+using System.Windows.Forms;
using System.Windows.Media.Animation;
using DevExpress.Emf;
using DevExpress.XtraEditors;
@@ -50,11 +51,13 @@
var strReturn = UtilityHelper.HttpPost("",
"MesSupplierManager/GetListSelect", json);
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = rtn.rtnData.list;
+ DataTable dt = rtn.rtnData.list;
lookSearchSupplier.Properties.DataSource = dt;
lookSearchSupplier.Properties.DisplayMember = "suppName";
lookSearchSupplier.Properties.ValueMember = "id";
-
+ //MessageBox.Show(dt.Rows.Count.ToString());
+ //SetIdOrCode("143895".ToString().Trim());
+ //MessageBox.Show("2");
}
catch (Exception ex)
{
--
Gitblit v1.9.3