From 48c9e2692ee60cdb6c1c4a297791a5bdcdc698c4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 27 二月 2025 18:15:54 +0800
Subject: [PATCH] 销售
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 6
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 346 +++++++++++++++++++++++++++++++++++++++++++++++---------
2 files changed, 290 insertions(+), 62 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 1d884e4..4f93f2a 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 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 editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1fseq = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fEntrynote = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fRealQty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -57,6 +57,24 @@
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.lb_fApproverStaus = new DevExpress.XtraEditors.LabelControl();
@@ -70,7 +88,7 @@
this.lb_fCustomerID = new DevExpress.XtraEditors.LabelControl();
this.gv_fCustomerID = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fSalesManID = new DevExpress.XtraEditors.LabelControl();
- this.txt_fSalesManID = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fSalesManIDTxt = new DevExpress.XtraEditors.TextEdit();
this.gv_fSalesManID = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fApproveDate = new DevExpress.XtraEditors.LabelControl();
this.txt_fApproveDate = new DevExpress.XtraEditors.TextEdit();
@@ -106,10 +124,10 @@
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
this.txt_fApproverStaus = new DevExpress.XtraEditors.CheckEdit();
- this.txt_fCustomerID = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fCustomerIDTxt = new DevExpress.XtraEditors.TextEdit();
this.txt_salesId = new Gs.DevApp.UserControl.UcLookSales();
this.lb_salesId = new DevExpress.XtraEditors.LabelControl();
- this.txt_fSaleOrgId = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fSaleOrgIdTxt = new DevExpress.XtraEditors.TextEdit();
this.txt_fBillTypeID = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
@@ -124,7 +142,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fSalesManID.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fSalesManIDTxt.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fApproveDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fCreateDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fApproverID.Properties)).BeginInit();
@@ -141,8 +159,8 @@
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerIDTxt.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgIdTxt.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
@@ -157,7 +175,7 @@
this.gvMx1fseq.Name = "gvMx1fseq";
this.gvMx1fseq.Tag = "query_a.FSEQ";
this.gvMx1fseq.Visible = true;
- this.gvMx1fseq.VisibleIndex = 7;
+ this.gvMx1fseq.VisibleIndex = 4;
this.gvMx1fseq.Width = 94;
//
// gvMx1fEntrynote
@@ -174,7 +192,7 @@
this.gvMx1fEntrynote.Name = "gvMx1fEntrynote";
this.gvMx1fEntrynote.Tag = "edit";
this.gvMx1fEntrynote.Visible = true;
- this.gvMx1fEntrynote.VisibleIndex = 6;
+ this.gvMx1fEntrynote.VisibleIndex = 3;
this.gvMx1fEntrynote.Width = 94;
//
// gvMx1fRealQty
@@ -187,7 +205,7 @@
this.gvMx1fRealQty.Name = "gvMx1fRealQty";
this.gvMx1fRealQty.Tag = "query_a.FRealQty";
this.gvMx1fRealQty.Visible = true;
- this.gvMx1fRealQty.VisibleIndex = 5;
+ this.gvMx1fRealQty.VisibleIndex = 2;
this.gvMx1fRealQty.Width = 94;
//
// gvMx1fMustQty
@@ -204,7 +222,7 @@
this.gvMx1fMustQty.Name = "gvMx1fMustQty";
this.gvMx1fMustQty.Tag = "yz_quantity_0_edit";
this.gvMx1fMustQty.Visible = true;
- this.gvMx1fMustQty.VisibleIndex = 4;
+ this.gvMx1fMustQty.VisibleIndex = 1;
this.gvMx1fMustQty.Width = 94;
//
// gvMx1salesDetailId
@@ -216,8 +234,6 @@
this.gvMx1salesDetailId.MinWidth = 50;
this.gvMx1salesDetailId.Name = "gvMx1salesDetailId";
this.gvMx1salesDetailId.Tag = "query_a.SalesDetailId";
- this.gvMx1salesDetailId.Visible = true;
- this.gvMx1salesDetailId.VisibleIndex = 3;
this.gvMx1salesDetailId.Width = 94;
//
// gvMx1pid
@@ -229,8 +245,6 @@
this.gvMx1pid.MinWidth = 50;
this.gvMx1pid.Name = "gvMx1pid";
this.gvMx1pid.Tag = "query_a.pid";
- this.gvMx1pid.Visible = true;
- this.gvMx1pid.VisibleIndex = 2;
this.gvMx1pid.Width = 94;
//
// gvMx1id
@@ -242,8 +256,6 @@
this.gvMx1id.MinWidth = 50;
this.gvMx1id.Name = "gvMx1id";
this.gvMx1id.Tag = "query_a.id";
- this.gvMx1id.Visible = true;
- this.gvMx1id.VisibleIndex = 1;
this.gvMx1id.Width = 94;
//
// tabMxPage1
@@ -280,6 +292,24 @@
this.gvMx1fEntrynote,
this.gvMx1fseq,
this.gridColumn11,
+ this.gridColumn12,
+ this.gridColumn13,
+ this.gridColumn14,
+ this.gridColumn15,
+ this.gridColumn16,
+ this.gridColumn17,
+ this.gridColumn18,
+ this.gridColumn19,
+ this.gridColumn20,
+ this.gridColumn21,
+ this.gridColumn22,
+ this.gridColumn23,
+ this.gridColumn24,
+ this.gridColumn25,
+ this.gridColumn26,
+ this.gridColumn27,
+ this.gridColumn28,
+ this.gridColumn29,
this.gvMxDel});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -406,7 +436,7 @@
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Tag = "edit";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 8;
+ this.gridColumn11.VisibleIndex = 5;
this.gridColumn11.Width = 94;
//
// repositoryItemDateEdit1
@@ -418,6 +448,186 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
//
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "閿�鍞鍗曞彿";
+ this.gridColumn12.FieldName = "billNo";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 6;
+ this.gridColumn12.Width = 94;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn13.FieldName = "itemNo";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 7;
+ this.gridColumn13.Width = 94;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn14.FieldName = "itemName";
+ this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 8;
+ this.gridColumn14.Width = 94;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn15.FieldName = "itemModel";
+ this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 9;
+ this.gridColumn15.Width = 94;
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "閿�鍞崟浣�";
+ this.gridColumn16.FieldName = "dwXs";
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 10;
+ this.gridColumn16.Width = 94;
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "閿�鍞暟閲�";
+ this.gridColumn17.FieldName = "xsSl";
+ this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 11;
+ this.gridColumn17.Width = 94;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.Caption = "璁′环鍗曚綅";
+ this.gridColumn18.FieldName = "dwJj";
+ this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 12;
+ this.gridColumn18.Width = 94;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.Caption = "璁′环鏁伴噺";
+ this.gridColumn19.FieldName = "jjSl";
+ this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 13;
+ this.gridColumn19.Width = 94;
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "瑕佽揣鏃ユ湡";
+ this.gridColumn20.FieldName = "deliveryDate";
+ this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 14;
+ this.gridColumn20.Width = 94;
+ //
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "鏄惁璧犲搧";
+ this.gridColumn21.FieldName = "ifFree";
+ this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Visible = true;
+ this.gridColumn21.VisibleIndex = 15;
+ this.gridColumn21.Width = 94;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.Caption = "璐т富绫诲瀷";
+ this.gridColumn22.FieldName = "hzlx";
+ this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 16;
+ this.gridColumn22.Width = 94;
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "璐т富";
+ this.gridColumn23.FieldName = "hz";
+ this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 17;
+ this.gridColumn23.Width = 94;
+ //
+ // gridColumn24
+ //
+ this.gridColumn24.Caption = "閿�鍞娉�";
+ this.gridColumn24.FieldName = "xxbz";
+ this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.Visible = true;
+ this.gridColumn24.VisibleIndex = 18;
+ this.gridColumn24.Width = 94;
+ //
+ // gridColumn25
+ //
+ this.gridColumn25.Caption = "鍙戣揣涓婇檺";
+ this.gridColumn25.FieldName = "fhsx";
+ this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.Name = "gridColumn25";
+ this.gridColumn25.Visible = true;
+ this.gridColumn25.VisibleIndex = 19;
+ this.gridColumn25.Width = 94;
+ //
+ // gridColumn26
+ //
+ this.gridColumn26.Caption = "鍙戣揣涓嬮檺";
+ this.gridColumn26.FieldName = "fhxx";
+ this.gridColumn26.MinWidth = 25;
+ this.gridColumn26.Name = "gridColumn26";
+ this.gridColumn26.Visible = true;
+ this.gridColumn26.VisibleIndex = 20;
+ this.gridColumn26.Width = 94;
+ //
+ // gridColumn27
+ //
+ this.gridColumn27.Caption = "渚涘簲缁勭粐";
+ this.gridColumn27.FieldName = "gyOrg";
+ this.gridColumn27.MinWidth = 25;
+ this.gridColumn27.Name = "gridColumn27";
+ this.gridColumn27.Visible = true;
+ this.gridColumn27.VisibleIndex = 21;
+ this.gridColumn27.Width = 94;
+ //
+ // gridColumn28
+ //
+ this.gridColumn28.Caption = "搴撳瓨缁勭粐";
+ this.gridColumn28.FieldName = "kcOrg";
+ this.gridColumn28.MinWidth = 25;
+ this.gridColumn28.Name = "gridColumn28";
+ this.gridColumn28.Visible = true;
+ this.gridColumn28.VisibleIndex = 22;
+ this.gridColumn28.Width = 94;
+ //
+ // gridColumn29
+ //
+ this.gridColumn29.Caption = "缁撶畻缁勭粐";
+ this.gridColumn29.FieldName = "jsOrg";
+ this.gridColumn29.MinWidth = 25;
+ this.gridColumn29.Name = "gridColumn29";
+ this.gridColumn29.Visible = true;
+ this.gridColumn29.VisibleIndex = 23;
+ this.gridColumn29.Width = 94;
+ //
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
@@ -425,16 +635,16 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 9;
+ this.gvMxDel.VisibleIndex = 24;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -564,15 +774,15 @@
this.lb_fSalesManID.TabIndex = 231;
this.lb_fSalesManID.Text = "閿�鍞憳 ";
//
- // txt_fSalesManID
+ // txt_fSalesManIDTxt
//
- this.txt_fSalesManID.Location = new System.Drawing.Point(350, 80);
- this.txt_fSalesManID.Name = "txt_fSalesManID";
- this.txt_fSalesManID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fSalesManID.Properties.Appearance.Options.UseFont = true;
- this.txt_fSalesManID.Size = new System.Drawing.Size(195, 28);
- this.txt_fSalesManID.TabIndex = 231;
- this.txt_fSalesManID.Tag = "readonly";
+ this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(350, 80);
+ this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt";
+ this.txt_fSalesManIDTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true;
+ this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(195, 28);
+ this.txt_fSalesManIDTxt.TabIndex = 231;
+ this.txt_fSalesManIDTxt.Tag = "readonly";
//
// gv_fSalesManID
//
@@ -974,10 +1184,10 @@
//
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.txt_fApproverStaus);
- this.panel1.Controls.Add(this.txt_fCustomerID);
+ this.panel1.Controls.Add(this.txt_fCustomerIDTxt);
this.panel1.Controls.Add(this.txt_salesId);
this.panel1.Controls.Add(this.lb_salesId);
- this.panel1.Controls.Add(this.txt_fSaleOrgId);
+ this.panel1.Controls.Add(this.txt_fSaleOrgIdTxt);
this.panel1.Controls.Add(this.txt_fBillTypeID);
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
@@ -988,7 +1198,7 @@
this.panel1.Controls.Add(this.txt_fDate);
this.panel1.Controls.Add(this.lb_fCustomerID);
this.panel1.Controls.Add(this.lb_fSalesManID);
- this.panel1.Controls.Add(this.txt_fSalesManID);
+ this.panel1.Controls.Add(this.txt_fSalesManIDTxt);
this.panel1.Controls.Add(this.lb_fApproveDate);
this.panel1.Controls.Add(this.txt_fApproveDate);
this.panel1.Controls.Add(this.lb_fCreateDate);
@@ -1019,15 +1229,15 @@
this.txt_fApproverStaus.Size = new System.Drawing.Size(59, 24);
this.txt_fApproverStaus.TabIndex = 370;
//
- // txt_fCustomerID
+ // txt_fCustomerIDTxt
//
- this.txt_fCustomerID.Location = new System.Drawing.Point(350, 111);
- this.txt_fCustomerID.Name = "txt_fCustomerID";
- this.txt_fCustomerID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fCustomerID.Properties.Appearance.Options.UseFont = true;
- this.txt_fCustomerID.Size = new System.Drawing.Size(195, 28);
- this.txt_fCustomerID.TabIndex = 368;
- this.txt_fCustomerID.Tag = "readonly";
+ this.txt_fCustomerIDTxt.Location = new System.Drawing.Point(350, 111);
+ this.txt_fCustomerIDTxt.Name = "txt_fCustomerIDTxt";
+ this.txt_fCustomerIDTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fCustomerIDTxt.Properties.Appearance.Options.UseFont = true;
+ this.txt_fCustomerIDTxt.Size = new System.Drawing.Size(195, 28);
+ this.txt_fCustomerIDTxt.TabIndex = 368;
+ this.txt_fCustomerIDTxt.Tag = "readonly";
//
// txt_salesId
//
@@ -1047,15 +1257,15 @@
this.lb_salesId.TabIndex = 366;
this.lb_salesId.Text = "閿�鍞鍗�";
//
- // txt_fSaleOrgId
+ // txt_fSaleOrgIdTxt
//
- this.txt_fSaleOrgId.Location = new System.Drawing.Point(350, 46);
- this.txt_fSaleOrgId.Name = "txt_fSaleOrgId";
- this.txt_fSaleOrgId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fSaleOrgId.Properties.Appearance.Options.UseFont = true;
- this.txt_fSaleOrgId.Size = new System.Drawing.Size(195, 28);
- this.txt_fSaleOrgId.TabIndex = 365;
- this.txt_fSaleOrgId.Tag = "readonly";
+ this.txt_fSaleOrgIdTxt.Location = new System.Drawing.Point(350, 46);
+ this.txt_fSaleOrgIdTxt.Name = "txt_fSaleOrgIdTxt";
+ this.txt_fSaleOrgIdTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fSaleOrgIdTxt.Properties.Appearance.Options.UseFont = true;
+ this.txt_fSaleOrgIdTxt.Size = new System.Drawing.Size(195, 28);
+ this.txt_fSaleOrgIdTxt.TabIndex = 365;
+ this.txt_fSaleOrgIdTxt.Tag = "readonly";
//
// txt_fBillTypeID
//
@@ -1120,7 +1330,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fSalesManID.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fSalesManIDTxt.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fApproveDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fCreateDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fApproverID.Properties)).EndInit();
@@ -1138,8 +1348,8 @@
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerIDTxt.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgIdTxt.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -1184,7 +1394,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_fCustomerID;
private DevExpress.XtraEditors.LabelControl lb_fSalesManID;
- private DevExpress.XtraEditors.TextEdit txt_fSalesManID;
+ private DevExpress.XtraEditors.TextEdit txt_fSalesManIDTxt;
private DevExpress.XtraGrid.Columns.GridColumn gv_fSalesManID;
private DevExpress.XtraEditors.LabelControl lb_fApproveDate;
@@ -1219,10 +1429,10 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraEditors.ComboBoxEdit txt_fBillTypeID;
- private DevExpress.XtraEditors.TextEdit txt_fSaleOrgId;
+ private DevExpress.XtraEditors.TextEdit txt_fSaleOrgIdTxt;
private DevExpress.XtraEditors.LabelControl lb_salesId;
private UserControl.UcLookSales txt_salesId;
- private DevExpress.XtraEditors.TextEdit txt_fCustomerID;
+ private DevExpress.XtraEditors.TextEdit txt_fCustomerIDTxt;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View;
@@ -1240,5 +1450,23 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
}
}
\ 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 c48c20e..b22d257 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -51,9 +51,9 @@
string _sqGuid = txt_salesId.GetId();
if (string.IsNullOrEmpty(_sqGuid))
return;
- txt_fSalesManID.Text = txt_salesId.GetSalesUserName();
- txt_fCustomerID.Text = txt_salesId.GetSalesCusName();
- txt_fSaleOrgId.Text = txt_salesId.GetSalesOrgName();
+ txt_fSalesManIDTxt.Text = txt_salesId.GetSalesUserName();
+ txt_fCustomerIDTxt.Text = txt_salesId.GetSalesCusName();
+ txt_fSaleOrgIdTxt.Text = txt_salesId.GetSalesOrgName();
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid);
var json = JsonConvert.SerializeObject(_obj);
--
Gitblit v1.9.3