From b77cf0b90deead4446855bd01d5b5931d045ed5b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 27 二月 2025 17:39:49 +0800
Subject: [PATCH] 销售
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs | 46 +-
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 2
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 19
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 12
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 531 ++++++-----------------------
DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs | 189 +++++++++
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 104 +++--
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs | 136 +++---
8 files changed, 443 insertions(+), 596 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 9887491..1d884e4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1fseq = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fEntrynote = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fRealQty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -55,6 +55,8 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.lb_fApproverStaus = new DevExpress.XtraEditors.LabelControl();
@@ -82,7 +84,6 @@
this.lb_fCreatorId = new DevExpress.XtraEditors.LabelControl();
this.txt_fCreatorId = new DevExpress.XtraEditors.TextEdit();
this.gv_fCreatorId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_fStockOrgId = new DevExpress.XtraEditors.LabelControl();
this.gv_fStockOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fSaleOrgId = new DevExpress.XtraEditors.LabelControl();
this.gv_fSaleOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -105,7 +106,6 @@
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
this.txt_fApproverStaus = new DevExpress.XtraEditors.CheckEdit();
- this.txt_fStockOrgId = new Gs.DevApp.UserControl.UcLookOrg();
this.txt_fCustomerID = new DevExpress.XtraEditors.TextEdit();
this.txt_salesId = new Gs.DevApp.UserControl.UcLookSales();
this.lb_salesId = new DevExpress.XtraEditors.LabelControl();
@@ -119,6 +119,8 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
@@ -248,7 +250,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 389);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 386);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// gcMx1
@@ -259,8 +261,9 @@
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemSearchLookUpEdit1,
- this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 389);
+ this.repositoryItemButtonEdit1,
+ this.repositoryItemDateEdit1});
+ this.gcMx1.Size = new System.Drawing.Size(1124, 386);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -276,6 +279,7 @@
this.gvMx1fRealQty,
this.gvMx1fEntrynote,
this.gvMx1fseq,
+ this.gridColumn11,
this.gvMxDel});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -389,6 +393,31 @@
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 7;
//
+ // gridColumn11
+ //
+ this.gridColumn11.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn11.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn11.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn11.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn11.Caption = "棰勮鍙戣揣鏃堕棿";
+ this.gridColumn11.ColumnEdit = this.repositoryItemDateEdit1;
+ this.gridColumn11.FieldName = "yjfhDate";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Tag = "edit";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 8;
+ this.gridColumn11.Width = 94;
+ //
+ // repositoryItemDateEdit1
+ //
+ this.repositoryItemDateEdit1.AutoHeight = false;
+ this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
+ //
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
@@ -396,16 +425,16 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 8;
+ this.gvMxDel.VisibleIndex = 9;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -438,7 +467,7 @@
//
this.lb_fNote.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fNote.Appearance.Options.UseFont = true;
- this.lb_fNote.Location = new System.Drawing.Point(40, 118);
+ this.lb_fNote.Location = new System.Drawing.Point(40, 89);
this.lb_fNote.Name = "lb_fNote";
this.lb_fNote.Size = new System.Drawing.Size(39, 21);
this.lb_fNote.TabIndex = 243;
@@ -446,7 +475,7 @@
//
// txt_fNote
//
- this.txt_fNote.Location = new System.Drawing.Point(84, 114);
+ this.txt_fNote.Location = new System.Drawing.Point(84, 85);
this.txt_fNote.Name = "txt_fNote";
this.txt_fNote.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fNote.Properties.Appearance.Options.UseFont = true;
@@ -483,7 +512,7 @@
this.txt_fDate.Name = "txt_fDate";
this.txt_fDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fDate.Size = new System.Drawing.Size(173, 28);
+ this.txt_fDate.Size = new System.Drawing.Size(188, 28);
this.txt_fDate.TabIndex = 240;
this.txt_fDate.Tag = "readonly";
//
@@ -609,7 +638,7 @@
this.txt_fCreateDate.Name = "txt_fCreateDate";
this.txt_fCreateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreateDate.Size = new System.Drawing.Size(173, 28);
+ this.txt_fCreateDate.Size = new System.Drawing.Size(188, 28);
this.txt_fCreateDate.TabIndex = 226;
this.txt_fCreateDate.Tag = "readonly";
//
@@ -677,7 +706,7 @@
this.txt_fCreatorId.Name = "txt_fCreatorId";
this.txt_fCreatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreatorId.Size = new System.Drawing.Size(173, 28);
+ this.txt_fCreatorId.Size = new System.Drawing.Size(188, 28);
this.txt_fCreatorId.TabIndex = 219;
this.txt_fCreatorId.Tag = "readonly";
//
@@ -694,16 +723,6 @@
this.gv_fCreatorId.Visible = true;
this.gv_fCreatorId.VisibleIndex = 5;
this.gv_fCreatorId.Width = 94;
- //
- // lb_fStockOrgId
- //
- this.lb_fStockOrgId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fStockOrgId.Appearance.Options.UseFont = true;
- this.lb_fStockOrgId.Location = new System.Drawing.Point(6, 86);
- this.lb_fStockOrgId.Name = "lb_fStockOrgId";
- this.lb_fStockOrgId.Size = new System.Drawing.Size(73, 21);
- this.lb_fStockOrgId.TabIndex = 217;
- this.lb_fStockOrgId.Text = "鍙戣揣缁勭粐 ";
//
// gv_fStockOrgId
//
@@ -943,10 +962,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 149);
+ this.tabMx.Location = new System.Drawing.Point(0, 152);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 421);
+ this.tabMx.Size = new System.Drawing.Size(1126, 418);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -955,7 +974,6 @@
//
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.txt_fApproverStaus);
- this.panel1.Controls.Add(this.txt_fStockOrgId);
this.panel1.Controls.Add(this.txt_fCustomerID);
this.panel1.Controls.Add(this.txt_salesId);
this.panel1.Controls.Add(this.lb_salesId);
@@ -979,7 +997,6 @@
this.panel1.Controls.Add(this.txt_fApproverID);
this.panel1.Controls.Add(this.lb_fCreatorId);
this.panel1.Controls.Add(this.txt_fCreatorId);
- this.panel1.Controls.Add(this.lb_fStockOrgId);
this.panel1.Controls.Add(this.lb_fSaleOrgId);
this.panel1.Controls.Add(this.lb_fBillTypeID);
this.panel1.Controls.Add(this.lb_billNo);
@@ -990,7 +1007,7 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 149);
+ this.panel1.Size = new System.Drawing.Size(1126, 152);
this.panel1.TabIndex = 1;
//
// txt_fApproverStaus
@@ -1001,14 +1018,6 @@
this.txt_fApproverStaus.Properties.Caption = "";
this.txt_fApproverStaus.Size = new System.Drawing.Size(59, 24);
this.txt_fApproverStaus.TabIndex = 370;
- //
- // txt_fStockOrgId
- //
- this.txt_fStockOrgId.IsReadly = false;
- this.txt_fStockOrgId.Location = new System.Drawing.Point(84, 81);
- this.txt_fStockOrgId.Name = "txt_fStockOrgId";
- this.txt_fStockOrgId.Size = new System.Drawing.Size(179, 30);
- this.txt_fStockOrgId.TabIndex = 369;
//
// txt_fCustomerID
//
@@ -1058,7 +1067,7 @@
this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
"鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"});
this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fBillTypeID.Size = new System.Drawing.Size(173, 24);
+ this.txt_fBillTypeID.Size = new System.Drawing.Size(188, 24);
this.txt_fBillTypeID.TabIndex = 362;
//
// labelControl11
@@ -1069,6 +1078,7 @@
this.labelControl11.Size = new System.Drawing.Size(45, 18);
this.labelControl11.TabIndex = 130;
this.labelControl11.Text = "涓婚敭锛�";
+ this.labelControl11.Visible = false;
//
// lbGuid
//
@@ -1077,6 +1087,7 @@
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
+ this.lbGuid.Visible = false;
//
// picCheckBox
//
@@ -1104,6 +1115,8 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
@@ -1189,8 +1202,6 @@
private DevExpress.XtraEditors.LabelControl lb_fCreatorId;
private DevExpress.XtraEditors.TextEdit txt_fCreatorId;
private DevExpress.XtraGrid.Columns.GridColumn gv_fCreatorId;
-
- private DevExpress.XtraEditors.LabelControl lb_fStockOrgId;
private DevExpress.XtraGrid.Columns.GridColumn gv_fStockOrgId;
private DevExpress.XtraEditors.LabelControl lb_fSaleOrgId;
@@ -1217,7 +1228,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private UserControl.UcLookOrg txt_fStockOrgId;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraEditors.CheckEdit txt_fApproverStaus;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -1228,5 +1238,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index d787e41..c48c20e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -48,11 +48,6 @@
txt_salesId.getSuppler("", "");
this.txt_salesId.EditChanged += (s, e) =>
{
- //鏈夋病鏈夊彂璐х粍缁�
- string _fhOrg = txt_fStockOrgId.GetId();//鐩墠杩囨护渚涘簲缁勭粐
- if (string.IsNullOrEmpty(_fhOrg))
- return;
- //鏈夋病鏈夐攢鍞鍗�
string _sqGuid = txt_salesId.GetId();
if (string.IsNullOrEmpty(_sqGuid))
return;
@@ -60,7 +55,7 @@
txt_fCustomerID.Text = txt_salesId.GetSalesCusName();
txt_fSaleOrgId.Text = txt_salesId.GetSalesOrgName();
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
- var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _fhOrg);
+ var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid);
var json = JsonConvert.SerializeObject(_obj);
try
{
@@ -75,7 +70,6 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
};
-
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -247,13 +241,6 @@
string djlx = txt_fBillTypeID.Text.ToString();
string FNote = txt_fNote.Text.ToString();
string _sqGuid = txt_salesId.GetId();
- string _fhOrg = txt_fStockOrgId.GetId();
- if (string.IsNullOrEmpty(_fhOrg))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戣揣缁勭粐锛�");
- txt_fStockOrgId.Focus();
- return;
- }
if (txt_fBillTypeID.SelectedIndex < 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
@@ -262,7 +249,7 @@
}
if (string.IsNullOrEmpty(_sqGuid))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢宠缁勭粐锛�");
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞崟锛�");
txt_salesId.Focus();
return;
}
@@ -272,7 +259,6 @@
djlx = djlx,//鍗曟嵁绫诲瀷
salesId = _sqGuid,//閿�鍞崟鍙�
inRemark = FNote.Trim(),//澶囨敞
- fhOrg = _fhOrg,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -300,6 +286,7 @@
SalesDetailId = (row["salesDetailId"].ToString()),
Sqsl = (row["fMustQty"].ToString()),
Bz = (row["fEntrynote"].ToString()),
+ Yjsj = (row["YjfhDate"].ToString()),
});
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index e06d84e..0097fd0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions 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.gvMx1erpHeadId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1erpLineId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1orderBillNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -65,27 +65,24 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.lb_billStatus = new DevExpress.XtraEditors.LabelControl();
this.txt_billStatus = new DevExpress.XtraEditors.TextEdit();
this.gv_billStatus = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_erpId = new DevExpress.XtraEditors.LabelControl();
- this.txt_erpId = new DevExpress.XtraEditors.TextEdit();
this.gv_erpId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_manualCloseFlag = new DevExpress.XtraEditors.LabelControl();
- this.txt_manualCloseFlag = new DevExpress.XtraEditors.TextEdit();
this.gv_manualCloseFlag = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_closeStatus = new DevExpress.XtraEditors.LabelControl();
- this.txt_closeStatus = new DevExpress.XtraEditors.TextEdit();
this.gv_closeStatus = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_cancelDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_cancelDate = new DevExpress.XtraEditors.TextEdit();
this.gv_cancelDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_cancelledBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_cancelledBy = new DevExpress.XtraEditors.TextEdit();
this.gv_cancelledBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_cancelStatus = new DevExpress.XtraEditors.LabelControl();
- this.txt_cancelStatus = new DevExpress.XtraEditors.TextEdit();
this.gv_cancelStatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_approvedDate = new DevExpress.XtraEditors.LabelControl();
this.txt_approvedDate = new DevExpress.XtraEditors.TextEdit();
@@ -93,14 +90,8 @@
this.lb_approvedBy = new DevExpress.XtraEditors.LabelControl();
this.txt_approvedBy = new DevExpress.XtraEditors.TextEdit();
this.gv_approvedBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_closeDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_closeDate = new DevExpress.XtraEditors.TextEdit();
this.gv_closeDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_closeReason = new DevExpress.XtraEditors.LabelControl();
- this.txt_closeReason = new DevExpress.XtraEditors.TextEdit();
this.gv_closeReason = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_closedBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_closedBy = new DevExpress.XtraEditors.TextEdit();
this.gv_closedBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_modifiedDate = new DevExpress.XtraEditors.LabelControl();
this.txt_modifiedDate = new DevExpress.XtraEditors.TextEdit();
@@ -156,8 +147,6 @@
this.lb_returnReason = new DevExpress.XtraEditors.LabelControl();
this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
this.gv_returnReason = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_taobaoRemark = new DevExpress.XtraEditors.LabelControl();
- this.txt_taobaoRemark = new DevExpress.XtraEditors.TextEdit();
this.gv_taobaoRemark = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_returnCustomer = new DevExpress.XtraEditors.LabelControl();
this.txt_returnCustomer = new DevExpress.XtraEditors.TextEdit();
@@ -170,8 +159,6 @@
this.lb_salesOrg = new DevExpress.XtraEditors.LabelControl();
this.txt_salesOrg = new DevExpress.XtraEditors.TextEdit();
this.gv_salesOrg = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_currency = new DevExpress.XtraEditors.LabelControl();
- this.txt_currency = new DevExpress.XtraEditors.TextEdit();
this.gv_currency = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fDate = new DevExpress.XtraEditors.LabelControl();
this.txt_fDate = new DevExpress.XtraEditors.TextEdit();
@@ -199,32 +186,15 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billStatus.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_erpId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_manualCloseFlag.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cancelDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cancelledBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cancelStatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_closeDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_closeReason.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_closedBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit();
@@ -243,11 +213,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_deliveryLocation.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_taobaoRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_returnCustomer.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_salesDept.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_salesOrg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_currency.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit();
@@ -262,7 +230,6 @@
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.SuspendLayout();
//
// gvMx1erpHeadId
@@ -594,7 +561,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 137);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 236);
this.tabMxPage1.Text = "鏄庣粏1";
//
// gcMx1
@@ -606,7 +573,7 @@
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemSearchLookUpEdit1,
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 137);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 236);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -670,6 +637,7 @@
this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
+ this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨";
this.repositoryItemSearchLookUpEdit1.PopupView = this.repositoryItemSearchLookUpEdit1View;
//
// repositoryItemSearchLookUpEdit1View
@@ -687,6 +655,55 @@
this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "閿�鍞崟鍙�";
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 0;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鍙戣揣鍗曞彿";
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 1;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "鐗╂枡缂栧彿";
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 2;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 3;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 4;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "鍙戣揣鏁伴噺";
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 5;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "宸查��鏁伴噺";
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 6;
+ //
// gridColumn3
//
this.gridColumn3.Caption = "gridColumn3";
@@ -696,11 +713,30 @@
this.gridColumn3.VisibleIndex = 26;
this.gridColumn3.Width = 94;
//
+ // gvMxDel
+ //
+ this.gvMxDel.Caption = "绉诲嚭";
+ this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.Name = "gvMxDel";
+ this.gvMxDel.Visible = true;
+ this.gvMxDel.VisibleIndex = 27;
+ this.gvMxDel.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ 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.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
// lb_billStatus
//
this.lb_billStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_billStatus.Appearance.Options.UseFont = true;
- this.lb_billStatus.Location = new System.Drawing.Point(770, 308);
+ this.lb_billStatus.Location = new System.Drawing.Point(770, 54);
this.lb_billStatus.Name = "lb_billStatus";
this.lb_billStatus.Size = new System.Drawing.Size(73, 21);
this.lb_billStatus.TabIndex = 450;
@@ -708,7 +744,7 @@
//
// txt_billStatus
//
- this.txt_billStatus.Location = new System.Drawing.Point(830, 308);
+ this.txt_billStatus.Location = new System.Drawing.Point(830, 54);
this.txt_billStatus.Name = "txt_billStatus";
this.txt_billStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billStatus.Properties.Appearance.Options.UseFont = true;
@@ -729,25 +765,6 @@
this.gv_billStatus.VisibleIndex = 39;
this.gv_billStatus.Width = 94;
//
- // lb_erpId
- //
- this.lb_erpId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_erpId.Appearance.Options.UseFont = true;
- this.lb_erpId.Location = new System.Drawing.Point(520, 308);
- this.lb_erpId.Name = "lb_erpId";
- this.lb_erpId.Size = new System.Drawing.Size(70, 21);
- this.lb_erpId.TabIndex = 438;
- this.lb_erpId.Text = "ERP澶碔D ";
- //
- // txt_erpId
- //
- this.txt_erpId.Location = new System.Drawing.Point(580, 308);
- this.txt_erpId.Name = "txt_erpId";
- this.txt_erpId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_erpId.Properties.Appearance.Options.UseFont = true;
- this.txt_erpId.Size = new System.Drawing.Size(150, 28);
- this.txt_erpId.TabIndex = 438;
- //
// gv_erpId
//
this.gv_erpId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -761,25 +778,6 @@
this.gv_erpId.Visible = true;
this.gv_erpId.VisibleIndex = 38;
this.gv_erpId.Width = 94;
- //
- // lb_manualCloseFlag
- //
- this.lb_manualCloseFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_manualCloseFlag.Appearance.Options.UseFont = true;
- this.lb_manualCloseFlag.Location = new System.Drawing.Point(270, 308);
- this.lb_manualCloseFlag.Name = "lb_manualCloseFlag";
- this.lb_manualCloseFlag.Size = new System.Drawing.Size(107, 21);
- this.lb_manualCloseFlag.TabIndex = 427;
- this.lb_manualCloseFlag.Text = "鏄惁鎵嬪姩鍏抽棴 ";
- //
- // txt_manualCloseFlag
- //
- this.txt_manualCloseFlag.Location = new System.Drawing.Point(330, 308);
- this.txt_manualCloseFlag.Name = "txt_manualCloseFlag";
- this.txt_manualCloseFlag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_manualCloseFlag.Properties.Appearance.Options.UseFont = true;
- this.txt_manualCloseFlag.Size = new System.Drawing.Size(150, 28);
- this.txt_manualCloseFlag.TabIndex = 427;
//
// gv_manualCloseFlag
//
@@ -795,25 +793,6 @@
this.gv_manualCloseFlag.VisibleIndex = 37;
this.gv_manualCloseFlag.Width = 94;
//
- // lb_closeStatus
- //
- this.lb_closeStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_closeStatus.Appearance.Options.UseFont = true;
- this.lb_closeStatus.Location = new System.Drawing.Point(20, 308);
- this.lb_closeStatus.Name = "lb_closeStatus";
- this.lb_closeStatus.Size = new System.Drawing.Size(73, 21);
- this.lb_closeStatus.TabIndex = 417;
- this.lb_closeStatus.Text = "鍏抽棴鐘舵�� ";
- //
- // txt_closeStatus
- //
- this.txt_closeStatus.Location = new System.Drawing.Point(80, 308);
- this.txt_closeStatus.Name = "txt_closeStatus";
- this.txt_closeStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_closeStatus.Properties.Appearance.Options.UseFont = true;
- this.txt_closeStatus.Size = new System.Drawing.Size(150, 28);
- this.txt_closeStatus.TabIndex = 417;
- //
// gv_closeStatus
//
this.gv_closeStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -827,25 +806,6 @@
this.gv_closeStatus.Visible = true;
this.gv_closeStatus.VisibleIndex = 36;
this.gv_closeStatus.Width = 94;
- //
- // lb_cancelDate
- //
- this.lb_cancelDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_cancelDate.Appearance.Options.UseFont = true;
- this.lb_cancelDate.Location = new System.Drawing.Point(770, 276);
- this.lb_cancelDate.Name = "lb_cancelDate";
- this.lb_cancelDate.Size = new System.Drawing.Size(73, 21);
- this.lb_cancelDate.TabIndex = 408;
- this.lb_cancelDate.Text = "浣滃簾鏃ユ湡 ";
- //
- // txt_cancelDate
- //
- this.txt_cancelDate.Location = new System.Drawing.Point(830, 276);
- this.txt_cancelDate.Name = "txt_cancelDate";
- this.txt_cancelDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_cancelDate.Properties.Appearance.Options.UseFont = true;
- this.txt_cancelDate.Size = new System.Drawing.Size(150, 28);
- this.txt_cancelDate.TabIndex = 408;
//
// gv_cancelDate
//
@@ -861,25 +821,6 @@
this.gv_cancelDate.VisibleIndex = 35;
this.gv_cancelDate.Width = 94;
//
- // lb_cancelledBy
- //
- this.lb_cancelledBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_cancelledBy.Appearance.Options.UseFont = true;
- this.lb_cancelledBy.Location = new System.Drawing.Point(520, 276);
- this.lb_cancelledBy.Name = "lb_cancelledBy";
- this.lb_cancelledBy.Size = new System.Drawing.Size(56, 21);
- this.lb_cancelledBy.TabIndex = 397;
- this.lb_cancelledBy.Text = "浣滃簾浜� ";
- //
- // txt_cancelledBy
- //
- this.txt_cancelledBy.Location = new System.Drawing.Point(580, 276);
- this.txt_cancelledBy.Name = "txt_cancelledBy";
- this.txt_cancelledBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_cancelledBy.Properties.Appearance.Options.UseFont = true;
- this.txt_cancelledBy.Size = new System.Drawing.Size(150, 28);
- this.txt_cancelledBy.TabIndex = 397;
- //
// gv_cancelledBy
//
this.gv_cancelledBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -893,25 +834,6 @@
this.gv_cancelledBy.Visible = true;
this.gv_cancelledBy.VisibleIndex = 34;
this.gv_cancelledBy.Width = 94;
- //
- // lb_cancelStatus
- //
- this.lb_cancelStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_cancelStatus.Appearance.Options.UseFont = true;
- this.lb_cancelStatus.Location = new System.Drawing.Point(270, 276);
- this.lb_cancelStatus.Name = "lb_cancelStatus";
- this.lb_cancelStatus.Size = new System.Drawing.Size(73, 21);
- this.lb_cancelStatus.TabIndex = 387;
- this.lb_cancelStatus.Text = "浣滃簾鐘舵�� ";
- //
- // txt_cancelStatus
- //
- this.txt_cancelStatus.Location = new System.Drawing.Point(330, 276);
- this.txt_cancelStatus.Name = "txt_cancelStatus";
- this.txt_cancelStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_cancelStatus.Properties.Appearance.Options.UseFont = true;
- this.txt_cancelStatus.Size = new System.Drawing.Size(150, 28);
- this.txt_cancelStatus.TabIndex = 387;
//
// gv_cancelStatus
//
@@ -931,7 +853,7 @@
//
this.lb_approvedDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_approvedDate.Appearance.Options.UseFont = true;
- this.lb_approvedDate.Location = new System.Drawing.Point(20, 276);
+ this.lb_approvedDate.Location = new System.Drawing.Point(20, 218);
this.lb_approvedDate.Name = "lb_approvedDate";
this.lb_approvedDate.Size = new System.Drawing.Size(73, 21);
this.lb_approvedDate.TabIndex = 378;
@@ -939,7 +861,7 @@
//
// txt_approvedDate
//
- this.txt_approvedDate.Location = new System.Drawing.Point(80, 276);
+ this.txt_approvedDate.Location = new System.Drawing.Point(80, 218);
this.txt_approvedDate.Name = "txt_approvedDate";
this.txt_approvedDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
@@ -993,25 +915,6 @@
this.gv_approvedBy.VisibleIndex = 31;
this.gv_approvedBy.Width = 94;
//
- // lb_closeDate
- //
- this.lb_closeDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_closeDate.Appearance.Options.UseFont = true;
- this.lb_closeDate.Location = new System.Drawing.Point(520, 244);
- this.lb_closeDate.Name = "lb_closeDate";
- this.lb_closeDate.Size = new System.Drawing.Size(73, 21);
- this.lb_closeDate.TabIndex = 360;
- this.lb_closeDate.Text = "鍏抽棴鏃ユ湡 ";
- //
- // txt_closeDate
- //
- this.txt_closeDate.Location = new System.Drawing.Point(580, 244);
- this.txt_closeDate.Name = "txt_closeDate";
- this.txt_closeDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_closeDate.Properties.Appearance.Options.UseFont = true;
- this.txt_closeDate.Size = new System.Drawing.Size(150, 28);
- this.txt_closeDate.TabIndex = 360;
- //
// gv_closeDate
//
this.gv_closeDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1026,25 +929,6 @@
this.gv_closeDate.VisibleIndex = 30;
this.gv_closeDate.Width = 94;
//
- // lb_closeReason
- //
- this.lb_closeReason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_closeReason.Appearance.Options.UseFont = true;
- this.lb_closeReason.Location = new System.Drawing.Point(270, 244);
- this.lb_closeReason.Name = "lb_closeReason";
- this.lb_closeReason.Size = new System.Drawing.Size(73, 21);
- this.lb_closeReason.TabIndex = 351;
- this.lb_closeReason.Text = "鍏抽棴鍘熷洜 ";
- //
- // txt_closeReason
- //
- this.txt_closeReason.Location = new System.Drawing.Point(330, 244);
- this.txt_closeReason.Name = "txt_closeReason";
- this.txt_closeReason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_closeReason.Properties.Appearance.Options.UseFont = true;
- this.txt_closeReason.Size = new System.Drawing.Size(150, 28);
- this.txt_closeReason.TabIndex = 351;
- //
// gv_closeReason
//
this.gv_closeReason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1058,25 +942,6 @@
this.gv_closeReason.Visible = true;
this.gv_closeReason.VisibleIndex = 29;
this.gv_closeReason.Width = 94;
- //
- // lb_closedBy
- //
- this.lb_closedBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_closedBy.Appearance.Options.UseFont = true;
- this.lb_closedBy.Location = new System.Drawing.Point(20, 244);
- this.lb_closedBy.Name = "lb_closedBy";
- this.lb_closedBy.Size = new System.Drawing.Size(56, 21);
- this.lb_closedBy.TabIndex = 343;
- this.lb_closedBy.Text = "鍏抽棴浜� ";
- //
- // txt_closedBy
- //
- this.txt_closedBy.Location = new System.Drawing.Point(80, 244);
- this.txt_closedBy.Name = "txt_closedBy";
- this.txt_closedBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_closedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_closedBy.Size = new System.Drawing.Size(150, 28);
- this.txt_closedBy.TabIndex = 343;
//
// gv_closedBy
//
@@ -1195,7 +1060,7 @@
//
this.lb_createdBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createdBy.Appearance.Options.UseFont = true;
- this.lb_createdBy.Location = new System.Drawing.Point(20, 212);
+ this.lb_createdBy.Location = new System.Drawing.Point(20, 180);
this.lb_createdBy.Name = "lb_createdBy";
this.lb_createdBy.Size = new System.Drawing.Size(56, 21);
this.lb_createdBy.TabIndex = 312;
@@ -1203,7 +1068,7 @@
//
// txt_createdBy
//
- this.txt_createdBy.Location = new System.Drawing.Point(80, 212);
+ this.txt_createdBy.Location = new System.Drawing.Point(80, 180);
this.txt_createdBy.Name = "txt_createdBy";
this.txt_createdBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createdBy.Properties.Appearance.Options.UseFont = true;
@@ -1327,7 +1192,7 @@
//
this.lb_receiverContact.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_receiverContact.Appearance.Options.UseFont = true;
- this.lb_receiverContact.Location = new System.Drawing.Point(20, 180);
+ this.lb_receiverContact.Location = new System.Drawing.Point(20, 148);
this.lb_receiverContact.Name = "lb_receiverContact";
this.lb_receiverContact.Size = new System.Drawing.Size(107, 21);
this.lb_receiverContact.TabIndex = 285;
@@ -1335,7 +1200,7 @@
//
// txt_receiverContact
//
- this.txt_receiverContact.Location = new System.Drawing.Point(80, 180);
+ this.txt_receiverContact.Location = new System.Drawing.Point(80, 148);
this.txt_receiverContact.Name = "txt_receiverContact";
this.txt_receiverContact.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_receiverContact.Properties.Appearance.Options.UseFont = true;
@@ -1459,7 +1324,7 @@
//
this.lb_salesGroup.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_salesGroup.Appearance.Options.UseFont = true;
- this.lb_salesGroup.Location = new System.Drawing.Point(20, 148);
+ this.lb_salesGroup.Location = new System.Drawing.Point(20, 116);
this.lb_salesGroup.Name = "lb_salesGroup";
this.lb_salesGroup.Size = new System.Drawing.Size(56, 21);
this.lb_salesGroup.TabIndex = 262;
@@ -1467,7 +1332,7 @@
//
// txt_salesGroup
//
- this.txt_salesGroup.Location = new System.Drawing.Point(80, 148);
+ this.txt_salesGroup.Location = new System.Drawing.Point(80, 116);
this.txt_salesGroup.Name = "txt_salesGroup";
this.txt_salesGroup.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_salesGroup.Properties.Appearance.Options.UseFont = true;
@@ -1591,7 +1456,7 @@
//
this.lb_inventoryOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_inventoryOrg.Appearance.Options.UseFont = true;
- this.lb_inventoryOrg.Location = new System.Drawing.Point(20, 116);
+ this.lb_inventoryOrg.Location = new System.Drawing.Point(20, 84);
this.lb_inventoryOrg.Name = "lb_inventoryOrg";
this.lb_inventoryOrg.Size = new System.Drawing.Size(73, 21);
this.lb_inventoryOrg.TabIndex = 243;
@@ -1599,7 +1464,7 @@
//
// txt_inventoryOrg
//
- this.txt_inventoryOrg.Location = new System.Drawing.Point(80, 116);
+ this.txt_inventoryOrg.Location = new System.Drawing.Point(80, 84);
this.txt_inventoryOrg.Name = "txt_inventoryOrg";
this.txt_inventoryOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_inventoryOrg.Properties.Appearance.Options.UseFont = true;
@@ -1657,7 +1522,7 @@
//
this.lb_returnReason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_returnReason.Appearance.Options.UseFont = true;
- this.lb_returnReason.Location = new System.Drawing.Point(418, 361);
+ this.lb_returnReason.Location = new System.Drawing.Point(388, 263);
this.lb_returnReason.Name = "lb_returnReason";
this.lb_returnReason.Size = new System.Drawing.Size(73, 21);
this.lb_returnReason.TabIndex = 235;
@@ -1665,7 +1530,7 @@
//
// txt_returnReason
//
- this.txt_returnReason.Location = new System.Drawing.Point(478, 357);
+ this.txt_returnReason.Location = new System.Drawing.Point(448, 259);
this.txt_returnReason.Name = "txt_returnReason";
this.txt_returnReason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
@@ -1686,25 +1551,6 @@
this.gv_returnReason.VisibleIndex = 10;
this.gv_returnReason.Width = 94;
//
- // lb_taobaoRemark
- //
- this.lb_taobaoRemark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_taobaoRemark.Appearance.Options.UseFont = true;
- this.lb_taobaoRemark.Location = new System.Drawing.Point(270, 84);
- this.lb_taobaoRemark.Name = "lb_taobaoRemark";
- this.lb_taobaoRemark.Size = new System.Drawing.Size(107, 21);
- this.lb_taobaoRemark.TabIndex = 231;
- this.lb_taobaoRemark.Text = "娣樺疂瀹㈡埛澶囨敞 ";
- //
- // txt_taobaoRemark
- //
- this.txt_taobaoRemark.Location = new System.Drawing.Point(330, 84);
- this.txt_taobaoRemark.Name = "txt_taobaoRemark";
- this.txt_taobaoRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_taobaoRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_taobaoRemark.Size = new System.Drawing.Size(150, 28);
- this.txt_taobaoRemark.TabIndex = 231;
- //
// gv_taobaoRemark
//
this.gv_taobaoRemark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1723,7 +1569,7 @@
//
this.lb_returnCustomer.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_returnCustomer.Appearance.Options.UseFont = true;
- this.lb_returnCustomer.Location = new System.Drawing.Point(20, 84);
+ this.lb_returnCustomer.Location = new System.Drawing.Point(20, 52);
this.lb_returnCustomer.Name = "lb_returnCustomer";
this.lb_returnCustomer.Size = new System.Drawing.Size(73, 21);
this.lb_returnCustomer.TabIndex = 228;
@@ -1731,7 +1577,7 @@
//
// txt_returnCustomer
//
- this.txt_returnCustomer.Location = new System.Drawing.Point(80, 84);
+ this.txt_returnCustomer.Location = new System.Drawing.Point(80, 52);
this.txt_returnCustomer.Name = "txt_returnCustomer";
this.txt_returnCustomer.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_returnCustomer.Properties.Appearance.Options.UseFont = true;
@@ -1756,7 +1602,7 @@
//
this.lb_customerOrderNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_customerOrderNo.Appearance.Options.UseFont = true;
- this.lb_customerOrderNo.Location = new System.Drawing.Point(50, 361);
+ this.lb_customerOrderNo.Location = new System.Drawing.Point(20, 263);
this.lb_customerOrderNo.Name = "lb_customerOrderNo";
this.lb_customerOrderNo.Size = new System.Drawing.Size(73, 21);
this.lb_customerOrderNo.TabIndex = 226;
@@ -1842,25 +1688,6 @@
this.gv_salesOrg.VisibleIndex = 5;
this.gv_salesOrg.Width = 94;
//
- // lb_currency
- //
- this.lb_currency.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_currency.Appearance.Options.UseFont = true;
- this.lb_currency.Location = new System.Drawing.Point(20, 52);
- this.lb_currency.Name = "lb_currency";
- this.lb_currency.Size = new System.Drawing.Size(73, 21);
- this.lb_currency.TabIndex = 217;
- this.lb_currency.Text = "缁撶畻甯佸埆 ";
- //
- // txt_currency
- //
- this.txt_currency.Location = new System.Drawing.Point(80, 52);
- this.txt_currency.Name = "txt_currency";
- this.txt_currency.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_currency.Properties.Appearance.Options.UseFont = true;
- this.txt_currency.Size = new System.Drawing.Size(150, 28);
- this.txt_currency.TabIndex = 217;
- //
// gv_currency
//
this.gv_currency.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1945,7 +1772,7 @@
//
this.lb_billType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_billType.Appearance.Options.UseFont = true;
- this.lb_billType.Location = new System.Drawing.Point(661, 361);
+ this.lb_billType.Location = new System.Drawing.Point(631, 263);
this.lb_billType.Name = "lb_billType";
this.lb_billType.Size = new System.Drawing.Size(73, 21);
this.lb_billType.TabIndex = 211;
@@ -1953,7 +1780,7 @@
//
// txt_billType
//
- this.txt_billType.Location = new System.Drawing.Point(721, 357);
+ this.txt_billType.Location = new System.Drawing.Point(691, 259);
this.txt_billType.Name = "txt_billType";
this.txt_billType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billType.Properties.Appearance.Options.UseFont = true;
@@ -2141,10 +1968,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 401);
+ this.tabMx.Location = new System.Drawing.Point(0, 302);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 169);
+ this.tabMx.Size = new System.Drawing.Size(1126, 268);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -2157,28 +1984,10 @@
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_billStatus);
this.panel1.Controls.Add(this.txt_billStatus);
- this.panel1.Controls.Add(this.lb_erpId);
- this.panel1.Controls.Add(this.txt_erpId);
- this.panel1.Controls.Add(this.lb_manualCloseFlag);
- this.panel1.Controls.Add(this.txt_manualCloseFlag);
- this.panel1.Controls.Add(this.lb_closeStatus);
- this.panel1.Controls.Add(this.txt_closeStatus);
- this.panel1.Controls.Add(this.lb_cancelDate);
- this.panel1.Controls.Add(this.txt_cancelDate);
- this.panel1.Controls.Add(this.lb_cancelledBy);
- this.panel1.Controls.Add(this.txt_cancelledBy);
- this.panel1.Controls.Add(this.lb_cancelStatus);
- this.panel1.Controls.Add(this.txt_cancelStatus);
this.panel1.Controls.Add(this.lb_approvedDate);
this.panel1.Controls.Add(this.txt_approvedDate);
this.panel1.Controls.Add(this.lb_approvedBy);
this.panel1.Controls.Add(this.txt_approvedBy);
- this.panel1.Controls.Add(this.lb_closeDate);
- this.panel1.Controls.Add(this.txt_closeDate);
- this.panel1.Controls.Add(this.lb_closeReason);
- this.panel1.Controls.Add(this.txt_closeReason);
- this.panel1.Controls.Add(this.lb_closedBy);
- this.panel1.Controls.Add(this.txt_closedBy);
this.panel1.Controls.Add(this.lb_modifiedDate);
this.panel1.Controls.Add(this.txt_modifiedDate);
this.panel1.Controls.Add(this.lb_modifiedBy);
@@ -2215,8 +2024,6 @@
this.panel1.Controls.Add(this.txt_deliveryLocation);
this.panel1.Controls.Add(this.lb_returnReason);
this.panel1.Controls.Add(this.txt_returnReason);
- this.panel1.Controls.Add(this.lb_taobaoRemark);
- this.panel1.Controls.Add(this.txt_taobaoRemark);
this.panel1.Controls.Add(this.lb_returnCustomer);
this.panel1.Controls.Add(this.txt_returnCustomer);
this.panel1.Controls.Add(this.lb_customerOrderNo);
@@ -2224,8 +2031,6 @@
this.panel1.Controls.Add(this.txt_salesDept);
this.panel1.Controls.Add(this.lb_salesOrg);
this.panel1.Controls.Add(this.txt_salesOrg);
- this.panel1.Controls.Add(this.lb_currency);
- this.panel1.Controls.Add(this.txt_currency);
this.panel1.Controls.Add(this.lb_fDate);
this.panel1.Controls.Add(this.txt_fDate);
this.panel1.Controls.Add(this.lb_billNo);
@@ -2238,20 +2043,20 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 401);
+ this.panel1.Size = new System.Drawing.Size(1126, 302);
this.panel1.TabIndex = 1;
//
// txt_customerOrderNo
//
this.txt_customerOrderNo.IsReadly = false;
- this.txt_customerOrderNo.Location = new System.Drawing.Point(143, 357);
+ this.txt_customerOrderNo.Location = new System.Drawing.Point(113, 259);
this.txt_customerOrderNo.Name = "txt_customerOrderNo";
this.txt_customerOrderNo.Size = new System.Drawing.Size(234, 29);
this.txt_customerOrderNo.TabIndex = 0;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(807, 343);
+ this.labelControl11.Location = new System.Drawing.Point(999, 171);
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);
@@ -2261,7 +2066,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(858, 343);
+ this.lbGuid.Location = new System.Drawing.Point(1050, 171);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -2276,74 +2081,6 @@
this.picCheckBox.TabIndex = 451;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "閿�鍞崟鍙�";
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 0;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "鍙戣揣鍗曞彿";
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 1;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "鐗╂枡缂栧彿";
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 2;
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "鐗╂枡鍚嶇О";
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 3;
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 4;
- //
- // gridColumn9
- //
- this.gridColumn9.Caption = "鍙戣揣鏁伴噺";
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 5;
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "宸查��鏁伴噺";
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 6;
- //
- // gvMxDel
- //
- this.gvMxDel.Caption = "绉诲嚭";
- this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
- this.gvMxDel.Name = "gvMxDel";
- this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 27;
- this.gvMxDel.Width = 94;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
- this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
// Frm_SalesReturnNotice
//
@@ -2360,18 +2097,10 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billStatus.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_erpId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_manualCloseFlag.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_closeStatus.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cancelDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cancelledBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cancelStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_closeDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_closeReason.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_closedBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit();
@@ -2390,11 +2119,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_inventoryOrg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_deliveryLocation.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_taobaoRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_returnCustomer.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_salesDept.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_salesOrg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_currency.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit();
@@ -2410,7 +2137,6 @@
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.ResumeLayout(false);
}
@@ -2459,29 +2185,11 @@
private DevExpress.XtraEditors.LabelControl lb_billStatus;
private DevExpress.XtraEditors.TextEdit txt_billStatus;
private DevExpress.XtraGrid.Columns.GridColumn gv_billStatus;
-
- private DevExpress.XtraEditors.LabelControl lb_erpId;
- private DevExpress.XtraEditors.TextEdit txt_erpId;
private DevExpress.XtraGrid.Columns.GridColumn gv_erpId;
-
- private DevExpress.XtraEditors.LabelControl lb_manualCloseFlag;
- private DevExpress.XtraEditors.TextEdit txt_manualCloseFlag;
private DevExpress.XtraGrid.Columns.GridColumn gv_manualCloseFlag;
-
- private DevExpress.XtraEditors.LabelControl lb_closeStatus;
- private DevExpress.XtraEditors.TextEdit txt_closeStatus;
private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
-
- private DevExpress.XtraEditors.LabelControl lb_cancelDate;
- private DevExpress.XtraEditors.TextEdit txt_cancelDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_cancelDate;
-
- private DevExpress.XtraEditors.LabelControl lb_cancelledBy;
- private DevExpress.XtraEditors.TextEdit txt_cancelledBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_cancelledBy;
-
- private DevExpress.XtraEditors.LabelControl lb_cancelStatus;
- private DevExpress.XtraEditors.TextEdit txt_cancelStatus;
private DevExpress.XtraGrid.Columns.GridColumn gv_cancelStatus;
private DevExpress.XtraEditors.LabelControl lb_approvedDate;
@@ -2491,17 +2199,8 @@
private DevExpress.XtraEditors.LabelControl lb_approvedBy;
private DevExpress.XtraEditors.TextEdit txt_approvedBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_approvedBy;
-
- private DevExpress.XtraEditors.LabelControl lb_closeDate;
- private DevExpress.XtraEditors.TextEdit txt_closeDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_closeDate;
-
- private DevExpress.XtraEditors.LabelControl lb_closeReason;
- private DevExpress.XtraEditors.TextEdit txt_closeReason;
private DevExpress.XtraGrid.Columns.GridColumn gv_closeReason;
-
- private DevExpress.XtraEditors.LabelControl lb_closedBy;
- private DevExpress.XtraEditors.TextEdit txt_closedBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_closedBy;
private DevExpress.XtraEditors.LabelControl lb_modifiedDate;
@@ -2575,9 +2274,6 @@
private DevExpress.XtraEditors.LabelControl lb_returnReason;
private DevExpress.XtraEditors.TextEdit txt_returnReason;
private DevExpress.XtraGrid.Columns.GridColumn gv_returnReason;
-
- private DevExpress.XtraEditors.LabelControl lb_taobaoRemark;
- private DevExpress.XtraEditors.TextEdit txt_taobaoRemark;
private DevExpress.XtraGrid.Columns.GridColumn gv_taobaoRemark;
private DevExpress.XtraEditors.LabelControl lb_returnCustomer;
@@ -2594,9 +2290,6 @@
private DevExpress.XtraEditors.LabelControl lb_salesOrg;
private DevExpress.XtraEditors.TextEdit txt_salesOrg;
private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrg;
-
- private DevExpress.XtraEditors.LabelControl lb_currency;
- private DevExpress.XtraEditors.TextEdit txt_currency;
private DevExpress.XtraGrid.Columns.GridColumn gv_currency;
private DevExpress.XtraEditors.LabelControl lb_fDate;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index fc9c6aa..b8d4e43 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -63,7 +63,7 @@
"SalesManager/SelectFormFhMx", json);
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
- //this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ this.repositoryItemSearchLookUpEdit1.DataSource = dt;
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index ca725b9..e03394d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -29,51 +29,51 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions 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();
- 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 editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions28 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject109 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject110 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject111 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject112 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions29 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject113 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject114 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject115 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject116 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions30 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject117 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject118 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject119 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject120 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions31 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject121 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject122 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject123 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject124 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions32 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject125 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject126 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject127 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject128 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions33 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject129 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject130 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject131 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject132 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions34 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject133 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject134 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject135 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject136 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions35 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject137 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject138 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject139 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject140 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions36 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject141 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject142 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject143 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject144 = new DevExpress.Utils.SerializableAppearanceObject();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -534,9 +534,9 @@
// rptDcOrg
//
this.rptDcOrg.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x162;
+ editorButtonImageOptions28.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x162;
this.rptDcOrg.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions28, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject109, serializableAppearanceObject110, serializableAppearanceObject111, serializableAppearanceObject112, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDcOrg.Name = "rptDcOrg";
this.rptDcOrg.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcOrg_ButtonClick);
//
@@ -558,9 +558,9 @@
// rptDcCk
//
this.rptDcCk.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions29.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDcCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- 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)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions29, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject113, serializableAppearanceObject114, serializableAppearanceObject115, serializableAppearanceObject116, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDcCk.Name = "rptDcCk";
this.rptDcCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcCk_ButtonClick);
//
@@ -578,9 +578,9 @@
// rptDcCw
//
this.rptDcCw.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions30.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDcCw.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, editorButtonImageOptions30, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject117, serializableAppearanceObject118, serializableAppearanceObject119, serializableAppearanceObject120, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDcCw.Name = "rptDcCw";
this.rptDcCw.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcCw_ButtonClick);
//
@@ -602,9 +602,9 @@
// rptDrOrg
//
this.rptDrOrg.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions31.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrOrg.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, editorButtonImageOptions31, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject121, serializableAppearanceObject122, serializableAppearanceObject123, serializableAppearanceObject124, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrOrg.Name = "rptDrOrg";
this.rptDrOrg.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrOrg_ButtonClick);
//
@@ -626,9 +626,9 @@
// rptDrCk
//
this.rptDrCk.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions32.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions32, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject125, serializableAppearanceObject126, serializableAppearanceObject127, serializableAppearanceObject128, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrCk.Name = "rptDrCk";
this.rptDrCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrCk_ButtonClick);
//
@@ -644,9 +644,9 @@
// rptDrCw
//
this.rptDrCw.AutoHeight = false;
- editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions33.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrCw.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions33, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject129, serializableAppearanceObject130, serializableAppearanceObject131, serializableAppearanceObject132, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrCw.Name = "rptDrCw";
this.rptDrCw.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrCw_ButtonClick);
//
@@ -668,9 +668,9 @@
// rptDcHz
//
this.rptDcHz.AutoHeight = false;
- editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions34.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDcHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions34, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject133, serializableAppearanceObject134, serializableAppearanceObject135, serializableAppearanceObject136, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDcHz.Name = "rptDcHz";
this.rptDcHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcHz_ButtonClick);
//
@@ -692,9 +692,9 @@
// rptDrHz
//
this.rptDrHz.AutoHeight = false;
- editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions35.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions35, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject137, serializableAppearanceObject138, serializableAppearanceObject139, serializableAppearanceObject140, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrHz.Name = "rptDrHz";
this.rptDrHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrHz_ButtonClick);
//
@@ -711,10 +711,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions9.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions9.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions36.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions36.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, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions36, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject141, serializableAppearanceObject142, serializableAppearanceObject143, serializableAppearanceObject144, "", 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);
@@ -1418,15 +1418,13 @@
//
// txt_fBillTypeID
//
- this.txt_fBillTypeID.EditValue = "-璇烽�夋嫨-";
+ this.txt_fBillTypeID.EditValue = "鏍囧噯璋冩嫧鐢宠鍗�(DBSQD01_SYS)";
this.txt_fBillTypeID.Location = new System.Drawing.Point(94, 43);
this.txt_fBillTypeID.Name = "txt_fBillTypeID";
this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
- "-璇烽�夋嫨-",
- "鏍囧噯璋冩嫧鐢宠鍗�(DBSQD01_SYS)",
- "濮斿璋冩嫧鐢宠鍗�(DBSQD04_SYS)"});
+ "鏍囧噯璋冩嫧鐢宠鍗�(DBSQD01_SYS)"});
this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_fBillTypeID.Size = new System.Drawing.Size(227, 24);
this.txt_fBillTypeID.TabIndex = 361;
@@ -1548,7 +1546,7 @@
this.lb_fbilltypeid.Name = "lb_fbilltypeid";
this.lb_fbilltypeid.Size = new System.Drawing.Size(68, 21);
this.lb_fbilltypeid.TabIndex = 211;
- this.lb_fbilltypeid.Text = "鍗曟嵁绫诲瀷";
+ this.lb_fbilltypeid.Text = "鐢宠绫诲瀷";
//
// lb_id
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index fb6a59f..1ffc9cf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -242,12 +242,12 @@
string dblx = txt_ftranstype.Text.ToString();
string dchzlx = txt_fOwnerTypeIdHead.Text.ToString();
string drhzlx = txt_fOwnerTypeInIdHead.Text.ToString();
- if (txt_fBillTypeID.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
- txt_fBillTypeID.Focus();
- return;
- }
+ //if (txt_fBillTypeID.SelectedIndex <= 0)
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+ // txt_fBillTypeID.Focus();
+ // return;
+ //}
if (txt_fTransferDirect.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冩嫧鏂瑰悜锛�");
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs
index cae9267..d355123 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbckDj.Designer.cs
@@ -88,6 +88,8 @@
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panel1 = new System.Windows.Forms.Panel();
this.txt_fTransferDirect = new DevExpress.XtraEditors.TextEdit();
this.txt_fBusinessType = new DevExpress.XtraEditors.TextEdit();
@@ -132,8 +134,6 @@
this.lb_id = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -899,6 +899,26 @@
this.gvMx1depotSectionCode.VisibleIndex = 7;
this.gvMx1depotSectionCode.Width = 94;
//
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鍒涘缓浜�";
+ this.gridColumn5.FieldName = "createBy";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 8;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "鍒涘缓鏃ユ湡";
+ this.gridColumn6.FieldName = "createDate";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.Width = 94;
+ //
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
@@ -1346,7 +1366,7 @@
this.lb_fbilltypeid.Name = "lb_fbilltypeid";
this.lb_fbilltypeid.Size = new System.Drawing.Size(68, 21);
this.lb_fbilltypeid.TabIndex = 388;
- this.lb_fbilltypeid.Text = "鍗曟嵁绫诲瀷";
+ this.lb_fbilltypeid.Text = "鐢宠绫诲瀷";
//
// lb_id
//
@@ -1376,26 +1396,6 @@
this.picCheckBox.TabIndex = 11;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "鍒涘缓浜�";
- this.gridColumn5.FieldName = "createBy";
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 8;
- this.gridColumn5.Width = 94;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "鍒涘缓鏃ユ湡";
- this.gridColumn6.FieldName = "createDate";
- this.gridColumn6.MinWidth = 25;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 9;
- this.gridColumn6.Width = 94;
//
// Frm_MesDbckDj
//
diff --git a/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
index ddee06c..f9dc95f 100644
--- a/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/XtraForm1.Designer.cs
@@ -28,30 +28,70 @@
/// </summary>
private void InitializeComponent()
{
- this.panel1 = new System.Windows.Forms.Panel();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.panel1.SuspendLayout();
+ this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.dateEdit1 = new DevExpress.XtraEditors.DateEdit();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
+ this.splitContainerControl1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
+ this.splitContainerControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+ this.layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties.CalendarTimeProperties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
this.SuspendLayout();
//
- // panel1
+ // splitContainerControl1
//
- this.panel1.Controls.Add(this.layoutControl1);
- this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1057, 392);
- this.panel1.TabIndex = 0;
+ this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainerControl1.Horizontal = false;
+ this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
+ this.splitContainerControl1.Name = "splitContainerControl1";
+ //
+ // splitContainerControl1.Panel1
+ //
+ this.splitContainerControl1.Panel1.Controls.Add(this.layoutControl1);
+ this.splitContainerControl1.Panel1.Text = "Panel1";
+ //
+ // splitContainerControl1.Panel2
+ //
+ this.splitContainerControl1.Panel2.Text = "Panel2";
+ this.splitContainerControl1.Size = new System.Drawing.Size(1057, 660);
+ this.splitContainerControl1.SplitterPosition = 279;
+ this.splitContainerControl1.TabIndex = 0;
//
// layoutControl1
//
+ this.layoutControl1.Controls.Add(this.textEdit1);
+ this.layoutControl1.Controls.Add(this.textEdit2);
+ this.layoutControl1.Controls.Add(this.simpleButton1);
+ this.layoutControl1.Controls.Add(this.dateEdit1);
this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutControl1.Location = new System.Drawing.Point(0, 0);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.Root;
- this.layoutControl1.Size = new System.Drawing.Size(1057, 392);
+ this.layoutControl1.Size = new System.Drawing.Size(1057, 279);
this.layoutControl1.TabIndex = 0;
this.layoutControl1.Text = "layoutControl1";
//
@@ -59,32 +99,149 @@
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem1,
+ this.layoutControlItem2,
+ this.layoutControlItem3,
+ this.layoutControlItem4});
+ this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- this.Root.OptionsCustomization.AllowDrag = DevExpress.XtraLayout.ItemDragDropMode.Allow;
- this.Root.OptionsCustomization.AllowDrop = DevExpress.XtraLayout.ItemDragDropMode.Allow;
- this.Root.Size = new System.Drawing.Size(1057, 392);
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 87D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
+ this.Root.Size = new System.Drawing.Size(1057, 279);
this.Root.TextVisible = false;
+ //
+ // textEdit1
+ //
+ this.textEdit1.Location = new System.Drawing.Point(148, 12);
+ this.textEdit1.Name = "textEdit1";
+ this.textEdit1.Size = new System.Drawing.Size(378, 24);
+ this.textEdit1.StyleController = this.layoutControl1;
+ this.textEdit1.TabIndex = 4;
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.textEdit1;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(518, 86);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(124, 18);
+ //
+ // textEdit2
+ //
+ this.textEdit2.Location = new System.Drawing.Point(666, 12);
+ this.textEdit2.Name = "textEdit2";
+ this.textEdit2.Size = new System.Drawing.Size(379, 24);
+ this.textEdit2.StyleController = this.layoutControl1;
+ this.textEdit2.TabIndex = 5;
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.textEdit2;
+ this.layoutControlItem2.Location = new System.Drawing.Point(518, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(519, 86);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(124, 18);
+ //
+ // simpleButton1
+ //
+ this.simpleButton1.Location = new System.Drawing.Point(12, 98);
+ this.simpleButton1.Name = "simpleButton1";
+ this.simpleButton1.Size = new System.Drawing.Size(514, 27);
+ this.simpleButton1.StyleController = this.layoutControl1;
+ this.simpleButton1.TabIndex = 6;
+ this.simpleButton1.Text = "simpleButton1";
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.simpleButton1;
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 86);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(518, 86);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem3.TextVisible = false;
+ //
+ // dateEdit1
+ //
+ this.dateEdit1.EditValue = null;
+ this.dateEdit1.Location = new System.Drawing.Point(666, 98);
+ this.dateEdit1.Name = "dateEdit1";
+ this.dateEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.dateEdit1.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.dateEdit1.Size = new System.Drawing.Size(379, 24);
+ this.dateEdit1.StyleController = this.layoutControl1;
+ this.dateEdit1.TabIndex = 7;
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.dateEdit1;
+ this.layoutControlItem4.Location = new System.Drawing.Point(518, 86);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(519, 86);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(124, 18);
//
// XtraForm1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1057, 660);
- this.Controls.Add(this.panel1);
+ this.Controls.Add(this.splitContainerControl1);
this.Name = "XtraForm1";
this.Text = "XtraForm1";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
- this.panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
+ this.splitContainerControl1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
+ this.splitContainerControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+ this.layoutControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties.CalendarTimeProperties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
this.ResumeLayout(false);
}
#endregion
- private System.Windows.Forms.Panel panel1;
+ private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
private DevExpress.XtraLayout.LayoutControl layoutControl1;
+ private DevExpress.XtraEditors.TextEdit textEdit1;
+ private DevExpress.XtraEditors.TextEdit textEdit2;
+ private DevExpress.XtraEditors.SimpleButton simpleButton1;
+ private DevExpress.XtraEditors.DateEdit dateEdit1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
}
}
\ No newline at end of file
--
Gitblit v1.9.3