From d53f0b2a3ba61d64a6df067920fa136235babaa9 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 25 二月 2025 15:56:26 +0800
Subject: [PATCH] 销售
---
/dev/null | 0
DevApp/Gs.DevApp/UserControl/UcLookSales.resx | 120 +++++++++
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 44 --
DevApp/Gs.DevApp/UserControl/UcLookSales.cs | 160 ++++++++++++
DevApp/Gs.DevApp/UserControl/UcLookSales.Designer.cs | 145 +++++++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 247 ++++++++++++++----
7 files changed, 629 insertions(+), 96 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index a246271..aa1dbf3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -29,6 +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();
this.gvMx1fseq = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fEntrynote = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fRealQty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -39,6 +44,9 @@
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
+ this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
this.lb_fApproverStaus = new DevExpress.XtraEditors.LabelControl();
this.txt_fApproverStaus = new DevExpress.XtraEditors.TextEdit();
this.gv_fApproverStaus = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -49,7 +57,6 @@
this.txt_fDate = new DevExpress.XtraEditors.TextEdit();
this.gv_fDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fCustomerID = new DevExpress.XtraEditors.LabelControl();
- this.txt_fCustomerID = new DevExpress.XtraEditors.TextEdit();
this.gv_fCustomerID = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fSalesManID = new DevExpress.XtraEditors.LabelControl();
this.txt_fSalesManID = new DevExpress.XtraEditors.TextEdit();
@@ -71,7 +78,6 @@
this.lb_fSaleOrgId = new DevExpress.XtraEditors.LabelControl();
this.gv_fSaleOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fBillTypeID = new DevExpress.XtraEditors.LabelControl();
- this.txt_fBillTypeID = new DevExpress.XtraEditors.TextEdit();
this.gv_fBillTypeID = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
@@ -88,24 +94,30 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_fCustomerID = 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_fStockOrgId = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fBillTypeID = new DevExpress.XtraEditors.ComboBoxEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.txt_fStockOrgId = new Gs.DevApp.UserControl.UcLookOrg();
- this.txt_fSaleOrgId = new Gs.DevApp.UserControl.UcLookOrg();
+ 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.txt_fApproverStaus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSalesManID.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();
((System.ComponentModel.ISupportInitialize)(this.txt_fCreatorId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -117,7 +129,12 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fStockOrgId.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.SuspendLayout();
//
// gvMx1fseq
@@ -130,20 +147,24 @@
this.gvMx1fseq.Name = "gvMx1fseq";
this.gvMx1fseq.Tag = "query_a.FSEQ";
this.gvMx1fseq.Visible = true;
- this.gvMx1fseq.VisibleIndex = 6;
+ this.gvMx1fseq.VisibleIndex = 7;
this.gvMx1fseq.Width = 94;
//
// gvMx1fEntrynote
//
this.gvMx1fEntrynote.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fEntrynote.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
this.gvMx1fEntrynote.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fEntrynote.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1fEntrynote.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1fEntrynote.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1fEntrynote.Caption = "澶囨敞 ";
this.gvMx1fEntrynote.FieldName = "fEntrynote";
this.gvMx1fEntrynote.MinWidth = 50;
this.gvMx1fEntrynote.Name = "gvMx1fEntrynote";
- this.gvMx1fEntrynote.Tag = "query_a.FEntrynote";
+ this.gvMx1fEntrynote.Tag = "edit";
this.gvMx1fEntrynote.Visible = true;
- this.gvMx1fEntrynote.VisibleIndex = 5;
+ this.gvMx1fEntrynote.VisibleIndex = 6;
this.gvMx1fEntrynote.Width = 94;
//
// gvMx1fRealQty
@@ -156,20 +177,24 @@
this.gvMx1fRealQty.Name = "gvMx1fRealQty";
this.gvMx1fRealQty.Tag = "query_a.FRealQty";
this.gvMx1fRealQty.Visible = true;
- this.gvMx1fRealQty.VisibleIndex = 4;
+ this.gvMx1fRealQty.VisibleIndex = 5;
this.gvMx1fRealQty.Width = 94;
//
// gvMx1fMustQty
//
this.gvMx1fMustQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fMustQty.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
this.gvMx1fMustQty.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fMustQty.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1fMustQty.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1fMustQty.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1fMustQty.Caption = "搴斿彂鏁伴噺 ";
this.gvMx1fMustQty.FieldName = "fMustQty";
this.gvMx1fMustQty.MinWidth = 50;
this.gvMx1fMustQty.Name = "gvMx1fMustQty";
- this.gvMx1fMustQty.Tag = "query_a.FMustQty";
+ this.gvMx1fMustQty.Tag = "yz_quantity_0_edit";
this.gvMx1fMustQty.Visible = true;
- this.gvMx1fMustQty.VisibleIndex = 3;
+ this.gvMx1fMustQty.VisibleIndex = 4;
this.gvMx1fMustQty.Width = 94;
//
// gvMx1salesDetailId
@@ -182,7 +207,7 @@
this.gvMx1salesDetailId.Name = "gvMx1salesDetailId";
this.gvMx1salesDetailId.Tag = "query_a.SalesDetailId";
this.gvMx1salesDetailId.Visible = true;
- this.gvMx1salesDetailId.VisibleIndex = 2;
+ this.gvMx1salesDetailId.VisibleIndex = 3;
this.gvMx1salesDetailId.Width = 94;
//
// gvMx1pid
@@ -195,7 +220,7 @@
this.gvMx1pid.Name = "gvMx1pid";
this.gvMx1pid.Tag = "query_a.pid";
this.gvMx1pid.Visible = true;
- this.gvMx1pid.VisibleIndex = 1;
+ this.gvMx1pid.VisibleIndex = 2;
this.gvMx1pid.Width = 94;
//
// gvMx1id
@@ -208,14 +233,14 @@
this.gvMx1id.Name = "gvMx1id";
this.gvMx1id.Tag = "query_a.id";
this.gvMx1id.Visible = true;
- this.gvMx1id.VisibleIndex = 0;
+ this.gvMx1id.VisibleIndex = 1;
this.gvMx1id.Width = 94;
//
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 377);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 282);
this.tabMxPage1.Text = "鏄庣粏1";
//
// gcMx1
@@ -224,7 +249,10 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 377);
+ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemSearchLookUpEdit1,
+ this.repositoryItemButtonEdit1});
+ this.gcMx1.Size = new System.Drawing.Size(1124, 282);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -232,13 +260,15 @@
// gvMx1
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn1,
this.gvMx1id,
this.gvMx1pid,
this.gvMx1salesDetailId,
this.gvMx1fMustQty,
this.gvMx1fRealQty,
this.gvMx1fEntrynote,
- this.gvMx1fseq});
+ this.gvMx1fseq,
+ this.gvMxDel});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -246,15 +276,47 @@
this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn1
+ //
+ this.gridColumn1.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn1.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn1.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn1.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn1.Caption = "璇烽�夋嫨";
+ this.gridColumn1.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Tag = "edit";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 0;
+ this.gridColumn1.Width = 94;
+ //
+ // repositoryItemSearchLookUpEdit1
+ //
+ this.repositoryItemSearchLookUpEdit1.AutoHeight = false;
+ 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;
+ this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged);
+ //
+ // repositoryItemSearchLookUpEdit1View
+ //
+ this.repositoryItemSearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+ this.repositoryItemSearchLookUpEdit1View.Name = "repositoryItemSearchLookUpEdit1View";
+ this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+ this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+ //
// lb_fApproverStaus
//
this.lb_fApproverStaus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fApproverStaus.Appearance.Options.UseFont = true;
this.lb_fApproverStaus.Location = new System.Drawing.Point(270, 116);
this.lb_fApproverStaus.Name = "lb_fApproverStaus";
- this.lb_fApproverStaus.Size = new System.Drawing.Size(122, 21);
+ this.lb_fApproverStaus.Size = new System.Drawing.Size(68, 21);
this.lb_fApproverStaus.TabIndex = 247;
- this.lb_fApproverStaus.Text = "FApproverStaus ";
+ this.lb_fApproverStaus.Text = "瀹℃牳鐘舵��";
//
// txt_fApproverStaus
//
@@ -354,15 +416,6 @@
this.lb_fCustomerID.Size = new System.Drawing.Size(39, 21);
this.lb_fCustomerID.TabIndex = 235;
this.lb_fCustomerID.Text = "瀹㈡埛 ";
- //
- // txt_fCustomerID
- //
- this.txt_fCustomerID.Location = new System.Drawing.Point(580, 84);
- 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(150, 28);
- this.txt_fCustomerID.TabIndex = 235;
//
// gv_fCustomerID
//
@@ -483,9 +536,9 @@
this.lb_fApproverID.Appearance.Options.UseFont = true;
this.lb_fApproverID.Location = new System.Drawing.Point(520, 52);
this.lb_fApproverID.Name = "lb_fApproverID";
- this.lb_fApproverID.Size = new System.Drawing.Size(99, 21);
+ this.lb_fApproverID.Size = new System.Drawing.Size(51, 21);
this.lb_fApproverID.TabIndex = 222;
- this.lb_fApproverID.Text = "FApproverID ";
+ this.lb_fApproverID.Text = "瀹℃牳浜�";
//
// txt_fApproverID
//
@@ -600,15 +653,6 @@
this.lb_fBillTypeID.Size = new System.Drawing.Size(73, 21);
this.lb_fBillTypeID.TabIndex = 213;
this.lb_fBillTypeID.Text = "鍗曟嵁绫诲瀷 ";
- //
- // txt_fBillTypeID
- //
- this.txt_fBillTypeID.Location = new System.Drawing.Point(580, 20);
- this.txt_fBillTypeID.Name = "txt_fBillTypeID";
- this.txt_fBillTypeID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fBillTypeID.Properties.Appearance.Options.UseFont = true;
- this.txt_fBillTypeID.Size = new System.Drawing.Size(150, 28);
- this.txt_fBillTypeID.TabIndex = 213;
//
// gv_fBillTypeID
//
@@ -787,10 +831,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 161);
+ this.tabMx.Location = new System.Drawing.Point(0, 256);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 409);
+ this.tabMx.Size = new System.Drawing.Size(1126, 314);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -798,8 +842,12 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_fCustomerID);
+ 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_fStockOrgId);
+ this.panel1.Controls.Add(this.txt_fBillTypeID);
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_fApproverStaus);
@@ -809,7 +857,6 @@
this.panel1.Controls.Add(this.lb_fDate);
this.panel1.Controls.Add(this.txt_fDate);
this.panel1.Controls.Add(this.lb_fCustomerID);
- this.panel1.Controls.Add(this.txt_fCustomerID);
this.panel1.Controls.Add(this.lb_fSalesManID);
this.panel1.Controls.Add(this.txt_fSalesManID);
this.panel1.Controls.Add(this.lb_fApproveDate);
@@ -823,7 +870,6 @@
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.txt_fBillTypeID);
this.panel1.Controls.Add(this.lb_billNo);
this.panel1.Controls.Add(this.txt_billNo);
this.panel1.Controls.Add(this.lb_id);
@@ -832,8 +878,66 @@
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, 161);
+ this.panel1.Size = new System.Drawing.Size(1126, 256);
this.panel1.TabIndex = 1;
+ //
+ // txt_fCustomerID
+ //
+ this.txt_fCustomerID.Location = new System.Drawing.Point(565, 86);
+ 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(150, 28);
+ this.txt_fCustomerID.TabIndex = 368;
+ //
+ // txt_salesId
+ //
+ this.txt_salesId.IsReadly = false;
+ this.txt_salesId.Location = new System.Drawing.Point(144, 190);
+ this.txt_salesId.Name = "txt_salesId";
+ this.txt_salesId.Size = new System.Drawing.Size(234, 29);
+ this.txt_salesId.TabIndex = 367;
+ //
+ // lb_salesId
+ //
+ this.lb_salesId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_salesId.Appearance.Options.UseFont = true;
+ this.lb_salesId.Location = new System.Drawing.Point(39, 190);
+ this.lb_salesId.Name = "lb_salesId";
+ this.lb_salesId.Size = new System.Drawing.Size(68, 21);
+ this.lb_salesId.TabIndex = 366;
+ this.lb_salesId.Text = "閿�鍞鍗�";
+ //
+ // txt_fSaleOrgId
+ //
+ this.txt_fSaleOrgId.Location = new System.Drawing.Point(849, 13);
+ 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(150, 28);
+ this.txt_fSaleOrgId.TabIndex = 365;
+ //
+ // txt_fStockOrgId
+ //
+ this.txt_fStockOrgId.Location = new System.Drawing.Point(90, 52);
+ this.txt_fStockOrgId.Name = "txt_fStockOrgId";
+ this.txt_fStockOrgId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fStockOrgId.Properties.Appearance.Options.UseFont = true;
+ this.txt_fStockOrgId.Size = new System.Drawing.Size(150, 28);
+ this.txt_fStockOrgId.TabIndex = 364;
+ //
+ // txt_fBillTypeID
+ //
+ this.txt_fBillTypeID.EditValue = "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)";
+ this.txt_fBillTypeID.Location = new System.Drawing.Point(584, 17);
+ 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[] {
+ "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"});
+ this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_fBillTypeID.Size = new System.Drawing.Size(146, 24);
+ this.txt_fBillTypeID.TabIndex = 362;
//
// labelControl11
//
@@ -863,21 +967,26 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // txt_fStockOrgId
+ // gvMxDel
//
- this.txt_fStockOrgId.IsReadly = false;
- this.txt_fStockOrgId.Location = new System.Drawing.Point(100, 52);
- this.txt_fStockOrgId.Name = "txt_fStockOrgId";
- this.txt_fStockOrgId.Size = new System.Drawing.Size(130, 30);
- this.txt_fStockOrgId.TabIndex = 248;
+ this.gvMxDel.Caption = "绉诲嚭";
+ this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.Name = "gvMxDel";
+ this.gvMxDel.Visible = true;
+ this.gvMxDel.VisibleIndex = 8;
+ this.gvMxDel.Width = 94;
//
- // txt_fSaleOrgId
+ // repositoryItemButtonEdit1
//
- this.txt_fSaleOrgId.IsReadly = false;
- this.txt_fSaleOrgId.Location = new System.Drawing.Point(850, 20);
- this.txt_fSaleOrgId.Name = "txt_fSaleOrgId";
- this.txt_fSaleOrgId.Size = new System.Drawing.Size(130, 30);
- this.txt_fSaleOrgId.TabIndex = 249;
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
// Frm_SalesDeliver
//
@@ -891,16 +1000,16 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSalesManID.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();
((System.ComponentModel.ISupportInitialize)(this.txt_fCreatorId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
@@ -913,7 +1022,12 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fStockOrgId.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.ResumeLayout(false);
}
@@ -954,7 +1068,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_fDate;
private DevExpress.XtraEditors.LabelControl lb_fCustomerID;
- private DevExpress.XtraEditors.TextEdit txt_fCustomerID;
private DevExpress.XtraGrid.Columns.GridColumn gv_fCustomerID;
private DevExpress.XtraEditors.LabelControl lb_fSalesManID;
@@ -984,7 +1097,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_fSaleOrgId;
private DevExpress.XtraEditors.LabelControl lb_fBillTypeID;
- private DevExpress.XtraEditors.TextEdit txt_fBillTypeID;
private DevExpress.XtraGrid.Columns.GridColumn gv_fBillTypeID;
private DevExpress.XtraEditors.LabelControl lb_billNo;
@@ -995,7 +1107,16 @@
private DevExpress.XtraEditors.TextEdit txt_id;
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
private System.Windows.Forms.PictureBox picCheckBox;
- private UserControl.UcLookOrg txt_fSaleOrgId;
- private UserControl.UcLookOrg txt_fStockOrgId;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_fBillTypeID;
+ private DevExpress.XtraEditors.TextEdit txt_fSaleOrgId;
+ private DevExpress.XtraEditors.TextEdit txt_fStockOrgId;
+ private DevExpress.XtraEditors.LabelControl lb_salesId;
+ private UserControl.UcLookSales txt_salesId;
+ private DevExpress.XtraEditors.TextEdit txt_fCustomerID;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
+ private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
}
}
\ 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 6576f6b..d29a5b2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -1,7 +1,4 @@
-using DevExpress.RichEdit.Export;
using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -10,7 +7,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -18,7 +14,7 @@
{
public partial class Frm_SalesDeliver : DevExpress.XtraEditors.XtraForm
{
- string _webServiceName = "MesInvItemMovesManager/";
+ string _webServiceName = "SalesDeliverManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_SalesDeliver()
{
@@ -48,12 +44,15 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //璁剧疆鍙戣揣缁勭粐
- this.txt_fStockOrgId.EditChanged += (s, e) =>
+ //璁剧疆閿�鍞崟
+ this.txt_salesId.EditChanged += (s, e) =>
{
- string _sqGuid = txt_fStockOrgId.GetId();
+ 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();
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
sbWhere.Append(" and a.FSubsidiary ='" + _sqGuid + "'");
var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
@@ -61,39 +60,17 @@
try
{
var strReturn = UtilityHelper.HttpPost("",
- "MesItemsManager/GetListSelect", json);
+ "SalesManager/SelectFormMx", json);
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
- //this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ this.repositoryItemSearchLookUpEdit1.DataSource = dt;
}
catch (Exception ex)
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
};
- //璁剧疆閿�鍞粍缁�
- this.txt_fSaleOrgId.EditChanged += (s, e) =>
- {
- string _sqGuid = txt_fStockOrgId.GetId();
- if (string.IsNullOrEmpty(_sqGuid))
- return;
- System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
- sbWhere.Append(" and a.FSubsidiary ='" + _sqGuid + "'");
- var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
- var json = JsonConvert.SerializeObject(_obj);
- try
- {
- var strReturn = UtilityHelper.HttpPost("",
- "MesItemsManager/GetListSelect", json);
- var rtn = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = rtn.rtnData.list;
- //this.repositoryItemSearchLookUpEdit1.DataSource = dt;
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- };
+
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -605,6 +582,7 @@
}
}
}
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index f81c72c..331435c 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -901,6 +901,12 @@
<Compile Include="UserControl\UcLookPrint.Designer.cs">
<DependentUpon>UcLookPrint.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\UcLookSales.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookSales.Designer.cs">
+ <DependentUpon>UcLookSales.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\UcLookStaff.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -1310,6 +1316,9 @@
<EmbeddedResource Include="UserControl\UcLookPrint.resx">
<DependentUpon>UcLookPrint.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookSales.resx">
+ <DependentUpon>UcLookSales.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookStaff.resx">
<DependentUpon>UcLookStaff.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSales.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookSales.Designer.cs
new file mode 100644
index 0000000..8cac65c
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSales.Designer.cs
@@ -0,0 +1,145 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class UcLookSales
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
+ this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
+ this.SuspendLayout();
+ //
+ // lookSearchSupplier
+ //
+ this.lookSearchSupplier.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lookSearchSupplier.EditValue = "璇烽�夋嫨";
+ this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
+ this.lookSearchSupplier.Name = "lookSearchSupplier";
+ this.lookSearchSupplier.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
+ this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
+ this.lookSearchSupplier.Size = new System.Drawing.Size(234, 28);
+ this.lookSearchSupplier.TabIndex = 12;
+ //
+ // searchLookUpEdit1View
+ //
+ this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn5,
+ this.gridColumn2,
+ this.gridColumn8,
+ this.gridColumn3,
+ this.gridColumn1,
+ this.gridColumn7});
+ this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+ this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+ this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+ this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "閿�鍞崟鍙�";
+ this.gridColumn5.FieldName = "billNo";
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 0;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鍗曟嵁绫诲瀷";
+ this.gridColumn2.FieldName = "billTypeId";
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 1;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鍗曟嵁鐘舵��";
+ this.gridColumn8.FieldName = "documentStatus";
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 2;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "閿�鍞粍缁�";
+ this.gridColumn3.FieldName = "saleOrgId";
+ this.gridColumn3.MinWidth = 100;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.Width = 100;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鏀惰揣鏂�";
+ this.gridColumn1.FieldName = "receiveId";
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 4;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "浜у搧瑙勬牸鍨嬪彿";
+ this.gridColumn7.FieldName = "itemModel";
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 5;
+ //
+ // UcLookSales
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.lookSearchSupplier);
+ this.Name = "UcLookSales";
+ this.Size = new System.Drawing.Size(234, 29);
+ ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraEditors.SearchLookUpEdit lookSearchSupplier;
+ private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSales.cs b/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
new file mode 100644
index 0000000..7ba6b7d
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
@@ -0,0 +1,160 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class UcLookSales : DevExpress.XtraEditors.XtraUserControl
+ {
+ public UcLookSales()
+ {
+ InitializeComponent();
+ lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
+ lookSearchSupplier.EditValueChanged +=
+ LookSearchSupplier_EditValueChanged;
+ getSuppler();
+ }
+
+ public bool IsReadly { get; set; }
+
+ /// <summary>
+ /// 鏀瑰彉浜嬩欢
+ /// </summary>
+ public event EventHandler EditChanged;
+
+ private void LookSearchSupplier_EditValueChanged(object sender,
+ EventArgs e)
+ {
+ if (EditChanged != null) EditChanged(this, e);
+ }
+
+ private void getSuppler()
+ {
+ var pgq = new PageQueryModel(1, 999999, "a.bill_no", "asc", "", " and 1=1");
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "SalesManager/SelectForm", json);
+ var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = rtn.rtnData.list;
+ lookSearchSupplier.Properties.DataSource = dt;
+ lookSearchSupplier.Properties.DisplayMember = "billNo";
+ lookSearchSupplier.Properties.ValueMember = "id";
+ lookSearchSupplier.ForceInitialize();
+ lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 閿�鍞崟id
+ /// </summary>
+ /// <returns></returns>
+ public string GetId()
+ {
+ var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+ if (row != null)
+ {
+ string id = row["id"].ToString();
+ return id;
+ }
+ return "";
+ }
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ /// <returns></returns>
+ public string GetCode()
+ {
+ var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+ if (row != null)
+ {
+ string id = row["billNo"].ToString();
+ return id;
+ }
+ return "";
+ }
+ /// <summary>
+ /// 鏂囨湰
+ /// </summary>
+ /// <returns></returns>
+ public string GetName()
+ {
+ var name = lookSearchSupplier.Text.Trim();
+ return name;
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="Code"></param>
+ public void SetIdOrCode(string Code)
+ {
+ if (Code == "-1")
+ {
+ lookSearchSupplier.EditValue = null;
+ return;
+ }
+ if (!string.IsNullOrEmpty(Code))
+ lookSearchSupplier.EditValue = (((Code.ToString().Trim())));
+ }
+
+ /// <summary>
+ /// 閿�鍞憳Name
+ /// </summary>
+ /// <returns></returns>
+ public string GetSalesUserName()
+ {
+ var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+ if (row != null)
+ {
+ string id = row["salerName"].ToString();
+ return id;
+ }
+ return "";
+ }
+ /// <summary>
+ /// 閿�鍞粍缁�
+ /// </summary>
+ /// <returns></returns>
+ public string GetSalesOrgName()
+ {
+ var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+ if (row != null)
+ {
+ string id = row["salesOrgName"].ToString();
+ return id;
+ }
+ return "";
+ }
+
+
+ /// <summary>
+ /// 瀹㈡埛
+ /// </summary>
+ /// <returns></returns>
+ public string GetSalesCusName()
+ {
+ var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+ if (row != null)
+ {
+ string id = row["SalesCusName"].ToString();
+ return id;
+ }
+ return "";
+ }
+
+ }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSales.resx b/DevApp/Gs.DevApp/UserControl/UcLookSales.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSales.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/bin/Debug/FastReport.Bars.dll b/DevApp/Gs.DevApp/bin/Debug/FastReport.Bars.dll
deleted file mode 100644
index 1ed0d59..0000000
--- a/DevApp/Gs.DevApp/bin/Debug/FastReport.Bars.dll
+++ /dev/null
Binary files differ
diff --git a/DevApp/Gs.DevApp/bin/Debug/FastReport.Editor.dll b/DevApp/Gs.DevApp/bin/Debug/FastReport.Editor.dll
deleted file mode 100644
index b64b4e2..0000000
--- a/DevApp/Gs.DevApp/bin/Debug/FastReport.Editor.dll
+++ /dev/null
Binary files differ
diff --git a/DevApp/Gs.DevApp/bin/Debug/FastReport.dll b/DevApp/Gs.DevApp/bin/Debug/FastReport.dll
deleted file mode 100644
index e5e41c0..0000000
--- a/DevApp/Gs.DevApp/bin/Debug/FastReport.dll
+++ /dev/null
Binary files differ
--
Gitblit v1.9.3