From 03224d6ec67bf55501205a276c4960d0e84f8b0d Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 24 九月 2025 16:45:55 +0800
Subject: [PATCH] 销售出库明细表增加仓库
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 54 +++++++++-
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 226 ++++++++++++++++++++++++++++++--------------
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs | 5
4 files changed, 207 insertions(+), 82 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 8cf35bf..432ab84 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -37,8 +37,8 @@
<appSettings>
<!--<add key="webapiurl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index cc873ab..ad05837 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -30,20 +30,25 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
- 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.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition23 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition24 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition25 = new DevExpress.XtraLayout.RowDefinition();
+ 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 editorButtonImageOptions10 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject37 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject38 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject39 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject40 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -94,6 +99,7 @@
this.txt_qt031 = new DevExpress.XtraEditors.TextEdit();
this.txt_qt030 = new DevExpress.XtraEditors.TextEdit();
this.txt_qt029 = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_SaleOrgId = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -116,6 +122,7 @@
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -150,9 +157,12 @@
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptCk = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -190,6 +200,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_SaleOrgId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
@@ -212,6 +223,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -220,6 +232,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptCk)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
@@ -600,6 +613,7 @@
this.layoutMx1.Controls.Add(this.txt_qt031);
this.layoutMx1.Controls.Add(this.txt_qt030);
this.layoutMx1.Controls.Add(this.txt_qt029);
+ this.layoutMx1.Controls.Add(this.txt_SaleOrgId);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
@@ -821,6 +835,15 @@
this.txt_qt029.TabIndex = 380;
this.txt_qt029.Tag = "readonly";
//
+ // txt_SaleOrgId
+ //
+ this.txt_SaleOrgId.Location = new System.Drawing.Point(443, 136);
+ this.txt_SaleOrgId.Name = "txt_SaleOrgId";
+ this.txt_SaleOrgId.Size = new System.Drawing.Size(224, 24);
+ this.txt_SaleOrgId.StyleController = this.layoutMx1;
+ this.txt_SaleOrgId.TabIndex = 445;
+ this.txt_SaleOrgId.Tag = "readonly";
+ //
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_id;
@@ -882,38 +905,39 @@
this.layoutControlItem9,
this.layoutControlItem3,
this.layoutControlItem2,
- this.layoutControlItem21});
+ this.layoutControlItem21,
+ this.layoutControlItem22});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.Width = 100D;
- columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition11.Width = 100D;
- columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition12.Width = 100D;
+ columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition17.Width = 100D;
+ columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition18.Width = 100D;
+ columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition19.Width = 100D;
+ columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition20.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition9,
- columnDefinition10,
- columnDefinition11,
- columnDefinition12});
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition15.Height = 100D;
- rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition17,
+ columnDefinition18,
+ columnDefinition19,
+ columnDefinition20});
+ rowDefinition21.Height = 100D;
+ rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition22.Height = 100D;
+ rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition23.Height = 100D;
+ rowDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition24.Height = 100D;
+ rowDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition25.Height = 100D;
+ rowDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition11,
- rowDefinition12,
- rowDefinition13,
- rowDefinition14,
- rowDefinition15});
+ rowDefinition21,
+ rowDefinition22,
+ rowDefinition23,
+ rowDefinition24,
+ rowDefinition25});
this.layoutControlGroup1.Size = new System.Drawing.Size(1339, 175);
this.layoutControlGroup1.TextVisible = false;
//
@@ -1138,6 +1162,17 @@
this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem21.TextVisible = false;
//
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.Control = this.txt_SaleOrgId;
+ this.layoutControlItem22.Location = new System.Drawing.Point(329, 124);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem22.Size = new System.Drawing.Size(330, 31);
+ this.layoutControlItem22.Text = "閿�鍞粍缁嘔D";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1164,7 +1199,8 @@
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
- this.repositoryItemDateEdit1});
+ this.repositoryItemDateEdit1,
+ this.rptCk});
this.gcMx1.Size = new System.Drawing.Size(1358, 352);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1201,7 +1237,9 @@
this.gvMx1fseq,
this.gvMxDel,
this.gridColumn37,
- this.gridColumn1});
+ this.gridColumn1,
+ this.gridColumn3,
+ this.gridColumn4});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1237,7 +1275,7 @@
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Tag = "edit";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 3;
+ this.gridColumn11.VisibleIndex = 5;
this.gridColumn11.Width = 94;
//
// repositoryItemDateEdit1
@@ -1262,7 +1300,7 @@
this.gvMx1fEntrynote.Name = "gvMx1fEntrynote";
this.gvMx1fEntrynote.Tag = "edit";
this.gvMx1fEntrynote.Visible = true;
- this.gvMx1fEntrynote.VisibleIndex = 4;
+ this.gvMx1fEntrynote.VisibleIndex = 6;
this.gvMx1fEntrynote.Width = 94;
//
// gvMx1fRealQty
@@ -1274,7 +1312,7 @@
this.gvMx1fRealQty.Name = "gvMx1fRealQty";
this.gvMx1fRealQty.Tag = "query_a.FRealQty";
this.gvMx1fRealQty.Visible = true;
- this.gvMx1fRealQty.VisibleIndex = 6;
+ this.gvMx1fRealQty.VisibleIndex = 7;
this.gvMx1fRealQty.Width = 94;
//
// gridColumn12
@@ -1284,7 +1322,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 7;
+ this.gridColumn12.VisibleIndex = 8;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -1314,7 +1352,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 16;
+ this.gridColumn15.VisibleIndex = 17;
this.gridColumn15.Width = 94;
//
// gridColumn16
@@ -1324,7 +1362,7 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 8;
+ this.gridColumn16.VisibleIndex = 9;
this.gridColumn16.Width = 94;
//
// gridColumn17
@@ -1334,7 +1372,7 @@
this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 9;
+ this.gridColumn17.VisibleIndex = 10;
this.gridColumn17.Width = 94;
//
// gridColumn18
@@ -1352,7 +1390,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 10;
+ this.gridColumn19.VisibleIndex = 11;
this.gridColumn19.Width = 94;
//
// gridColumn20
@@ -1362,7 +1400,7 @@
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 13;
+ this.gridColumn20.VisibleIndex = 14;
this.gridColumn20.Width = 94;
//
// gridColumn21
@@ -1372,7 +1410,7 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 14;
+ this.gridColumn21.VisibleIndex = 15;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -1398,7 +1436,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 15;
+ this.gridColumn24.VisibleIndex = 16;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -1408,7 +1446,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 11;
+ this.gridColumn25.VisibleIndex = 12;
this.gridColumn25.Width = 94;
//
// gridColumn26
@@ -1418,7 +1456,7 @@
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 12;
+ this.gridColumn26.VisibleIndex = 13;
this.gridColumn26.Width = 94;
//
// gridColumn27
@@ -1492,16 +1530,16 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 17;
+ this.gvMxDel.VisibleIndex = 18;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions9.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions9.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, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", 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);
@@ -1514,17 +1552,6 @@
this.gridColumn37.Name = "gridColumn37";
this.gridColumn37.Width = 94;
//
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(970, 55);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 9;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
- //
// gridColumn1
//
this.gridColumn1.AppearanceCell.ForeColor = System.Drawing.Color.Red;
@@ -1536,8 +1563,51 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 5;
+ this.gridColumn1.VisibleIndex = 4;
this.gridColumn1.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.AppearanceCell.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Critical;
+ this.gridColumn3.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn3.AppearanceHeader.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Critical;
+ this.gridColumn3.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn3.Caption = "閫夋嫨浠撳簱";
+ this.gridColumn3.ColumnEdit = this.rptCk;
+ this.gridColumn3.FieldName = "depotName";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.Width = 94;
+ //
+ // rptCk
+ //
+ this.rptCk.AutoHeight = false;
+ editorButtonImageOptions10.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
+ this.rptCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.rptCk.Name = "rptCk";
+ this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "浠撳簱ID";
+ this.gridColumn4.FieldName = "depotId";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Width = 94;
+ //
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(970, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 9;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
//
// Frm_SalesDeliver
//
@@ -1586,6 +1656,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt031.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt030.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_SaleOrgId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
@@ -1608,6 +1679,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1616,6 +1688,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptCk)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
@@ -1730,5 +1803,10 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptCk;
+ private DevExpress.XtraEditors.TextEdit txt_SaleOrgId;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
}
}
\ 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 a58d8bc..afe83fa 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -10,7 +10,6 @@
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
-
namespace Gs.DevApp.DevFrm
{
public partial class Frm_SalesDeliver : DevExpress.XtraEditors.XtraForm
@@ -61,8 +60,8 @@
txt_fSaleOrgIdTxt.Text = txt_salesId.GetSalesOrgName();
txt_shf.Text = txt_salesId.GetSalesShf();
txt_shName.Text = txt_salesId.GetSalesShfName();
+ txt_SaleOrgId.Text = txt_salesId.GetSalesOrgFid();
};
-
//閫夋嫨闇�瑕佺殑鏄庣粏
btnSelect.Click += (s, e) =>
{
@@ -88,11 +87,12 @@
_row["itemNo"] = dym.itemNo;
_row["itemName"] = dym.itemName;
_row["itemModel"] = dym.itemModel;
+ _row["itemId"] = dym.itemId;
_row["dwXs"] = dym.dwXs;
_row["dwJj"] = dym.dwJj;
_row["jjSl"] = dym.jjSl;
_row["deliveryDate"] = dym.deliveryDate;
- _row["xsSl"] = dym.xsSl;
+ _row["xsSl"] = dym.xsSl;
_row["isFree"] = dym.isFree;
_row["hzlx"] = dym.hzlx;
_row["hz"] = dym.hz;
@@ -102,7 +102,9 @@
_row["jsOrg"] = dym.jsOrg;
_row["gyOrg"] = dym.gyOrg;
_row["kcOrg"] = dym.kcOrg;
- _row["kcQty"] = dym.kcQty;
+ _row["kcQty"] = dym.kcQty; //搴撳瓨鏁伴噺
+ _row["depotId"] = dym.depotId; //搴撳瓨鏁伴噺
+ _row["depotName"] = dym.depotName; //搴撳瓨鏁伴噺
_Table.Rows.Add(_row);
}
gcMx1.BindingContext = new BindingContext();
@@ -366,6 +368,13 @@
MsgHelper.ShowError("閿�鍞崟鐗╂枡鏄庣粏涓嶈兘涓虹┖锛�");
return;
}
+
+ if (string.IsNullOrEmpty(row["depotId"].ToString()))
+ {
+ MsgHelper.ShowError("璇烽�夋嫨鍙戣揣浠撳簱锛�");
+ return;
+ }
+
_obj.list.Add(new
{
Guid = _guid,
@@ -625,7 +634,12 @@
}
}
-
+
+ /// <summary>
+ /// 鍒犻櫎鏁版嵁
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx1.FocusedRowHandle;
@@ -666,5 +680,35 @@
}
}
}
+ /// <summary>
+ /// 鏌ユ壘浠撳簱
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptCk_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var strItemId = dr["itemId"].ToString();
+ var strOrgGuid = txt_SaleOrgId.Text.Trim();
+ if (string.IsNullOrEmpty(strOrgGuid))
+ {
+ MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨閿�鍞粍缁囷紒");
+ return;
+ }
+ SelectCk frm = new SelectCk(strOrgGuid, strItemId);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ gvMx1.SetFocusedRowCellValue("depotName", lst[0].name);
+ gvMx1.SetFocusedRowCellValue("depotId", lst[0].guid);
+ gvMx1.SetFocusedRowCellValue("kcQty", lst[0].kcQty);
+ gvMx1.BestFitColumns();
+ };
+ frm.ShowDialog();
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs
index 069133d..020dccb 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs
@@ -61,6 +61,7 @@
itemNo = dr["itemNo"].ToString(),
itemName = dr["itemName"].ToString(),
itemModel = dr["itemModel"].ToString(),
+ itemId = dr["itemId"].ToString(),
dwXs = dr["xxdw"].ToString(),
dwJj = dr["jjdw"].ToString(),
jjSl = dr["priceUnitQty"].ToString(),
@@ -76,7 +77,9 @@
gyOrg = dr["gyOrg"].ToString(),
kcOrg = dr["kcOrg"].ToString(),
kcQty = dr["kcQty"].ToString(),
- });
+ depotId = dr["depotId"].ToString(),
+ depotName = dr["depotName"].ToString(),
+ });
}
}
}
--
Gitblit v1.9.3