From ca3e38cbf7441c4177cd138b0498bc3d72a0130c Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 17 八月 2025 08:29:45 +0800
Subject: [PATCH] 销售
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 34 +-
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.cs | 27 +
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs | 176 ++++++++--------
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 266 ++++++++++++------------
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs | 16
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.Designer.cs | 133 ++---------
6 files changed, 300 insertions(+), 352 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
index 632ad0c..466394b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverDj.Designer.cs
@@ -96,6 +96,12 @@
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -125,12 +131,6 @@
this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -178,6 +178,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -187,12 +193,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -356,7 +356,7 @@
this.gv_outDate.OptionsColumn.AllowEdit = false;
this.gv_outDate.Tag = "query_a.out_date";
this.gv_outDate.Visible = true;
- this.gv_outDate.VisibleIndex = 4;
+ this.gv_outDate.VisibleIndex = 5;
this.gv_outDate.Width = 120;
//
// gv_outType
@@ -369,7 +369,7 @@
this.gv_outType.OptionsColumn.AllowEdit = false;
this.gv_outType.Tag = "query_a.out_type";
this.gv_outType.Visible = true;
- this.gv_outType.VisibleIndex = 5;
+ this.gv_outType.VisibleIndex = 14;
this.gv_outType.Width = 94;
//
// gv_checkUser
@@ -473,7 +473,7 @@
this.gv_reason.OptionsColumn.AllowEdit = false;
this.gv_reason.Tag = "query_a.reason";
this.gv_reason.Visible = true;
- this.gv_reason.VisibleIndex = 13;
+ this.gv_reason.VisibleIndex = 4;
this.gv_reason.Width = 94;
//
// gridColumn1
@@ -483,7 +483,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 14;
+ this.gridColumn1.VisibleIndex = 13;
this.gridColumn1.Width = 94;
//
// gridColumn6
@@ -895,6 +895,72 @@
this.layoutControlItem18.Text = "澶囨敞鍘熷洜";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_ckName;
+ this.layoutControlItem15.Location = new System.Drawing.Point(552, 90);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem15.Text = "鍑哄簱鍚嶇О";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_ckNo;
+ this.layoutControlItem14.Location = new System.Drawing.Point(552, 60);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem14.Text = "鍑哄簱缂栧彿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_abtNo;
+ this.layoutControlItem4.Location = new System.Drawing.Point(276, 90);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem4.Text = "鐢宠鍗曞彿";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_checkUser;
+ this.layoutControlItem8.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem8.Size = new System.Drawing.Size(278, 30);
+ this.layoutControlItem8.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_checkDate;
+ this.layoutControlItem12.Location = new System.Drawing.Point(828, 30);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem12.Size = new System.Drawing.Size(278, 30);
+ this.layoutControlItem12.Text = "瀹℃牳鏃ユ湡";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_status;
+ this.layoutControlItem16.Location = new System.Drawing.Point(828, 60);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem16.Size = new System.Drawing.Size(278, 30);
+ this.layoutControlItem16.Text = "瀹℃牳鐘舵��";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem16.TextVisible = false;
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1224,72 +1290,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_ckName;
- this.layoutControlItem15.Location = new System.Drawing.Point(552, 90);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 30);
- this.layoutControlItem15.Text = "鍑哄簱鍚嶇О";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_ckNo;
- this.layoutControlItem14.Location = new System.Drawing.Point(552, 60);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 30);
- this.layoutControlItem14.Text = "鍑哄簱缂栧彿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_abtNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(276, 90);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 30);
- this.layoutControlItem4.Text = "鐢宠鍗曞彿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_checkUser;
- this.layoutControlItem8.Location = new System.Drawing.Point(828, 0);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(278, 30);
- this.layoutControlItem8.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_checkDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(828, 30);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(278, 30);
- this.layoutControlItem12.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_status;
- this.layoutControlItem16.Location = new System.Drawing.Point(828, 60);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(278, 30);
- this.layoutControlItem16.Text = "瀹℃牳鐘舵��";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem16.TextVisible = false;
- //
// Frm_SalesDeliverDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1347,6 +1347,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1356,12 +1362,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 54521a8..a9ad6aa 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -327,7 +327,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1276, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1439, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -338,7 +338,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1276, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1439, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -348,7 +348,7 @@
//
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1274, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1437, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -369,7 +369,7 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1274, 570);
+ this.split1.Size = new System.Drawing.Size(1437, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
@@ -379,7 +379,7 @@
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1274, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1437, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -454,7 +454,7 @@
this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
- this.gridColumn27.VisibleIndex = 3;
+ this.gridColumn27.VisibleIndex = 2;
this.gridColumn27.Width = 94;
//
// gv_billType
@@ -467,7 +467,7 @@
this.gv_billType.OptionsColumn.AllowEdit = false;
this.gv_billType.Tag = "query_a.BILL_TYPE";
this.gv_billType.Visible = true;
- this.gv_billType.VisibleIndex = 2;
+ this.gv_billType.VisibleIndex = 17;
this.gv_billType.Width = 94;
//
// gv_billNo
@@ -480,7 +480,7 @@
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 4;
+ this.gv_billNo.VisibleIndex = 3;
this.gv_billNo.Width = 94;
//
// gv_salesOrg
@@ -493,7 +493,7 @@
this.gv_salesOrg.OptionsColumn.AllowEdit = false;
this.gv_salesOrg.Tag = "query_a.SALES_ORG";
this.gv_salesOrg.Visible = true;
- this.gv_salesOrg.VisibleIndex = 5;
+ this.gv_salesOrg.VisibleIndex = 16;
this.gv_salesOrg.Width = 94;
//
// gv_salesDept
@@ -518,8 +518,6 @@
this.gv_salesPerson.Name = "gv_salesPerson";
this.gv_salesPerson.OptionsColumn.AllowEdit = false;
this.gv_salesPerson.Tag = "query_a.SALES_PERSON";
- this.gv_salesPerson.Visible = true;
- this.gv_salesPerson.VisibleIndex = 8;
this.gv_salesPerson.Width = 94;
//
// gv_returnReason
@@ -532,7 +530,7 @@
this.gv_returnReason.OptionsColumn.AllowEdit = false;
this.gv_returnReason.Tag = "query_a.RETURN_REASON";
this.gv_returnReason.Visible = true;
- this.gv_returnReason.VisibleIndex = 9;
+ this.gv_returnReason.VisibleIndex = 7;
this.gv_returnReason.Width = 94;
//
// gv_createdBy
@@ -545,7 +543,7 @@
this.gv_createdBy.OptionsColumn.AllowEdit = false;
this.gv_createdBy.Tag = "query_a.CREATED_BY";
this.gv_createdBy.Visible = true;
- this.gv_createdBy.VisibleIndex = 10;
+ this.gv_createdBy.VisibleIndex = 8;
this.gv_createdBy.Width = 94;
//
// gv_createdDate
@@ -558,7 +556,7 @@
this.gv_createdDate.OptionsColumn.AllowEdit = false;
this.gv_createdDate.Tag = "query_a.CREATED_DATE";
this.gv_createdDate.Visible = true;
- this.gv_createdDate.VisibleIndex = 11;
+ this.gv_createdDate.VisibleIndex = 9;
this.gv_createdDate.Width = 94;
//
// gv_modifiedBy
@@ -571,7 +569,7 @@
this.gv_modifiedBy.OptionsColumn.AllowEdit = false;
this.gv_modifiedBy.Tag = "query_a.MODIFIED_BY";
this.gv_modifiedBy.Visible = true;
- this.gv_modifiedBy.VisibleIndex = 12;
+ this.gv_modifiedBy.VisibleIndex = 10;
this.gv_modifiedBy.Width = 94;
//
// gv_modifiedDate
@@ -584,7 +582,7 @@
this.gv_modifiedDate.OptionsColumn.AllowEdit = false;
this.gv_modifiedDate.Tag = "query_a.MODIFIED_DATE";
this.gv_modifiedDate.Visible = true;
- this.gv_modifiedDate.VisibleIndex = 13;
+ this.gv_modifiedDate.VisibleIndex = 11;
this.gv_modifiedDate.Width = 94;
//
// gv_approvedBy
@@ -597,7 +595,7 @@
this.gv_approvedBy.OptionsColumn.AllowEdit = false;
this.gv_approvedBy.Tag = "query_a.APPROVED_BY";
this.gv_approvedBy.Visible = true;
- this.gv_approvedBy.VisibleIndex = 14;
+ this.gv_approvedBy.VisibleIndex = 12;
this.gv_approvedBy.Width = 94;
//
// gv_approvedDate
@@ -610,7 +608,7 @@
this.gv_approvedDate.OptionsColumn.AllowEdit = false;
this.gv_approvedDate.Tag = "query_a.APPROVED_DATE";
this.gv_approvedDate.Visible = true;
- this.gv_approvedDate.VisibleIndex = 15;
+ this.gv_approvedDate.VisibleIndex = 13;
this.gv_approvedDate.Width = 94;
//
// gridColumn18
@@ -620,7 +618,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 16;
+ this.gridColumn18.VisibleIndex = 4;
this.gridColumn18.Width = 94;
//
// gv_customerOrderNo
@@ -633,7 +631,7 @@
this.gv_customerOrderNo.OptionsColumn.AllowEdit = false;
this.gv_customerOrderNo.Tag = "query_a.CUSTOMER_ORDER_NO";
this.gv_customerOrderNo.Visible = true;
- this.gv_customerOrderNo.VisibleIndex = 7;
+ this.gv_customerOrderNo.VisibleIndex = 5;
this.gv_customerOrderNo.Width = 94;
//
// gridColumn24
@@ -651,7 +649,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 17;
+ this.gridColumn25.VisibleIndex = 14;
this.gridColumn25.Width = 94;
//
// gridColumn26
@@ -661,7 +659,7 @@
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 18;
+ this.gridColumn26.VisibleIndex = 15;
this.gridColumn26.Width = 94;
//
// pageBar1
@@ -672,7 +670,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1274, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1437, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -680,7 +678,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1274, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1437, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -700,7 +698,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1274, 570);
+ this.splitMx1.Size = new System.Drawing.Size(1437, 570);
this.splitMx1.SplitterPosition = 149;
this.splitMx1.TabIndex = 0;
//
@@ -744,7 +742,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(637, 414, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1274, 149);
+ this.layoutMx1.Size = new System.Drawing.Size(1437, 149);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -761,25 +759,25 @@
// txt_returnCustomer
//
this.txt_returnCustomer.IsReadly = false;
- this.txt_returnCustomer.Location = new System.Drawing.Point(397, 44);
+ this.txt_returnCustomer.Location = new System.Drawing.Point(438, 44);
this.txt_returnCustomer.Name = "txt_returnCustomer";
- this.txt_returnCustomer.Size = new System.Drawing.Size(237, 24);
+ this.txt_returnCustomer.Size = new System.Drawing.Size(278, 24);
this.txt_returnCustomer.TabIndex = 539;
//
// txt_salesDept
//
this.txt_salesDept.IsReadly = false;
- this.txt_salesDept.Location = new System.Drawing.Point(1023, 108);
+ this.txt_salesDept.Location = new System.Drawing.Point(1146, 108);
this.txt_salesDept.Name = "txt_salesDept";
- this.txt_salesDept.Size = new System.Drawing.Size(239, 24);
+ this.txt_salesDept.Size = new System.Drawing.Size(279, 24);
this.txt_salesDept.TabIndex = 538;
//
// txt_inventoryOrg
//
this.txt_inventoryOrg.IsReadly = false;
- this.txt_inventoryOrg.Location = new System.Drawing.Point(710, 108);
+ this.txt_inventoryOrg.Location = new System.Drawing.Point(792, 108);
this.txt_inventoryOrg.Name = "txt_inventoryOrg";
- this.txt_inventoryOrg.Size = new System.Drawing.Size(237, 24);
+ this.txt_inventoryOrg.Size = new System.Drawing.Size(278, 24);
this.txt_inventoryOrg.TabIndex = 537;
//
// txt_salesOrg
@@ -787,20 +785,20 @@
this.txt_salesOrg.IsReadly = false;
this.txt_salesOrg.Location = new System.Drawing.Point(84, 44);
this.txt_salesOrg.Name = "txt_salesOrg";
- this.txt_salesOrg.Size = new System.Drawing.Size(237, 24);
+ this.txt_salesOrg.Size = new System.Drawing.Size(278, 24);
this.txt_salesOrg.TabIndex = 535;
//
// txt_fHasLinkRad
//
this.txt_fHasLinkRad.EditValue = "1";
- this.txt_fHasLinkRad.Location = new System.Drawing.Point(397, 106);
+ this.txt_fHasLinkRad.Location = new System.Drawing.Point(438, 106);
this.txt_fHasLinkRad.Margin = new System.Windows.Forms.Padding(0);
this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";
this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�")});
this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.txt_fHasLinkRad.Size = new System.Drawing.Size(237, 33);
+ this.txt_fHasLinkRad.Size = new System.Drawing.Size(278, 33);
this.txt_fHasLinkRad.StyleController = this.layoutMx1;
this.txt_fHasLinkRad.TabIndex = 534;
//
@@ -810,7 +808,7 @@
this.txt_fstockid.Location = new System.Drawing.Point(84, 76);
this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0);
this.txt_fstockid.Name = "txt_fstockid";
- this.txt_fstockid.Size = new System.Drawing.Size(237, 24);
+ this.txt_fstockid.Size = new System.Drawing.Size(278, 24);
this.txt_fstockid.TabIndex = 454;
//
// lbGuid
@@ -833,10 +831,10 @@
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(951, 76);
+ this.txt_chkStatus.Location = new System.Drawing.Point(1074, 76);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_chkStatus.Size = new System.Drawing.Size(311, 24);
+ this.txt_chkStatus.Size = new System.Drawing.Size(351, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 452;
this.txt_chkStatus.Tag = "readonly";
@@ -844,23 +842,23 @@
// txt_billType
//
this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
- this.txt_billType.Location = new System.Drawing.Point(397, 12);
+ this.txt_billType.Location = new System.Drawing.Point(438, 12);
this.txt_billType.Name = "txt_billType";
this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_billType.Properties.Items.AddRange(new object[] {
"鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)"});
this.txt_billType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_billType.Size = new System.Drawing.Size(237, 24);
+ this.txt_billType.Size = new System.Drawing.Size(278, 24);
this.txt_billType.StyleController = this.layoutMx1;
this.txt_billType.TabIndex = 451;
//
// txt_approvedDate
//
- this.txt_approvedDate.Location = new System.Drawing.Point(1023, 44);
+ this.txt_approvedDate.Location = new System.Drawing.Point(1146, 44);
this.txt_approvedDate.Name = "txt_approvedDate";
this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
- this.txt_approvedDate.Size = new System.Drawing.Size(239, 24);
+ this.txt_approvedDate.Size = new System.Drawing.Size(279, 24);
this.txt_approvedDate.StyleController = this.layoutMx1;
this.txt_approvedDate.TabIndex = 378;
this.txt_approvedDate.Tag = "readonly";
@@ -877,10 +875,10 @@
//
// txt_approvedBy
//
- this.txt_approvedBy.Location = new System.Drawing.Point(1023, 12);
+ this.txt_approvedBy.Location = new System.Drawing.Point(1146, 12);
this.txt_approvedBy.Name = "txt_approvedBy";
this.txt_approvedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_approvedBy.Size = new System.Drawing.Size(239, 24);
+ this.txt_approvedBy.Size = new System.Drawing.Size(279, 24);
this.txt_approvedBy.StyleController = this.layoutMx1;
this.txt_approvedBy.TabIndex = 370;
this.txt_approvedBy.Tag = "readonly";
@@ -900,7 +898,7 @@
this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(237, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(278, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readonly";
@@ -927,10 +925,10 @@
//
// txt_saleDeptName
//
- this.txt_saleDeptName.Location = new System.Drawing.Point(710, 76);
+ this.txt_saleDeptName.Location = new System.Drawing.Point(792, 76);
this.txt_saleDeptName.Name = "txt_saleDeptName";
this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true;
- this.txt_saleDeptName.Size = new System.Drawing.Size(237, 24);
+ this.txt_saleDeptName.Size = new System.Drawing.Size(278, 24);
this.txt_saleDeptName.StyleController = this.layoutMx1;
this.txt_saleDeptName.TabIndex = 222;
this.txt_saleDeptName.Tag = "readonly";
@@ -947,10 +945,10 @@
//
// txt_returnReason
//
- this.txt_returnReason.Location = new System.Drawing.Point(397, 76);
+ this.txt_returnReason.Location = new System.Drawing.Point(438, 76);
this.txt_returnReason.Name = "txt_returnReason";
this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
- this.txt_returnReason.Size = new System.Drawing.Size(237, 24);
+ this.txt_returnReason.Size = new System.Drawing.Size(278, 24);
this.txt_returnReason.StyleController = this.layoutMx1;
this.txt_returnReason.TabIndex = 235;
//
@@ -966,18 +964,18 @@
//
// textEdit1
//
- this.textEdit1.Location = new System.Drawing.Point(710, 12);
+ this.textEdit1.Location = new System.Drawing.Point(792, 12);
this.textEdit1.Name = "textEdit1";
- this.textEdit1.Size = new System.Drawing.Size(237, 24);
+ this.textEdit1.Size = new System.Drawing.Size(278, 24);
this.textEdit1.StyleController = this.layoutMx1;
this.textEdit1.TabIndex = 542;
this.textEdit1.Tag = "readonly";
//
// textEdit2
//
- this.textEdit2.Location = new System.Drawing.Point(710, 44);
+ this.textEdit2.Location = new System.Drawing.Point(792, 44);
this.textEdit2.Name = "textEdit2";
- this.textEdit2.Size = new System.Drawing.Size(237, 24);
+ this.textEdit2.Size = new System.Drawing.Size(278, 24);
this.textEdit2.StyleController = this.layoutMx1;
this.textEdit2.TabIndex = 543;
this.textEdit2.Tag = "readonly";
@@ -1118,7 +1116,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1274, 149);
+ this.Root.Size = new System.Drawing.Size(1437, 149);
this.Root.TextVisible = false;
//
// layoutControlItem4
@@ -1126,39 +1124,39 @@
this.layoutControlItem4.Control = this.txt_billNo;
this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.Size = new System.Drawing.Size(313, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem4.Text = "鐢宠鍗曞彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_approvedBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(939, 0);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1062, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(315, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(355, 32);
this.layoutControlItem15.Text = "瀹℃牳浜哄憳";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_approvedDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(939, 32);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1062, 32);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(315, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(355, 32);
this.layoutControlItem16.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_chkStatus;
- this.layoutControlItem17.Location = new System.Drawing.Point(939, 64);
+ this.layoutControlItem17.Location = new System.Drawing.Point(1062, 64);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(315, 32);
+ this.layoutControlItem17.Size = new System.Drawing.Size(355, 32);
this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
@@ -1169,7 +1167,7 @@
this.layoutControlItem20.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(313, 32);
+ this.layoutControlItem20.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1179,7 +1177,7 @@
this.layItem1.Location = new System.Drawing.Point(0, 32);
this.layItem1.Name = "layItem1";
this.layItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layItem1.Size = new System.Drawing.Size(313, 32);
+ this.layItem1.Size = new System.Drawing.Size(354, 32);
this.layItem1.Text = "閿�鍞粍缁�";
this.layItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1191,7 +1189,7 @@
this.layoutControlItem3.MinSize = new System.Drawing.Size(20, 31);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem3.Size = new System.Drawing.Size(313, 33);
+ this.layoutControlItem3.Size = new System.Drawing.Size(354, 33);
this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem3.Text = "閫夋嫨鏄庣粏";
this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
@@ -1202,12 +1200,12 @@
this.layoutControlItem21.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layoutControlItem21.AppearanceItemCaption.Options.UseBackColor = true;
this.layoutControlItem21.Control = this.txt_fHasLinkRad;
- this.layoutControlItem21.Location = new System.Drawing.Point(313, 96);
+ this.layoutControlItem21.Location = new System.Drawing.Point(354, 96);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
- this.layoutControlItem21.Size = new System.Drawing.Size(313, 33);
+ this.layoutControlItem21.Size = new System.Drawing.Size(354, 33);
this.layoutControlItem21.Text = "婧愬崟绫诲瀷";
this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1215,64 +1213,64 @@
//
this.layoutControlItem9.Control = this.txt_returnReason;
this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
- this.layoutControlItem9.Location = new System.Drawing.Point(313, 64);
+ this.layoutControlItem9.Location = new System.Drawing.Point(354, 64);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(313, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem9.Text = "鐢宠鍘熷洜";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_saleDeptName;
- this.layoutControlItem7.Location = new System.Drawing.Point(626, 64);
+ this.layoutControlItem7.Location = new System.Drawing.Point(708, 64);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(313, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem7.Text = "閿�鍞儴闂�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.textEdit1;
- this.layoutControlItem2.Location = new System.Drawing.Point(626, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(708, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(313, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem2.Text = "淇敼浜哄憳";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.textEdit2;
- this.layoutControlItem5.Location = new System.Drawing.Point(626, 32);
+ this.layoutControlItem5.Location = new System.Drawing.Point(708, 32);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(313, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem5.Text = "淇敼鏃堕棿";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_billType;
- this.layoutControlItem10.Location = new System.Drawing.Point(313, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(354, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(313, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(354, 32);
this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layItem2
//
this.layItem2.Control = this.txt_returnCustomer;
- this.layItem2.Location = new System.Drawing.Point(313, 32);
+ this.layItem2.Location = new System.Drawing.Point(354, 32);
this.layItem2.Name = "layItem2";
this.layItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layItem2.Size = new System.Drawing.Size(313, 32);
+ this.layItem2.Size = new System.Drawing.Size(354, 32);
this.layItem2.Text = "閫�璐у鎴�";
this.layItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1281,11 +1279,11 @@
this.layItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem3.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem3.Control = this.txt_inventoryOrg;
- this.layItem3.Location = new System.Drawing.Point(626, 96);
+ this.layItem3.Location = new System.Drawing.Point(708, 96);
this.layItem3.Name = "layItem3";
this.layItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layItem3.OptionsTableLayoutItem.RowIndex = 3;
- this.layItem3.Size = new System.Drawing.Size(313, 33);
+ this.layItem3.Size = new System.Drawing.Size(354, 33);
this.layItem3.Text = "搴撳瓨缁勭粐";
this.layItem3.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1294,11 +1292,11 @@
this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem4.Control = this.txt_salesDept;
- this.layItem4.Location = new System.Drawing.Point(939, 96);
+ this.layItem4.Location = new System.Drawing.Point(1062, 96);
this.layItem4.Name = "layItem4";
this.layItem4.OptionsTableLayoutItem.ColumnIndex = 3;
this.layItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layItem4.Size = new System.Drawing.Size(315, 33);
+ this.layItem4.Size = new System.Drawing.Size(355, 33);
this.layItem4.Text = "閿�鍞儴闂�";
this.layItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1308,7 +1306,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1274, 409);
+ this.tabMx.Size = new System.Drawing.Size(1437, 409);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1318,7 +1316,7 @@
//
this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1272, 377);
+ this.tabMxPage1.Size = new System.Drawing.Size(1435, 377);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// split99
@@ -1338,7 +1336,7 @@
this.split99.Panel2.Controls.Add(this.gcMx1);
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split99.Size = new System.Drawing.Size(1272, 377);
+ this.split99.Size = new System.Drawing.Size(1435, 377);
this.split99.SplitterPosition = 132;
this.split99.TabIndex = 4;
//
@@ -1362,7 +1360,7 @@
this.layout99.Name = "layout99";
this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(46, 297, 812, 500);
this.layout99.Root = this.layoutControlGroup1;
- this.layout99.Size = new System.Drawing.Size(1272, 132);
+ this.layout99.Size = new System.Drawing.Size(1435, 132);
this.layout99.TabIndex = 0;
this.layout99.Text = "layoutControl1";
//
@@ -1370,10 +1368,10 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 76);
+ this.layoutControl1.Location = new System.Drawing.Point(719, 86);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 28);
+ this.layoutControl1.Size = new System.Drawing.Size(350, 34);
this.layoutControl1.TabIndex = 477;
this.layoutControl1.Text = "layoutControl1";
//
@@ -1383,16 +1381,16 @@
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(69, 24);
this.txt_iCount_1.StyleController = this.layoutControl1;
this.txt_iCount_1.TabIndex = 228;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(279, 2);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(69, 24);
this.txt_yuliang_1.StyleController = this.layoutControl1;
this.txt_yuliang_1.TabIndex = 229;
//
@@ -1417,7 +1415,7 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition5});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(350, 34);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem33
@@ -1425,17 +1423,17 @@
this.layoutControlItem33.Control = this.txt_iCount_1;
this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem33.Size = new System.Drawing.Size(175, 34);
this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_yuliang_1;
- this.layoutControlItem34.Location = new System.Drawing.Point(168, 0);
+ this.layoutControlItem34.Location = new System.Drawing.Point(175, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem34.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem34.Size = new System.Drawing.Size(175, 34);
this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1443,7 +1441,7 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1072, 47);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
@@ -1452,7 +1450,7 @@
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1033, 10);
+ this.radOut.Location = new System.Drawing.Point(1074, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1480,68 +1478,68 @@
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(234, 24);
+ this.txtWlid.Size = new System.Drawing.Size(247, 24);
this.txtWlid.StyleController = this.layout99;
this.txtWlid.TabIndex = 214;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(821, 49);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(248, 24);
this.txt_psnQty_1.StyleController = this.layout99;
this.txt_psnQty_1.TabIndex = 226;
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 44);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 49);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(234, 24);
+ this.txtWlmc.Size = new System.Drawing.Size(247, 24);
this.txtWlmc.StyleController = this.layout99;
this.txtWlmc.TabIndex = 216;
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 76);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 86);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(574, 24);
+ this.txtWlgg.Size = new System.Drawing.Size(601, 24);
this.txtWlgg.StyleController = this.layout99;
this.txtWlgg.TabIndex = 218;
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(794, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(821, 12);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(248, 24);
this.txt_kQty.StyleController = this.layout99;
this.txt_kQty.TabIndex = 224;
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(454, 12);
+ this.txtQuantity.Location = new System.Drawing.Point(467, 12);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(234, 24);
+ this.txtQuantity.Size = new System.Drawing.Size(248, 24);
this.txtQuantity.StyleController = this.layout99;
this.txtQuantity.TabIndex = 220;
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 44);
+ this.txt_yQty.Location = new System.Drawing.Point(467, 49);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(248, 24);
this.txt_yQty.StyleController = this.layout99;
this.txt_yQty.TabIndex = 222;
//
@@ -1597,7 +1595,7 @@
rowDefinition6,
rowDefinition7,
rowDefinition8});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1435, 132);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem22
@@ -1605,83 +1603,83 @@
this.layoutControlItem22.Control = this.txtWlid;
this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(353, 37);
this.layoutControlItem22.Text = "鐗╂枡缂栫爜";
this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txtWlmc;
- this.layoutControlItem23.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem23.Location = new System.Drawing.Point(0, 37);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(353, 37);
this.layoutControlItem23.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txtWlgg;
- this.layoutControlItem24.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem24.Location = new System.Drawing.Point(0, 74);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(680, 32);
+ this.layoutControlItem24.Size = new System.Drawing.Size(707, 38);
this.layoutControlItem24.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txtQuantity;
- this.layoutControlItem25.Location = new System.Drawing.Point(340, 0);
+ this.layoutControlItem25.Location = new System.Drawing.Point(353, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem25.Size = new System.Drawing.Size(354, 37);
this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_yQty;
- this.layoutControlItem26.Location = new System.Drawing.Point(340, 32);
+ this.layoutControlItem26.Location = new System.Drawing.Point(353, 37);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem26.Size = new System.Drawing.Size(354, 37);
this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_kQty;
- this.layoutControlItem27.Location = new System.Drawing.Point(680, 0);
+ this.layoutControlItem27.Location = new System.Drawing.Point(707, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem27.Size = new System.Drawing.Size(354, 37);
this.layoutControlItem27.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_psnQty_1;
- this.layoutControlItem28.Location = new System.Drawing.Point(680, 32);
+ this.layoutControlItem28.Location = new System.Drawing.Point(707, 37);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem28.Size = new System.Drawing.Size(354, 37);
this.layoutControlItem28.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.radOut;
- this.layoutControlItem30.Location = new System.Drawing.Point(1020, 0);
+ this.layoutControlItem30.Location = new System.Drawing.Point(1061, 0);
this.layoutControlItem30.MaxSize = new System.Drawing.Size(230, 28);
this.layoutControlItem30.MinSize = new System.Drawing.Size(230, 28);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
- this.layoutControlItem30.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem30.Size = new System.Drawing.Size(354, 37);
this.layoutControlItem30.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem30.Text = "鑷姩璁＄畻";
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
@@ -1690,14 +1688,14 @@
// layoutControlItem31
//
this.layoutControlItem31.Control = this.ucBtnPrint1;
- this.layoutControlItem31.Location = new System.Drawing.Point(1020, 32);
+ this.layoutControlItem31.Location = new System.Drawing.Point(1061, 37);
this.layoutControlItem31.MaxSize = new System.Drawing.Size(338, 32);
this.layoutControlItem31.MinSize = new System.Drawing.Size(338, 32);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem31.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
- this.layoutControlItem31.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem31.Size = new System.Drawing.Size(354, 37);
this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
@@ -1706,11 +1704,11 @@
// layoutControlItem32
//
this.layoutControlItem32.Control = this.layoutControl1;
- this.layoutControlItem32.Location = new System.Drawing.Point(680, 64);
+ this.layoutControlItem32.Location = new System.Drawing.Point(707, 74);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem32.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem32.Size = new System.Drawing.Size(354, 38);
this.layoutControlItem32.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem32.TextVisible = false;
@@ -1725,7 +1723,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1,
this.repositoryItemDateEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1272, 233);
+ this.gcMx1.Size = new System.Drawing.Size(1435, 233);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1997,7 +1995,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1272, 377);
+ this.tabMxPage2.Size = new System.Drawing.Size(1435, 377);
this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�";
//
// gcMx2
@@ -2006,7 +2004,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1272, 377);
+ this.gcMx2.Size = new System.Drawing.Size(1435, 377);
this.gcMx2.TabIndex = 3;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2187,7 +2185,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1276, 682);
+ this.ClientSize = new System.Drawing.Size(1439, 682);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index 2ecf0bc..84cc074 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -174,25 +174,31 @@
{
try
{
- var lst = new List<string>();
- lst = ee.StringList;
- var _obj = lst;
- var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "SelectFormTo",
- JsonConvert.SerializeObject(_obj));
- var dt = UtilityHelper.ReturnToList(strReturn);
- DataTable _newTable = dt.rtnData;
- DataTable _oldTable = (DataTable)gcMx1.DataSource;
- DataRow[] sourceRows = _newTable.Select();
- for (int i = 0; i < sourceRows.Length; i++)
+ var lst = ee.DynamicList;
+ DataTable _Table = (DataTable)gcMx1.DataSource;
+ foreach (dynamic dym in lst)
{
- _oldTable.ImportRow(sourceRows[i]);
+ DataRow _row = _Table.NewRow();
+ _row["guid"] = dym.guid;
+ _row["deliveDetailGuid"] = dym.deliveDetailGuid;//閫佽揣鏄庣粏guid
+ _row["itemId"] = dym.itemId;
+ _row["itemNo"] = dym.itemNo; //鐗╂枡缂栧彿,
+ _row["itemName"] = dym.itemName; //鐗╂枡鍚嶇О,
+ _row["itemModel"] = dym.itemModel;//瑙勬牸鍨嬪彿,
+ _row["xxDw"] = dym.xxDw;
+ _row["salesQuantity"] = dym.salesQuantity;
+ _row["isFreeChk"] = dym.isFreeChk;
+ _row["fhQuantity"] = dym.fhQuantity;
+ gvMx1.UpdateCurrentRow();
+ _Table.Rows.Add(_row);
}
gcMx1.BindingContext = new BindingContext();
- gcMx1.DataSource = _oldTable;
+ gcMx1.DataSource = _Table;
gcMx1.ForceInitialize();
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
gvMx1.BestFitColumns();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs
index eec0966..2e35e26 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.cs
@@ -175,7 +175,7 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -186,7 +186,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -244,11 +244,11 @@
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -274,7 +274,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -291,9 +291,9 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -302,10 +302,12 @@
gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkUser", "checkUser", picCheckBox, this, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.Designer.cs
index 271309f..ef1422a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.Designer.cs
@@ -32,7 +32,6 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -42,14 +41,10 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
@@ -62,7 +57,7 @@
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1128, 639);
+ this.gcMain.Size = new System.Drawing.Size(942, 639);
this.gcMain.TabIndex = 8;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -76,7 +71,6 @@
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.colChkInt,
this.gv_guid,
- this.gridColumn3,
this.gridColumn4,
this.gv_billNo,
this.gv_supplierItemCode,
@@ -86,12 +80,8 @@
this.gridColumn7,
this.gridColumn9,
this.gv_purchaseUnit,
- this.gridColumn10,
- this.gridColumn2,
this.gridColumn1,
- this.gridColumn8,
- this.gridColumn11,
- this.gridColumn12});
+ this.gridColumn2});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -114,7 +104,7 @@
//
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
- this.gv_guid.FieldName = "rkmxGuid";
+ this.gv_guid.FieldName = "guid";
this.gv_guid.MinWidth = 50;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
@@ -122,22 +112,10 @@
this.gv_guid.Tag = "query_a.guid";
this.gv_guid.Width = 94;
//
- // gridColumn3
- //
- this.gridColumn3.Caption = "濮斿鏍囪瘑";
- this.gridColumn3.FieldName = "isWw";
- this.gridColumn3.MaxWidth = 50;
- this.gridColumn3.MinWidth = 50;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.OptionsColumn.ReadOnly = true;
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 11;
- this.gridColumn3.Width = 50;
- //
// gridColumn4
//
- this.gridColumn4.Caption = "鍏ュ簱鍗曞彿";
- this.gridColumn4.FieldName = "invBillNo";
+ this.gridColumn4.Caption = "鍙戣揣鍗曞彿";
+ this.gridColumn4.FieldName = "outNo";
this.gridColumn4.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
@@ -148,21 +126,21 @@
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
- this.gv_billNo.Caption = "閲囪喘鍗曞彿";
- this.gv_billNo.FieldName = "cgdh";
+ this.gv_billNo.Caption = "閿�鍞崟鍙�";
+ this.gv_billNo.FieldName = "xsHno";
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.OptionsColumn.ReadOnly = true;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 10;
+ this.gv_billNo.VisibleIndex = 7;
this.gv_billNo.Width = 110;
//
// gv_supplierItemCode
//
this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
- this.gv_supplierItemCode.FieldName = "wlbm";
+ this.gv_supplierItemCode.FieldName = "itemNo";
this.gv_supplierItemCode.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.gv_supplierItemCode.Name = "gv_supplierItemCode";
this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
@@ -176,7 +154,7 @@
//
this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
- this.gv_supplierItemName.FieldName = "wlmc";
+ this.gv_supplierItemName.FieldName = "itemName";
this.gv_supplierItemName.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.gv_supplierItemName.Name = "gv_supplierItemName";
this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
@@ -189,15 +167,15 @@
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn5.FieldName = "wlgg";
+ this.gridColumn5.FieldName = "itemModel";
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Width = 250;
//
// gridColumn6
//
- this.gridColumn6.Caption = "鍏ュ簱鏁伴噺";
- this.gridColumn6.FieldName = "rksl";
+ this.gridColumn6.Caption = "閿�鍞崟鏁伴噺";
+ this.gridColumn6.FieldName = "xxQty";
this.gridColumn6.MaxWidth = 50;
this.gridColumn6.MinWidth = 50;
this.gridColumn6.Name = "gridColumn6";
@@ -220,8 +198,8 @@
//
// gridColumn9
//
- this.gridColumn9.Caption = "宸查��鏁伴噺";
- this.gridColumn9.FieldName = "ytsl";
+ this.gridColumn9.Caption = "绱鍑哄簱鏁伴噺";
+ this.gridColumn9.FieldName = "ljckQty";
this.gridColumn9.MaxWidth = 50;
this.gridColumn9.MinWidth = 50;
this.gridColumn9.Name = "gridColumn9";
@@ -233,8 +211,8 @@
// gv_purchaseUnit
//
this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
- this.gv_purchaseUnit.Caption = "鍙��鏁伴噺";
- this.gv_purchaseUnit.FieldName = "kt";
+ this.gv_purchaseUnit.Caption = "绱閫�璐ф暟閲�";
+ this.gv_purchaseUnit.FieldName = "ljthQty";
this.gv_purchaseUnit.MaxWidth = 50;
this.gv_purchaseUnit.MinWidth = 50;
this.gv_purchaseUnit.Name = "gv_purchaseUnit";
@@ -242,24 +220,6 @@
this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gv_purchaseUnit.Width = 50;
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "渚涘簲鍟�";
- this.gridColumn10.FieldName = "gysName";
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 9;
- this.gridColumn10.Width = 125;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "鏀舵枡缁勭粐";
- this.gridColumn2.FieldName = "receivingOrg";
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 12;
- this.gridColumn2.Width = 250;
//
// gridColumn1
//
@@ -269,47 +229,13 @@
this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Width = 94;
//
- // gridColumn8
- //
- this.gridColumn8.Caption = "鍗曟嵁绫诲瀷";
- this.gridColumn8.FieldName = "inType";
- this.gridColumn8.MinWidth = 25;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 13;
- this.gridColumn8.Width = 94;
- //
- // gridColumn11
- //
- this.gridColumn11.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gridColumn11.AppearanceCell.Options.UseForeColor = true;
- this.gridColumn11.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gridColumn11.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn11.Caption = "鍙��鏁伴噺";
- this.gridColumn11.FieldName = "ktsl";
- this.gridColumn11.MinWidth = 25;
- this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 7;
- this.gridColumn11.Width = 94;
- //
- // gridColumn12
- //
- this.gridColumn12.Caption = "褰撳墠搴撳瓨";
- this.gridColumn12.FieldName = "kcQty";
- this.gridColumn12.MinWidth = 25;
- this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 8;
- this.gridColumn12.Width = 94;
- //
// panelControl1
//
this.panelControl1.Controls.Add(this.btnIn);
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panelControl1.Location = new System.Drawing.Point(0, 639);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(1128, 43);
+ this.panelControl1.Size = new System.Drawing.Size(942, 43);
this.panelControl1.TabIndex = 9;
//
// btnIn
@@ -318,17 +244,27 @@
this.btnIn.Appearance.Options.UseBackColor = true;
this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
- this.btnIn.Location = new System.Drawing.Point(1032, 2);
+ this.btnIn.Location = new System.Drawing.Point(846, 2);
this.btnIn.Name = "btnIn";
this.btnIn.Size = new System.Drawing.Size(94, 39);
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾瀵煎叆";
//
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "瀹㈡埛鍚嶇О";
+ this.gridColumn2.FieldName = "cusName";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 8;
+ this.gridColumn2.Width = 94;
+ //
// Frm_SalesReturnNoticeSelect
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(942, 682);
this.Controls.Add(this.gcMain);
this.Controls.Add(this.panelControl1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
@@ -349,7 +285,6 @@
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
@@ -359,14 +294,10 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.SimpleButton btnIn;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.cs
index 5d8b687..b0eedd4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelect.cs
@@ -20,9 +20,8 @@
/// <summary>
///
/// </summary>
- /// <param name="_suppId">渚涘簲鍟嗙紪鍙� </param>
- /// <param name="_receiveOrgId">缁勭粐缂栧彿</param>
- /// <param name="_isWw">2涓哄澶栵紝1涓洪噰璐�</param>
+ /// <param name="_cusId"></param>
+ /// <param name="_receiveOrgId"></param>
public Frm_SalesReturnNoticeSelect(string _cusId, string _receiveOrgId)
{
InitializeComponent();
@@ -40,7 +39,7 @@
{
gridView1.PostEditor();
gridView1.UpdateCurrentRow();
- var list = new List<string>();
+ var list = new List<dynamic>();
DataTable dt = this.gcMain.DataSource as DataTable;
{
foreach (DataRow dr in dt.Rows)
@@ -49,11 +48,23 @@
string _guid = dr["guid"].ToString();
if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
{
- list.Add(_guid);
+ list.Add(new
+ {
+ guid = "",
+ deliveDetailGuid = dr["guid"].ToString(),
+ itemId = dr["itemId"].ToString(), //鐗╂枡id,
+ itemNo = dr["itemNo"].ToString(), //鐗╂枡缂栧彿,
+ itemName = dr["itemName"].ToString(), //鐗╂枡鍚嶇О,
+ itemModel = dr["itemModel"].ToString(),//瑙勬牸鍨嬪彿,
+ xxDw = dr["dwName"].ToString(),
+ salesQuantity = dr["xxQty"].ToString(),//閿�鍞崟鏁伴噺
+ isFreeChk = "0",
+ fhQuantity = dr["ljckQty"].ToString(),//鍙戣揣鏁伴噺
+ });
}
}
}
- UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list }); Close();
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list }); Close();
};
}
@@ -84,8 +95,8 @@
everyPageSize = 999999,
sortName = "",
keyWhere = "",
- inCusId = this.cusId,
- inReceiveOrgId = this.receiveOrgId,
+ inP1 = this.cusId,
+ inP2 = this.receiveOrgId,
};
var json = JsonConvert.SerializeObject(_obj);
try
--
Gitblit v1.9.3