From 819573ad118c73c49118aaeb9f9d21438943e230 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期日, 17 十一月 2024 16:49:09 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 42 +-
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 107 ++++--
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 728 +++++++++++++++++++++++++-----------------------
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 2
4 files changed, 461 insertions(+), 418 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 1753f66..e22ff14 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -143,6 +143,8 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.panel1 = new System.Windows.Forms.Panel();
+ this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit();
this.txt_lotNo1 = new DevExpress.XtraEditors.TextEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
@@ -197,6 +199,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
@@ -343,12 +346,12 @@
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
- this.gvMx1fupAllow.MinWidth = 40;
+ this.gvMx1fupAllow.MinWidth = 50;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
this.gvMx1fupAllow.Tag = "query_a.fup_allow";
this.gvMx1fupAllow.Visible = true;
this.gvMx1fupAllow.VisibleIndex = 4;
- this.gvMx1fupAllow.Width = 40;
+ this.gvMx1fupAllow.Width = 50;
//
// gvMx1fstand
//
@@ -356,12 +359,12 @@
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
- this.gvMx1fstand.MinWidth = 40;
+ this.gvMx1fstand.MinWidth = 50;
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "query_a.fstand";
this.gvMx1fstand.Visible = true;
this.gvMx1fstand.VisibleIndex = 5;
- this.gvMx1fstand.Width = 94;
+ this.gvMx1fstand.Width = 50;
//
// gvMx1fdownAllow
//
@@ -369,12 +372,12 @@
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
- this.gvMx1fdownAllow.MinWidth = 40;
+ this.gvMx1fdownAllow.MinWidth = 50;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
this.gvMx1fdownAllow.Visible = true;
this.gvMx1fdownAllow.VisibleIndex = 6;
- this.gvMx1fdownAllow.Width = 94;
+ this.gvMx1fdownAllow.Width = 50;
//
// gvMx1freQty
//
@@ -382,12 +385,12 @@
this.gvMx1freQty.AppearanceCell.Options.UseFont = true;
this.gvMx1freQty.Caption = "RE鏁伴噺";
this.gvMx1freQty.FieldName = "freQty";
- this.gvMx1freQty.MinWidth = 40;
+ this.gvMx1freQty.MinWidth = 50;
this.gvMx1freQty.Name = "gvMx1freQty";
this.gvMx1freQty.Tag = "query_a.fre_qty";
this.gvMx1freQty.Visible = true;
this.gvMx1freQty.VisibleIndex = 7;
- this.gvMx1freQty.Width = 94;
+ this.gvMx1freQty.Width = 50;
//
// gvMx1checkQyt
//
@@ -395,12 +398,12 @@
this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
this.gvMx1checkQyt.FieldName = "checkQyt";
- this.gvMx1checkQyt.MinWidth = 40;
+ this.gvMx1checkQyt.MinWidth = 60;
this.gvMx1checkQyt.Name = "gvMx1checkQyt";
this.gvMx1checkQyt.Tag = "query_a.check_qyt";
this.gvMx1checkQyt.Visible = true;
this.gvMx1checkQyt.VisibleIndex = 8;
- this.gvMx1checkQyt.Width = 94;
+ this.gvMx1checkQyt.Width = 60;
//
// gvMx1fenterQty
//
@@ -408,12 +411,12 @@
this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
this.gvMx1fenterQty.FieldName = "fenterQty";
- this.gvMx1fenterQty.MinWidth = 40;
+ this.gvMx1fenterQty.MinWidth = 60;
this.gvMx1fenterQty.Name = "gvMx1fenterQty";
this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
this.gvMx1fenterQty.Visible = true;
this.gvMx1fenterQty.VisibleIndex = 9;
- this.gvMx1fenterQty.Width = 94;
+ this.gvMx1fenterQty.Width = 60;
//
// gvMx1fcheckResu
//
@@ -425,7 +428,7 @@
this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gvMx1fcheckResu.FieldName = "fcheckResu";
- this.gvMx1fcheckResu.MinWidth = 60;
+ this.gvMx1fcheckResu.MinWidth = 80;
this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
this.gvMx1fcheckResu.Visible = true;
@@ -437,8 +440,8 @@
this.gvMx1fngRate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
- this.gvMx1fngRate.FieldName = "fngRate";
- this.gvMx1fngRate.MinWidth = 40;
+ this.gvMx1fngRate.FieldName = "fngRateName";
+ this.gvMx1fngRate.MinWidth = 80;
this.gvMx1fngRate.Name = "gvMx1fngRate";
this.gvMx1fngRate.Tag = "query_a.fng_rate";
this.gvMx1fngRate.Visible = true;
@@ -451,12 +454,12 @@
this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
this.gvMx1fngQty.FieldName = "fngQty";
- this.gvMx1fngQty.MinWidth = 40;
+ this.gvMx1fngQty.MinWidth = 50;
this.gvMx1fngQty.Name = "gvMx1fngQty";
this.gvMx1fngQty.Tag = "query_a.fng_qty";
this.gvMx1fngQty.Visible = true;
this.gvMx1fngQty.VisibleIndex = 12;
- this.gvMx1fngQty.Width = 94;
+ this.gvMx1fngQty.Width = 50;
//
// gvMx1sampleSizeNo
//
@@ -613,7 +616,7 @@
//
this.lb_remarks.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remarks.Appearance.Options.UseFont = true;
- this.lb_remarks.Location = new System.Drawing.Point(370, 125);
+ this.lb_remarks.Location = new System.Drawing.Point(377, 125);
this.lb_remarks.Name = "lb_remarks";
this.lb_remarks.Size = new System.Drawing.Size(73, 21);
this.lb_remarks.TabIndex = 786;
@@ -625,7 +628,7 @@
this.txt_fngDesc.Name = "txt_fngDesc";
this.txt_fngDesc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fngDesc.Properties.Appearance.Options.UseFont = true;
- this.txt_fngDesc.Size = new System.Drawing.Size(530, 28);
+ this.txt_fngDesc.Size = new System.Drawing.Size(559, 28);
this.txt_fngDesc.TabIndex = 786;
//
// gv_remarks
@@ -784,11 +787,12 @@
this.gv_fsubmit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fsubmit.AppearanceCell.Options.UseFont = true;
this.gv_fsubmit.Caption = "鎻愪氦鏍囪瘑";
- this.gv_fsubmit.FieldName = "fsubmit";
+ this.gv_fsubmit.FieldName = "fsubmitTxt";
this.gv_fsubmit.MinWidth = 50;
this.gv_fsubmit.Name = "gv_fsubmit";
this.gv_fsubmit.OptionsColumn.AllowEdit = false;
this.gv_fsubmit.Tag = "query_a.fsubmit";
+ this.gv_fsubmit.UnboundDataType = typeof(bool);
this.gv_fsubmit.Visible = true;
this.gv_fsubmit.VisibleIndex = 1;
this.gv_fsubmit.Width = 94;
@@ -798,11 +802,12 @@
this.gv_modify1Flag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_modify1Flag.AppearanceCell.Options.UseFont = true;
this.gv_modify1Flag.Caption = "瀹℃牳鏍囧織";
- this.gv_modify1Flag.FieldName = "modify1Flag";
+ this.gv_modify1Flag.FieldName = "modify1FlagTxt";
this.gv_modify1Flag.MinWidth = 50;
this.gv_modify1Flag.Name = "gv_modify1Flag";
this.gv_modify1Flag.OptionsColumn.AllowEdit = false;
this.gv_modify1Flag.Tag = "query_a.modify1_flag";
+ this.gv_modify1Flag.UnboundDataType = typeof(bool);
this.gv_modify1Flag.Visible = true;
this.gv_modify1Flag.VisibleIndex = 2;
this.gv_modify1Flag.Width = 100;
@@ -890,7 +895,7 @@
// txt_checkQty
//
this.txt_checkQty.Enabled = false;
- this.txt_checkQty.Location = new System.Drawing.Point(706, 50);
+ this.txt_checkQty.Location = new System.Drawing.Point(702, 50);
this.txt_checkQty.Name = "txt_checkQty";
this.txt_checkQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkQty.Properties.Appearance.Options.UseFont = true;
@@ -943,7 +948,7 @@
//
this.lb_fbatchQty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fbatchQty.Appearance.Options.UseFont = true;
- this.lb_fbatchQty.Location = new System.Drawing.Point(377, 54);
+ this.lb_fbatchQty.Location = new System.Drawing.Point(870, 55);
this.lb_fbatchQty.Name = "lb_fbatchQty";
this.lb_fbatchQty.Size = new System.Drawing.Size(73, 21);
this.lb_fbatchQty.TabIndex = 222;
@@ -952,11 +957,11 @@
// txt_fbatchQty
//
this.txt_fbatchQty.Enabled = false;
- this.txt_fbatchQty.Location = new System.Drawing.Point(452, 50);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(945, 51);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fbatchQty.Size = new System.Drawing.Size(150, 28);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(66, 28);
this.txt_fbatchQty.TabIndex = 222;
//
// gv_fbatchQty
@@ -991,7 +996,7 @@
//
this.lb_fcheckBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fcheckBy.Appearance.Options.UseFont = true;
- this.lb_fcheckBy.Location = new System.Drawing.Point(627, 14);
+ this.lb_fcheckBy.Location = new System.Drawing.Point(377, 54);
this.lb_fcheckBy.Name = "lb_fcheckBy";
this.lb_fcheckBy.Size = new System.Drawing.Size(73, 21);
this.lb_fcheckBy.TabIndex = 217;
@@ -1000,7 +1005,7 @@
// txt_fcheckBy
//
this.txt_fcheckBy.Enabled = false;
- this.txt_fcheckBy.Location = new System.Drawing.Point(706, 10);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(452, 50);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
@@ -1161,10 +1166,11 @@
// gridColumn13
//
this.gridColumn13.Caption = "鏄惁鎬ユ枡";
- this.gridColumn13.FieldName = "urgentLag";
+ this.gridColumn13.FieldName = "urgentLagTxt";
this.gridColumn13.MinWidth = 50;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.OptionsColumn.ReadOnly = true;
+ this.gridColumn13.UnboundDataType = typeof(bool);
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 0;
this.gridColumn13.Width = 94;
@@ -1422,6 +1428,8 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.labelControl4);
+ this.panel1.Controls.Add(this.txt_fcheckResu);
this.panel1.Controls.Add(this.txt_lotNo1);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.txt_suppId);
@@ -1459,20 +1467,38 @@
this.panel1.Size = new System.Drawing.Size(1342, 198);
this.panel1.TabIndex = 1;
//
+ // labelControl4
+ //
+ this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl4.Appearance.Options.UseFont = true;
+ this.labelControl4.Location = new System.Drawing.Point(382, 91);
+ this.labelControl4.Name = "labelControl4";
+ this.labelControl4.Size = new System.Drawing.Size(68, 21);
+ this.labelControl4.TabIndex = 799;
+ this.labelControl4.Text = "妫�楠岀粨鏋�";
+ //
+ // txt_fcheckResu
+ //
+ this.txt_fcheckResu.Enabled = false;
+ this.txt_fcheckResu.Location = new System.Drawing.Point(452, 89);
+ this.txt_fcheckResu.Name = "txt_fcheckResu";
+ this.txt_fcheckResu.Size = new System.Drawing.Size(150, 24);
+ this.txt_fcheckResu.TabIndex = 798;
+ //
// txt_lotNo1
//
this.txt_lotNo1.Location = new System.Drawing.Point(452, 160);
this.txt_lotNo1.Name = "txt_lotNo1";
this.txt_lotNo1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo1.Size = new System.Drawing.Size(530, 28);
+ this.txt_lotNo1.Size = new System.Drawing.Size(559, 28);
this.txt_lotNo1.TabIndex = 797;
//
// labelControl2
//
this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(409, 163);
+ this.labelControl2.Location = new System.Drawing.Point(416, 163);
this.labelControl2.Name = "labelControl2";
this.labelControl2.Size = new System.Drawing.Size(34, 21);
this.labelControl2.TabIndex = 796;
@@ -1486,13 +1512,13 @@
this.txt_suppId.Location = new System.Drawing.Point(706, 92);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(276, 30);
+ this.txt_suppId.Size = new System.Drawing.Size(305, 30);
this.txt_suppId.TabIndex = 795;
//
// txt_modify1Flag
//
this.txt_modify1Flag.Enabled = false;
- this.txt_modify1Flag.Location = new System.Drawing.Point(960, 12);
+ this.txt_modify1Flag.Location = new System.Drawing.Point(947, 12);
this.txt_modify1Flag.Name = "txt_modify1Flag";
this.txt_modify1Flag.Properties.Caption = "";
this.txt_modify1Flag.Size = new System.Drawing.Size(30, 24);
@@ -1501,7 +1527,7 @@
// txt_fsubmit
//
this.txt_fsubmit.Enabled = false;
- this.txt_fsubmit.Location = new System.Drawing.Point(962, 52);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1062, 12);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "";
this.txt_fsubmit.Size = new System.Drawing.Size(35, 24);
@@ -1571,7 +1597,7 @@
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(1057, 20);
+ this.labelControl11.Location = new System.Drawing.Point(1070, 63);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -1582,7 +1608,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(1073, 13);
+ this.lbGuid.Location = new System.Drawing.Point(1086, 56);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -1592,7 +1618,7 @@
//
this.lb_fsubmit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fsubmit.Appearance.Options.UseFont = true;
- this.lb_fsubmit.Location = new System.Drawing.Point(883, 54);
+ this.lb_fsubmit.Location = new System.Drawing.Point(983, 14);
this.lb_fsubmit.Name = "lb_fsubmit";
this.lb_fsubmit.Size = new System.Drawing.Size(73, 21);
this.lb_fsubmit.TabIndex = 360;
@@ -1602,7 +1628,7 @@
//
this.lb_modify1Flag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_modify1Flag.Appearance.Options.UseFont = true;
- this.lb_modify1Flag.Location = new System.Drawing.Point(883, 14);
+ this.lb_modify1Flag.Location = new System.Drawing.Point(870, 14);
this.lb_modify1Flag.Name = "lb_modify1Flag";
this.lb_modify1Flag.Size = new System.Drawing.Size(68, 21);
this.lb_modify1Flag.TabIndex = 306;
@@ -1612,7 +1638,7 @@
//
this.lb_lotNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lotNo.Appearance.Options.UseFont = true;
- this.lb_lotNo.Location = new System.Drawing.Point(377, 91);
+ this.lb_lotNo.Location = new System.Drawing.Point(627, 14);
this.lb_lotNo.Name = "lb_lotNo";
this.lb_lotNo.Size = new System.Drawing.Size(73, 21);
this.lb_lotNo.TabIndex = 262;
@@ -1621,7 +1647,7 @@
// txt_lotNo
//
this.txt_lotNo.Enabled = false;
- this.txt_lotNo.Location = new System.Drawing.Point(452, 87);
+ this.txt_lotNo.Location = new System.Drawing.Point(702, 10);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
@@ -1675,6 +1701,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modify1Flag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
@@ -1806,5 +1833,7 @@
private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
+ private DevExpress.XtraEditors.LabelControl labelControl4;
+ private DevExpress.XtraEditors.TextEdit txt_fcheckResu;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 1bb47c8..f176e0f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,3 +1,4 @@
+using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -16,6 +17,7 @@
{
public partial class Frm_MesQaItemsDetect01 : DevExpress.XtraEditors.XtraForm
{
+ string _currentRowGuid = "";
string _webServiceName = "MesQaItemsDetect01Manager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_MesQaItemsDetect01()
@@ -87,6 +89,7 @@
string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gvMx1, e, "guid");
if (string.IsNullOrEmpty(rowGuid))
return;
+ this._currentRowGuid = rowGuid;
getList12(rowGuid);
}
@@ -113,29 +116,9 @@
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "ReloadModel5", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
- dynamic dy = _rtn.rtnData;
- lbGuid.Text = strGuid;
- JObject _job = JObject.Parse(strJson);
- JArray array = new JArray();
- foreach (var a in _job["rtnData"]["list5"])
- {
- array.Add(a);
- }
- DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
- if (dt.Rows.Count > 0)
- {
- gcMx1.BindingContext = new BindingContext();
- gcMx1.DataSource = dt;
- gcMx1.ForceInitialize();
- getList12(dt.Rows[0]["guid"].ToString());
- }
- else
- {
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- }
+ getModel(lbGuid.Text.Trim(), false, 999);
}
}
catch (Exception ex)
@@ -192,13 +175,16 @@
return;
}
}
- if (int.TryParse(_strCmd, out n))
- {
- }
else
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝g‘浣跨敤OK 鎴� NG 鍛戒护!");
- return;
+ if (int.TryParse(_strCmd, out n))
+ {
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝g‘浣跨敤OK 鎴� NG 鍛戒护!");
+ return;
+ }
}
var _obj = new
{
@@ -539,6 +525,10 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+
+ if (!string.IsNullOrEmpty(_currentRowGuid))
+ gvMx1.FocusedRowHandle = gvMx1.LocateByValue(0, gvMx1.Columns["gvMx1guid"], _currentRowGuid);
+
ucUpFile1.parentGuid = lbGuid.Text.Trim();
getList12(dt.Rows[0]["guid"].ToString());
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index d273d3a..f4fdf20 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -222,7 +222,7 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎻愪氦妫�楠屽悧锛�"))
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎾ゅ洖宸叉彁浜ょ殑妫�楠屽悧锛�"))
return;
UcLoading _loading = new UcLoading();
var _obj = new
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 547f582..2d8694a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -74,7 +74,6 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
- this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_factory = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_paymentParty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.gv_transportMethod = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
@@ -83,55 +82,28 @@
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.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.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
- this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
- this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+ this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
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();
@@ -141,6 +113,36 @@
this.panel1 = new System.Windows.Forms.Panel();
this.lbGuid = new DevExpress.XtraEditors.LabelControl();
this.txt_supplier = new Gs.DevApp.UserControl.UcLookSupplier();
+ this.gv_fSubsidiary = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+ 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();
@@ -344,7 +346,7 @@
this.gvMx1businessTerminate.AppearanceCell.Options.UseFont = true;
this.gvMx1businessTerminate.Caption = "涓氬姟缁堟 A:姝e父锛孊:涓氬姟缁堟";
this.gvMx1businessTerminate.FieldName = "businessTerminate";
- this.gvMx1businessTerminate.MinWidth = 50;
+ this.gvMx1businessTerminate.MinWidth = 80;
this.gvMx1businessTerminate.Name = "gvMx1businessTerminate";
this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE";
this.gvMx1businessTerminate.Visible = true;
@@ -486,7 +488,7 @@
this.gvMx1pricingUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1pricingUnit.AppearanceCell.Options.UseFont = true;
this.gvMx1pricingUnit.Caption = "璁′环鍗曚綅";
- this.gvMx1pricingUnit.FieldName = "pricingUnit";
+ this.gvMx1pricingUnit.FieldName = "jjFname";
this.gvMx1pricingUnit.MinWidth = 80;
this.gvMx1pricingUnit.Name = "gvMx1pricingUnit";
this.gvMx1pricingUnit.Tag = "query_a.PRICING_UNIT";
@@ -499,7 +501,7 @@
this.gvMx1inventoryUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1inventoryUnit.AppearanceCell.Options.UseFont = true;
this.gvMx1inventoryUnit.Caption = "搴撳瓨鍗曚綅";
- this.gvMx1inventoryUnit.FieldName = "inventoryUnit";
+ this.gvMx1inventoryUnit.FieldName = "kcFname";
this.gvMx1inventoryUnit.MinWidth = 80;
this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit";
this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
@@ -734,6 +736,7 @@
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+ this.gridBand29,
this.gridBand1,
this.gridBand2,
this.gridBand3,
@@ -753,6 +756,7 @@
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,
@@ -792,22 +796,6 @@
this.gridView1.OptionsView.ShowColumnHeaders = false;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
- // gridBand1
- //
- this.gridBand1.Caption = "ERPID鍙�";
- this.gridBand1.Columns.Add(this.gv_factory);
- this.gridBand1.Columns.Add(this.gv_paymentParty);
- this.gridBand1.Columns.Add(this.gv_transportMethod);
- this.gridBand1.Columns.Add(this.gv_lastupdateDate);
- this.gridBand1.Columns.Add(this.gv_lastupdateBy);
- this.gridBand1.Columns.Add(this.gv_checkDate);
- this.gridBand1.Columns.Add(this.gv_checkBy);
- this.gridBand1.Columns.Add(this.gv_checkFalg);
- this.gridBand1.MinWidth = 80;
- this.gridBand1.Name = "gridBand1";
- this.gridBand1.VisibleIndex = 0;
- this.gridBand1.Width = 80;
- //
// gv_factory
//
this.gv_factory.Caption = "ERPID鍙�";
@@ -816,7 +804,7 @@
this.gv_factory.Name = "gv_factory";
this.gv_factory.OptionsColumn.AllowEdit = false;
this.gv_factory.Visible = true;
- this.gv_factory.Width = 70;
+ this.gv_factory.Width = 80;
//
// gv_paymentParty
//
@@ -902,15 +890,6 @@
this.gv_checkFalg.Tag = "query_a.CHECK_FALG";
this.gv_checkFalg.Width = 100;
//
- // 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;
- //
// gv_billNo
//
this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -923,17 +902,6 @@
this.gv_billNo.Tag = "query_a.BILL_NO";
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 = 100;
- this.gridBand3.Name = "gridBand3";
- this.gridBand3.VisibleIndex = 2;
- this.gridBand3.Width = 100;
//
// gv_documentStatus
//
@@ -948,60 +916,31 @@
this.gv_documentStatus.Visible = true;
this.gv_documentStatus.Width = 100;
//
- // 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;
- //
// gv_documentType
//
this.gv_documentType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_documentType.AppearanceCell.Options.UseFont = true;
- this.gv_documentType.Caption = "鍗曟嵁绫诲瀷:1閲囪喘,2濮斿";
- this.gv_documentType.FieldName = "documentType";
+ this.gv_documentType.Caption = "鍗曟嵁绫诲瀷";
+ this.gv_documentType.FieldName = "documentType2";
this.gv_documentType.MinWidth = 25;
this.gv_documentType.Name = "gv_documentType";
this.gv_documentType.OptionsColumn.AllowEdit = false;
this.gv_documentType.Tag = "query_a.DOCUMENT_TYPE";
this.gv_documentType.Visible = true;
- this.gv_documentType.Width = 70;
- //
- // 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 = 100;
+ this.gv_documentType.Width = 80;
//
// gv_businessType
//
this.gv_businessType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_businessType.AppearanceCell.Options.UseFont = true;
this.gv_businessType.Caption = "涓氬姟绫诲瀷";
- this.gv_businessType.FieldName = "businessType";
+ this.gv_businessType.FieldName = "businessType2";
this.gv_businessType.MinWidth = 25;
this.gv_businessType.Name = "gv_businessType";
this.gv_businessType.OptionsColumn.AllowEdit = false;
this.gv_businessType.Tag = "query_a.BUSINESS_TYPE";
this.gv_businessType.Visible = true;
- this.gv_businessType.Width = 100;
- //
- // 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;
+ this.gv_businessType.Width = 80;
//
// gv_purchaseDate
//
@@ -1014,28 +953,7 @@
this.gv_purchaseDate.OptionsColumn.AllowEdit = false;
this.gv_purchaseDate.Tag = "query_a.PURCHASE_DATE";
this.gv_purchaseDate.Visible = true;
- this.gv_purchaseDate.Width = 100;
- //
- // 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 = 50;
+ this.gv_purchaseDate.Width = 170;
//
// gv_supplier
//
@@ -1048,16 +966,7 @@
this.gv_supplier.OptionsColumn.AllowEdit = false;
this.gv_supplier.Tag = "query_a.SUPPLIER";
this.gv_supplier.Visible = true;
- this.gv_supplier.Width = 50;
- //
- // 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 = 100;
+ this.gv_supplier.Width = 66;
//
// bandedGridColumn1
//
@@ -1067,18 +976,7 @@
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.OptionsColumn.AllowEdit = false;
this.bandedGridColumn1.Visible = true;
- this.bandedGridColumn1.Width = 25;
- //
- // 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;
+ this.bandedGridColumn1.Width = 134;
//
// gv_closeStatus
//
@@ -1091,29 +989,7 @@
this.gv_closeStatus.OptionsColumn.AllowEdit = false;
this.gv_closeStatus.Tag = "query_a.CLOSE_STATUS";
this.gv_closeStatus.Visible = true;
- this.gv_closeStatus.Width = 50;
- //
- // 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 = 140;
- //
- // 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 = 60;
+ this.gv_closeStatus.Width = 80;
//
// gv_purchaseDept
//
@@ -1126,16 +1002,7 @@
this.gv_purchaseDept.OptionsColumn.AllowEdit = false;
this.gv_purchaseDept.Tag = "query_a.PURCHASE_DEPT";
this.gv_purchaseDept.Visible = true;
- this.gv_purchaseDept.Width = 60;
- //
- // 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;
+ this.gv_purchaseDept.Width = 50;
//
// bandedGridColumn2
//
@@ -1145,18 +1012,7 @@
this.bandedGridColumn2.Name = "bandedGridColumn2";
this.bandedGridColumn2.OptionsColumn.AllowEdit = false;
this.bandedGridColumn2.Visible = true;
- this.bandedGridColumn2.Width = 25;
- //
- // 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;
+ this.bandedGridColumn2.Width = 80;
//
// gv_qtyAcceptance
//
@@ -1169,16 +1025,7 @@
this.gv_qtyAcceptance.OptionsColumn.AllowEdit = false;
this.gv_qtyAcceptance.Tag = "query_a.QTY_ACCEPTANCE";
this.gv_qtyAcceptance.Visible = true;
- this.gv_qtyAcceptance.Width = 30;
- //
- // 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 = 100;
+ this.gv_qtyAcceptance.Width = 50;
//
// gv_purchaser
//
@@ -1191,16 +1038,7 @@
this.gv_purchaser.OptionsColumn.AllowEdit = false;
this.gv_purchaser.Tag = "query_a.PURCHASER";
this.gv_purchaser.Visible = true;
- this.gv_purchaser.Width = 100;
- //
- // 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 = 100;
+ this.gv_purchaser.Width = 60;
//
// gv_qualityReq
//
@@ -1213,29 +1051,7 @@
this.gv_qualityReq.OptionsColumn.AllowEdit = false;
this.gv_qualityReq.Tag = "query_a.QUALITY_REQ";
this.gv_qualityReq.Visible = true;
- this.gv_qualityReq.Width = 100;
- //
- // 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 = 360;
- //
- // 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;
+ this.gv_qualityReq.Width = 80;
//
// gv_cancellationStatus
//
@@ -1248,16 +1064,7 @@
this.gv_cancellationStatus.OptionsColumn.AllowEdit = false;
this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
this.gv_cancellationStatus.Visible = true;
- this.gv_cancellationStatus.Width = 50;
- //
- // 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 = 100;
+ this.gv_cancellationStatus.Width = 60;
//
// gv_cancellationPerson
//
@@ -1270,16 +1077,7 @@
this.gv_cancellationPerson.OptionsColumn.AllowEdit = false;
this.gv_cancellationPerson.Tag = "query_a.CANCELLATION_PERSON";
this.gv_cancellationPerson.Visible = true;
- this.gv_cancellationPerson.Width = 100;
- //
- // 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 = 200;
+ this.gv_cancellationPerson.Width = 60;
//
// gv_cancellationDate
//
@@ -1292,50 +1090,7 @@
this.gv_cancellationDate.OptionsColumn.AllowEdit = false;
this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
this.gv_cancellationDate.Visible = true;
- this.gv_cancellationDate.Width = 200;
- //
- // 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.gridBand22,
- this.gridBand25});
- this.gridBand21.Name = "gridBand21";
- this.gridBand21.VisibleIndex = 13;
- this.gridBand21.Width = 300;
- //
- // gridBand22
- //
- this.gridBand22.Caption = "鍒涘缓鏃ユ湡";
- this.gridBand22.Columns.Add(this.gv_createDate);
- this.gridBand22.MinWidth = 180;
- this.gridBand22.Name = "gridBand22";
- this.gridBand22.VisibleIndex = 0;
- this.gridBand22.Width = 200;
- //
- // gv_createDate
- //
- this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createDate.AppearanceCell.Options.UseFont = true;
- this.gv_createDate.Caption = "鍒涘缓鏃ユ湡";
- this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 25;
- this.gv_createDate.Name = "gv_createDate";
- this.gv_createDate.OptionsColumn.AllowEdit = false;
- this.gv_createDate.Tag = "query_a.CREATE_DATE";
- this.gv_createDate.Visible = true;
- this.gv_createDate.Width = 200;
- //
- // gridBand25
- //
- this.gridBand25.Caption = "鍒涘缓浜�";
- this.gridBand25.Columns.Add(this.gv_createBy);
- this.gridBand25.MinWidth = 80;
- this.gridBand25.Name = "gridBand25";
- this.gridBand25.VisibleIndex = 1;
- this.gridBand25.Width = 100;
+ this.gv_cancellationDate.Width = 180;
//
// gv_createBy
//
@@ -1348,16 +1103,20 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.CREATE_BY";
this.gv_createBy.Visible = true;
- this.gv_createBy.Width = 100;
+ this.gv_createBy.Width = 80;
//
- // gridBand23
+ // gv_createDate
//
- 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;
+ this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_createDate.AppearanceCell.Options.UseFont = true;
+ this.gv_createDate.Caption = "鍒涘缓鏃ユ湡";
+ this.gv_createDate.FieldName = "createDate";
+ this.gv_createDate.MinWidth = 25;
+ this.gv_createDate.Name = "gv_createDate";
+ this.gv_createDate.OptionsColumn.AllowEdit = false;
+ this.gv_createDate.Tag = "query_a.CREATE_DATE";
+ this.gv_createDate.Visible = true;
+ this.gv_createDate.Width = 180;
//
// gv_remarks
//
@@ -1372,15 +1131,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 = 15;
- this.gridBand24.Width = 100;
- //
// gv_changereason
//
this.gv_changereason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1393,28 +1143,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 = 16;
- this.gridBand28.Width = 300;
- //
- // 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 = 100;
//
// gv_settlementParty
//
@@ -1439,16 +1167,7 @@
this.gv_erpCheckBy.OptionsColumn.AllowEdit = false;
this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY";
this.gv_erpCheckBy.Visible = true;
- this.gv_erpCheckBy.Width = 100;
- //
- // 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 = 200;
+ this.gv_erpCheckBy.Width = 80;
//
// gv_erpCheckDate
//
@@ -1461,7 +1180,7 @@
this.gv_erpCheckDate.OptionsColumn.AllowEdit = false;
this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE";
this.gv_erpCheckDate.Visible = true;
- this.gv_erpCheckDate.Width = 200;
+ this.gv_erpCheckDate.Width = 180;
//
// xtraTabControl1
//
@@ -1552,6 +1271,309 @@
this.txt_supplier.Name = "txt_supplier";
this.txt_supplier.Size = new System.Drawing.Size(305, 30);
this.txt_supplier.TabIndex = 227;
+ //
+ // 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.Visible = true;
+ this.gv_fSubsidiary.Width = 25;
+ //
+ // 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;
+ //
+ // 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;
+ //
+ // 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;
+ //
+ // 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 = 100;
+ this.gridBand3.Name = "gridBand3";
+ this.gridBand3.VisibleIndex = 3;
+ this.gridBand3.Width = 100;
+ //
+ // 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;
+ //
+ // 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;
+ //
+ // 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;
+ //
+ // 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;
+ //
+ // 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 = 8;
+ 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 = 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;
+ //
+ // 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 = 10;
+ 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 = 11;
+ 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 = 12;
+ 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 = 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;
+ //
+ // 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 = 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;
+ //
+ // 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 = 15;
+ 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 = 16;
+ 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 = 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;
+ //
+ // 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
//
@@ -1665,6 +1687,10 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
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;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
@@ -1686,14 +1712,12 @@
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand18;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand20;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand21;
- private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand22;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand25;
+ private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand22;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand23;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand24;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand28;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand27;
private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand26;
- private UserControl.UcLookSupplier txt_supplier;
- private DevExpress.XtraEditors.LabelControl lbGuid;
}
}
\ No newline at end of file
--
Gitblit v1.9.3