From b5834262308402ea928355987b34d1a9a0011374 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 08 九月 2025 23:43:13 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 56 +----
DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs | 6
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs | 32 +-
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs | 9
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs | 244 +++++++++++++++---------
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 239 +++--------------------
6 files changed, 224 insertions(+), 362 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
index 0415239..c3d6eab 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -143,10 +143,10 @@
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptCk = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -1331,7 +1331,11 @@
//
// gridColumn8
//
- this.gridColumn8.Caption = "褰撳墠鎬诲簱瀛�";
+ this.gridColumn8.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn8.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn8.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn8.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn8.Caption = "Mes/Erp搴撳瓨";
this.gridColumn8.FieldName = "kcQty";
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
@@ -1371,17 +1375,6 @@
this.rptCk.Name = "rptCk";
this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);
//
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(965, 64);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 8;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
- //
// gridColumn12
//
this.gridColumn12.Caption = "SRM鏍囪瘑";
@@ -1402,6 +1395,17 @@
this.gridColumn13.VisibleIndex = 15;
this.gridColumn13.Width = 94;
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(965, 64);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 8;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
// Frm_MesCgthSq
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 3cd0fb4..1cdb71f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -115,24 +115,11 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
- this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fMustQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
@@ -165,7 +152,6 @@
this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -224,18 +210,16 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -1139,6 +1123,20 @@
this.layoutControlItem2.Text = "鐢宠缂栧彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.btnSelect;
+ this.layoutControlItem21.CustomizationFormText = "閫夋嫨鐗╂枡";
+ this.layoutControlItem21.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem21.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem21.MinSize = new System.Drawing.Size(95, 31);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem21.Size = new System.Drawing.Size(329, 31);
+ this.layoutControlItem21.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem21.TextVisible = false;
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1164,7 +1162,6 @@
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemSearchLookUpEdit1,
this.repositoryItemButtonEdit1,
this.repositoryItemDateEdit1});
this.gcMx1.Size = new System.Drawing.Size(1358, 352);
@@ -1175,7 +1172,6 @@
// gvMx1
//
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn1,
this.gvMx1fMustQty,
this.gridColumn11,
this.gvMx1fEntrynote,
@@ -1206,150 +1202,9 @@
this.gridColumn37});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
- this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
- //
- // gridColumn1
- //
- this.gridColumn1.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gridColumn1.AppearanceCell.Options.UseForeColor = true;
- this.gridColumn1.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gridColumn1.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn1.Caption = "璇烽�夋嫨";
- this.gridColumn1.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Tag = "edit";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 94;
- //
- // repositoryItemSearchLookUpEdit1
- //
- this.repositoryItemSearchLookUpEdit1.AutoHeight = false;
- this.repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFit;
- this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
- this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨";
- this.repositoryItemSearchLookUpEdit1.PopupFormMinSize = new System.Drawing.Size(900, 0);
- this.repositoryItemSearchLookUpEdit1.PopupFormSize = new System.Drawing.Size(900, 0);
- this.repositoryItemSearchLookUpEdit1.PopupView = this.gridView2;
- this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged);
- //
- // gridView2
- //
- this.gridView2.Appearance.HeaderPanel.Options.UseTextOptions = true;
- this.gridView2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView2.ColumnPanelRowHeight = 50;
- this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn10,
- this.gridColumn3,
- this.gridColumn4,
- this.gridColumn5,
- this.gridColumn7,
- this.gridColumn8,
- this.gridColumn9,
- this.gridColumn6,
- this.gridColumn30,
- this.gridColumn31,
- this.gridColumn32});
- this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
- this.gridView2.Name = "gridView2";
- this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
- this.gridView2.OptionsView.ShowGroupPanel = false;
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "閿�鍞崟鍙�";
- this.gridColumn10.FieldName = "billNo";
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 0;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "鐗╂枡缂栫爜";
- this.gridColumn3.FieldName = "itemNo";
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 1;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "閿�鍞崟浣�";
- this.gridColumn4.FieldName = "xxdw";
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 2;
- this.gridColumn4.Width = 50;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "閿�鍞暟閲�";
- this.gridColumn5.FieldName = "qty";
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 3;
- this.gridColumn5.Width = 50;
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "渚涘簲缁勭粐";
- this.gridColumn7.FieldName = "gyOrg";
- this.gridColumn7.Name = "gridColumn7";
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "搴撳瓨缁勭粐";
- this.gridColumn8.FieldName = "kcOrg";
- this.gridColumn8.Name = "gridColumn8";
- //
- // gridColumn9
- //
- this.gridColumn9.AppearanceCell.ForeColor = System.Drawing.Color.Red;
- this.gridColumn9.AppearanceCell.Options.UseForeColor = true;
- this.gridColumn9.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
- this.gridColumn9.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn9.Caption = "鏈彂璐ф暟閲�";
- this.gridColumn9.FieldName = "syQty";
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 4;
- this.gridColumn9.Width = 50;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "閿�鍞粍缁�";
- this.gridColumn6.FieldName = "salesOrgName";
- this.gridColumn6.Name = "gridColumn6";
- //
- // gridColumn30
- //
- this.gridColumn30.Caption = "鐗╂枡鍚嶇О";
- this.gridColumn30.FieldName = "itemName";
- this.gridColumn30.Name = "gridColumn30";
- this.gridColumn30.Visible = true;
- this.gridColumn30.VisibleIndex = 5;
- //
- // gridColumn31
- //
- this.gridColumn31.Caption = "瑙勬牸鍨嬪彿";
- this.gridColumn31.FieldName = "itemModel";
- this.gridColumn31.Name = "gridColumn31";
- this.gridColumn31.Visible = true;
- this.gridColumn31.VisibleIndex = 6;
- //
- // gridColumn32
- //
- this.gridColumn32.Caption = "璁′环鍗曚綅";
- this.gridColumn32.FieldName = "jjdw";
- this.gridColumn32.Name = "gridColumn32";
- this.gridColumn32.Visible = true;
- this.gridColumn32.VisibleIndex = 7;
- this.gridColumn32.Width = 50;
//
// gvMx1fMustQty
//
@@ -1364,7 +1219,7 @@
this.gvMx1fMustQty.Name = "gvMx1fMustQty";
this.gvMx1fMustQty.Tag = "yz_quantity_0_edit";
this.gvMx1fMustQty.Visible = true;
- this.gvMx1fMustQty.VisibleIndex = 3;
+ this.gvMx1fMustQty.VisibleIndex = 2;
this.gvMx1fMustQty.Width = 94;
//
// gridColumn11
@@ -1380,7 +1235,7 @@
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Tag = "edit";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 4;
+ this.gridColumn11.VisibleIndex = 3;
this.gridColumn11.Width = 94;
//
// repositoryItemDateEdit1
@@ -1405,7 +1260,7 @@
this.gvMx1fEntrynote.Name = "gvMx1fEntrynote";
this.gvMx1fEntrynote.Tag = "edit";
this.gvMx1fEntrynote.Visible = true;
- this.gvMx1fEntrynote.VisibleIndex = 5;
+ this.gvMx1fEntrynote.VisibleIndex = 4;
this.gvMx1fEntrynote.Width = 94;
//
// gvMx1fRealQty
@@ -1417,7 +1272,7 @@
this.gvMx1fRealQty.Name = "gvMx1fRealQty";
this.gvMx1fRealQty.Tag = "query_a.FRealQty";
this.gvMx1fRealQty.Visible = true;
- this.gvMx1fRealQty.VisibleIndex = 6;
+ this.gvMx1fRealQty.VisibleIndex = 5;
this.gvMx1fRealQty.Width = 94;
//
// gridColumn12
@@ -1427,7 +1282,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 7;
+ this.gridColumn12.VisibleIndex = 6;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -1437,7 +1292,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 1;
+ this.gridColumn13.VisibleIndex = 0;
this.gridColumn13.Width = 94;
//
// gridColumn14
@@ -1447,7 +1302,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 2;
+ this.gridColumn14.VisibleIndex = 1;
this.gridColumn14.Width = 94;
//
// gridColumn15
@@ -1457,7 +1312,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 8;
+ this.gridColumn15.VisibleIndex = 15;
this.gridColumn15.Width = 94;
//
// gridColumn16
@@ -1467,7 +1322,7 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 9;
+ this.gridColumn16.VisibleIndex = 7;
this.gridColumn16.Width = 94;
//
// gridColumn17
@@ -1477,7 +1332,7 @@
this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 10;
+ this.gridColumn17.VisibleIndex = 8;
this.gridColumn17.Width = 94;
//
// gridColumn18
@@ -1495,7 +1350,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 11;
+ this.gridColumn19.VisibleIndex = 9;
this.gridColumn19.Width = 94;
//
// gridColumn20
@@ -1551,7 +1406,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 15;
+ this.gridColumn25.VisibleIndex = 10;
this.gridColumn25.Width = 94;
//
// gridColumn26
@@ -1561,7 +1416,7 @@
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 16;
+ this.gridColumn26.VisibleIndex = 11;
this.gridColumn26.Width = 94;
//
// gridColumn27
@@ -1635,7 +1490,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 17;
+ this.gvMxDel.VisibleIndex = 16;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
@@ -1667,20 +1522,6 @@
this.picCheckBox.TabIndex = 9;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // layoutControlItem21
- //
- this.layoutControlItem21.Control = this.btnSelect;
- this.layoutControlItem21.CustomizationFormText = "閫夋嫨鐗╂枡";
- this.layoutControlItem21.Location = new System.Drawing.Point(0, 124);
- this.layoutControlItem21.MaxSize = new System.Drawing.Size(120, 31);
- this.layoutControlItem21.MinSize = new System.Drawing.Size(95, 31);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem21.Size = new System.Drawing.Size(329, 31);
- this.layoutControlItem21.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem21.TextVisible = false;
//
// Frm_SalesDeliver
//
@@ -1750,18 +1591,16 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
this.ResumeLayout(false);
}
@@ -1799,20 +1638,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fMustQty;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index 2133eb1..9f50dd4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -60,22 +60,6 @@
txt_fSaleOrgIdTxt.Text = txt_salesId.GetSalesOrgName();
txt_shf.Text = txt_salesId.GetSalesShf();
txt_shName.Text = txt_salesId.GetSalesShfName();
- System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
- var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid);
- var json = JsonConvert.SerializeObject(_obj);
- try
- {
- var strReturn = UtilityHelper.HttpPost("",
- "SalesManager/SelectFormMx", json);
- var rtn = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = rtn.rtnData.list;
- this.repositoryItemSearchLookUpEdit1.DataSource = dt;
- repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
- }
};
//閫夋嫨闇�瑕佺殑鏄庣粏
@@ -125,6 +109,8 @@
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
+ gridView1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
catch (Exception ex)
{
@@ -351,6 +337,11 @@
MsgHelper.ShowError("棰勮鍙戣揣鏃堕棿涓嶈兘涓虹┖锛�");
return;
}
+ if (string.IsNullOrEmpty(row["salesDetailId"].ToString()))
+ {
+ MsgHelper.ShowError("閿�鍞崟鐗╂枡鏄庣粏涓嶈兘涓虹┖锛�");
+ return;
+ }
_obj.list.Add(new
{
Guid = _guid,
@@ -425,7 +416,8 @@
{
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ gridView1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -609,35 +601,7 @@
}
}
- private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
- {
- SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
- DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
- gvMx1.SetFocusedRowCellValue("salesDetailId", SelectedDataRow["id"].ToString());
- gvMx1.SetFocusedRowCellValue("billNo", SelectedDataRow["billNo"].ToString());
- gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
- gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString());
- gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
- gvMx1.SetFocusedRowCellValue("dwXs", SelectedDataRow["xxdw"].ToString());
- gvMx1.SetFocusedRowCellValue("dwJj", SelectedDataRow["jjdw"].ToString());
- gvMx1.SetFocusedRowCellValue("jjSl", SelectedDataRow["priceUnitQty"].ToString());
- gvMx1.SetFocusedRowCellValue("deliveryDate", SelectedDataRow["deliveryDate"].ToString());
- gvMx1.SetFocusedRowCellValue("xsSl", SelectedDataRow["qty"].ToString());
- gvMx1.SetFocusedRowCellValue("isFree", SelectedDataRow["isFree"].ToString());
- gvMx1.SetFocusedRowCellValue("hzlx", SelectedDataRow["hzlx"].ToString());
- gvMx1.SetFocusedRowCellValue("hz", SelectedDataRow["hz"].ToString());
- gvMx1.SetFocusedRowCellValue("xxbz", SelectedDataRow["xxbz"].ToString());
- gvMx1.SetFocusedRowCellValue("fhsx", SelectedDataRow["fhsx"].ToString());
- gvMx1.SetFocusedRowCellValue("fhxx", SelectedDataRow["fhxx"].ToString());
- gvMx1.SetFocusedRowCellValue("jsOrg", SelectedDataRow["jsOrg"].ToString());
- gvMx1.SetFocusedRowCellValue("gyOrg", SelectedDataRow["gyOrg"].ToString());
- gvMx1.SetFocusedRowCellValue("kcOrg", SelectedDataRow["kcOrg"].ToString());
- gvMx1.CloseEditor();
- gvMx1.PostEditor();
- gvMx1.UpdateCurrentRow();
- }
-
-
+
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx1.FocusedRowHandle;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
index 58ed8ed..bb0c49b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
@@ -38,9 +38,11 @@
DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ this.lb_FSalesManId = new DevExpress.XtraEditors.LabelControl();
this.lb_sctlbfb = new DevExpress.XtraEditors.LabelControl();
this.lb_cgthsqcgy = new DevExpress.XtraEditors.LabelControl();
this.lb_qtckdcgy = new DevExpress.XtraEditors.LabelControl();
@@ -59,10 +61,10 @@
this.txt_FSalesManId = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -73,9 +75,12 @@
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_qtRk = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lb_FSalesManId = new DevExpress.XtraEditors.LabelControl();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.lb_qtRk = new DevExpress.XtraEditors.LabelControl();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
this.splitContainerControl1.Panel1.SuspendLayout();
@@ -95,10 +100,10 @@
((System.ComponentModel.ISupportInitialize)(this.txt_FSalesManId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -109,8 +114,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qtRk.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
this.SuspendLayout();
//
// splitContainerControl1
@@ -144,6 +152,7 @@
//
// layoutControl1
//
+ this.layoutControl1.Controls.Add(this.lb_qtRk);
this.layoutControl1.Controls.Add(this.lb_FSalesManId);
this.layoutControl1.Controls.Add(this.lb_sctlbfb);
this.layoutControl1.Controls.Add(this.lb_cgthsqcgy);
@@ -161,16 +170,18 @@
this.layoutControl1.Controls.Add(this.txt_cgthsqcgy);
this.layoutControl1.Controls.Add(this.txt_sctlbfb);
this.layoutControl1.Controls.Add(this.txt_FSalesManId);
+ this.layoutControl1.Controls.Add(this.txt_qtRk);
this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutControl1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem7,
this.layoutControlItem8,
- this.layoutControlItem9,
this.layoutControlItem10,
this.layoutControlItem13,
this.layoutControlItem15,
this.layoutControlItem17,
- this.layoutControlItem11});
+ this.layoutControlItem9,
+ this.layoutControlItem11,
+ this.layoutControlItem19});
this.layoutControl1.Location = new System.Drawing.Point(2, 28);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(924, 201, 812, 500);
@@ -178,6 +189,15 @@
this.layoutControl1.Size = new System.Drawing.Size(549, 329);
this.layoutControl1.TabIndex = 0;
this.layoutControl1.Text = "layoutControl1";
+ //
+ // lb_FSalesManId
+ //
+ this.lb_FSalesManId.Location = new System.Drawing.Point(416, 218);
+ this.lb_FSalesManId.Name = "lb_FSalesManId";
+ this.lb_FSalesManId.Size = new System.Drawing.Size(83, 18);
+ this.lb_FSalesManId.StyleController = this.layoutControl1;
+ this.lb_FSalesManId.TabIndex = 21;
+ this.lb_FSalesManId.Text = "FSalesManId";
//
// lb_sctlbfb
//
@@ -199,7 +219,7 @@
//
// lb_qtckdcgy
//
- this.lb_qtckdcgy.Location = new System.Drawing.Point(416, 187);
+ this.lb_qtckdcgy.Location = new System.Drawing.Point(12, 135);
this.lb_qtckdcgy.Name = "lb_qtckdcgy";
this.lb_qtckdcgy.Size = new System.Drawing.Size(100, 18);
this.lb_qtckdcgy.StyleController = this.layoutControl1;
@@ -217,7 +237,7 @@
//
// lb_qtkg
//
- this.lb_qtkg.Location = new System.Drawing.Point(433, 86);
+ this.lb_qtkg.Location = new System.Drawing.Point(12, 73);
this.lb_qtkg.Name = "lb_qtkg";
this.lb_qtkg.Size = new System.Drawing.Size(28, 18);
this.lb_qtkg.StyleController = this.layoutControl1;
@@ -244,24 +264,24 @@
//
// txt_qtrkdysy
//
- this.txt_qtrkdysy.Location = new System.Drawing.Point(174, 12);
+ this.txt_qtrkdysy.Location = new System.Drawing.Point(212, 11);
this.txt_qtrkdysy.Name = "txt_qtrkdysy";
- this.txt_qtrkdysy.Size = new System.Drawing.Size(363, 24);
+ this.txt_qtrkdysy.Size = new System.Drawing.Size(304, 24);
this.txt_qtrkdysy.StyleController = this.layoutControl1;
this.txt_qtrkdysy.TabIndex = 4;
//
// txt_qtrkdcgy
//
- this.txt_qtrkdcgy.Location = new System.Drawing.Point(174, 46);
+ this.txt_qtrkdcgy.Location = new System.Drawing.Point(212, 42);
this.txt_qtrkdcgy.Name = "txt_qtrkdcgy";
- this.txt_qtrkdcgy.Size = new System.Drawing.Size(363, 24);
+ this.txt_qtrkdcgy.Size = new System.Drawing.Size(304, 24);
this.txt_qtrkdcgy.StyleController = this.layoutControl1;
this.txt_qtrkdcgy.TabIndex = 5;
//
// btnSave
//
this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x161;
- this.btnSave.Location = new System.Drawing.Point(12, 284);
+ this.btnSave.Location = new System.Drawing.Point(12, 290);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(96, 27);
this.btnSave.StyleController = this.layoutControl1;
@@ -270,50 +290,50 @@
//
// txt_qtkg
//
- this.txt_qtkg.Location = new System.Drawing.Point(12, 80);
+ this.txt_qtkg.Location = new System.Drawing.Point(12, 73);
this.txt_qtkg.Name = "txt_qtkg";
this.txt_qtkg.Properties.Caption = "榻愬寮�宸�";
- this.txt_qtkg.Size = new System.Drawing.Size(525, 24);
+ this.txt_qtkg.Size = new System.Drawing.Size(504, 24);
this.txt_qtkg.StyleController = this.layoutControl1;
this.txt_qtkg.TabIndex = 8;
//
// txt_qtckdllr
//
- this.txt_qtckdllr.Location = new System.Drawing.Point(174, 114);
+ this.txt_qtckdllr.Location = new System.Drawing.Point(212, 104);
this.txt_qtckdllr.Name = "txt_qtckdllr";
- this.txt_qtckdllr.Size = new System.Drawing.Size(363, 24);
+ this.txt_qtckdllr.Size = new System.Drawing.Size(304, 24);
this.txt_qtckdllr.StyleController = this.layoutControl1;
this.txt_qtckdllr.TabIndex = 9;
//
// txt_qtckdcgy
//
- this.txt_qtckdcgy.Location = new System.Drawing.Point(174, 148);
+ this.txt_qtckdcgy.Location = new System.Drawing.Point(212, 135);
this.txt_qtckdcgy.Name = "txt_qtckdcgy";
- this.txt_qtckdcgy.Size = new System.Drawing.Size(363, 24);
+ this.txt_qtckdcgy.Size = new System.Drawing.Size(304, 24);
this.txt_qtckdcgy.StyleController = this.layoutControl1;
this.txt_qtckdcgy.TabIndex = 10;
//
// txt_cgthsqcgy
//
- this.txt_cgthsqcgy.Location = new System.Drawing.Point(174, 182);
+ this.txt_cgthsqcgy.Location = new System.Drawing.Point(212, 166);
this.txt_cgthsqcgy.Name = "txt_cgthsqcgy";
- this.txt_cgthsqcgy.Size = new System.Drawing.Size(363, 24);
+ this.txt_cgthsqcgy.Size = new System.Drawing.Size(304, 24);
this.txt_cgthsqcgy.StyleController = this.layoutControl1;
this.txt_cgthsqcgy.TabIndex = 16;
//
// txt_sctlbfb
//
- this.txt_sctlbfb.Location = new System.Drawing.Point(174, 216);
+ this.txt_sctlbfb.Location = new System.Drawing.Point(212, 197);
this.txt_sctlbfb.Name = "txt_sctlbfb";
- this.txt_sctlbfb.Size = new System.Drawing.Size(363, 24);
+ this.txt_sctlbfb.Size = new System.Drawing.Size(304, 24);
this.txt_sctlbfb.StyleController = this.layoutControl1;
this.txt_sctlbfb.TabIndex = 18;
//
// txt_FSalesManId
//
- this.txt_FSalesManId.Location = new System.Drawing.Point(174, 250);
+ this.txt_FSalesManId.Location = new System.Drawing.Point(212, 228);
this.txt_FSalesManId.Name = "txt_FSalesManId";
- this.txt_FSalesManId.Size = new System.Drawing.Size(363, 24);
+ this.txt_FSalesManId.Size = new System.Drawing.Size(304, 24);
this.txt_FSalesManId.StyleController = this.layoutControl1;
this.txt_FSalesManId.TabIndex = 20;
//
@@ -339,18 +359,6 @@
this.layoutControlItem8.Text = "鍏跺畠鍏ュ簱鍗曚粨绠″憳label";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.lb_qtkg;
- this.layoutControlItem9.Location = new System.Drawing.Point(421, 74);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(108, 37);
- this.layoutControlItem9.Text = "榻愬寮�宸abel";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem9.TextVisible = false;
//
// layoutControlItem10
//
@@ -388,6 +396,19 @@
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem15.TextVisible = false;
//
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.lb_FSalesManId;
+ this.layoutControlItem17.CustomizationFormText = "閿�鍞憳label";
+ this.layoutControlItem17.Location = new System.Drawing.Point(404, 217);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem17.Size = new System.Drawing.Size(104, 31);
+ this.layoutControlItem17.Text = "閿�鍞憳";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem17.TextVisible = false;
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -401,7 +422,8 @@
this.layoutControlItem12,
this.layoutControlItem14,
this.layoutControlItem16,
- this.layoutControlItem4});
+ this.layoutControlItem4,
+ this.layoutControlItem18});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -426,6 +448,8 @@
rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition9.Height = 100D;
rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
@@ -435,8 +459,9 @@
rowDefinition6,
rowDefinition7,
rowDefinition8,
- rowDefinition9});
- this.Root.Size = new System.Drawing.Size(549, 329);
+ rowDefinition9,
+ rowDefinition10});
+ this.Root.Size = new System.Drawing.Size(528, 330);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -444,27 +469,27 @@
this.layoutControlItem1.Control = this.txt_qtrkdysy;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem1.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem1.Text = "鍏跺畠鍏ュ簱鍗曢獙鏀跺憳";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(150, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(188, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_qtrkdcgy;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 34);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem2.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem2.Text = "鍏跺畠鍏ュ簱鍗曚粨绠″憳";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(150, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(188, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_qtkg;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 68);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem3.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem3.Text = "榻愬寮�宸�";
this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem3.TextVisible = false;
@@ -472,100 +497,126 @@
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_qtckdllr;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 102);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem5.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem5.Text = "鍏跺畠鍑哄簱鍗曢鏂欎汉";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(150, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(188, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_qtckdcgy;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 136);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem6.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem6.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem6.Text = "鍏跺畠鍑哄簱鍗曚粨绠″憳";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(150, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(188, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_cgthsqcgy;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 170);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 155);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem12.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem12.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem12.Text = "閲囪喘閫�璐х敵璇烽噰璐憳";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(150, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(188, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_sctlbfb;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 204);
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 186);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem14.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem14.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem14.Text = "鐢熶骇閫�鏂欒秴%鍒欒瀹℃牳";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(150, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(188, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_FSalesManId;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 238);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 217);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem16.Size = new System.Drawing.Size(529, 34);
+ this.layoutControlItem16.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem16.Text = "閿�鍞憳";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(150, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(188, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.btnSave;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 272);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 279);
this.layoutControlItem4.MaxSize = new System.Drawing.Size(100, 31);
this.layoutControlItem4.MinSize = new System.Drawing.Size(90, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem4.Size = new System.Drawing.Size(529, 37);
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 9;
+ this.layoutControlItem4.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem4.Text = "纭畾淇濆瓨";
this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem4.TextVisible = false;
//
+ // txt_qtRk
+ //
+ this.txt_qtRk.Location = new System.Drawing.Point(212, 259);
+ this.txt_qtRk.Name = "txt_qtRk";
+ this.txt_qtRk.Size = new System.Drawing.Size(304, 24);
+ this.txt_qtRk.StyleController = this.layoutControl1;
+ this.txt_qtRk.TabIndex = 22;
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_qtRk;
+ this.layoutControlItem18.Location = new System.Drawing.Point(0, 248);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem18.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem18.Text = "榻愬鍏ュ簱(1:寮�鍚� 锛�0锛氬叧闂�)";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(188, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.lb_qtkg;
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem9.Text = "榻愬寮�宸abel";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem9.TextVisible = false;
+ //
// layoutControlItem11
//
this.layoutControlItem11.Control = this.lb_qtckdcgy;
- this.layoutControlItem11.Location = new System.Drawing.Point(404, 186);
+ this.layoutControlItem11.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem11.Size = new System.Drawing.Size(104, 31);
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem11.Size = new System.Drawing.Size(508, 31);
this.layoutControlItem11.Text = "鍏跺畠鍑哄簱鍗曚粨绠″憳label";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
//
- // lb_FSalesManId
+ // lb_qtRk
//
- this.lb_FSalesManId.Location = new System.Drawing.Point(416, 218);
- this.lb_FSalesManId.Name = "lb_FSalesManId";
- this.lb_FSalesManId.Size = new System.Drawing.Size(83, 18);
- this.lb_FSalesManId.StyleController = this.layoutControl1;
- this.lb_FSalesManId.TabIndex = 21;
- this.lb_FSalesManId.Text = "FSalesManId";
+ this.lb_qtRk.Location = new System.Drawing.Point(12, 259);
+ this.lb_qtRk.Name = "lb_qtRk";
+ this.lb_qtRk.Size = new System.Drawing.Size(30, 18);
+ this.lb_qtRk.StyleController = this.layoutControl1;
+ this.lb_qtRk.TabIndex = 23;
+ this.lb_qtRk.Text = "qtRk";
//
- // layoutControlItem17
+ // layoutControlItem19
//
- this.layoutControlItem17.Control = this.lb_FSalesManId;
- this.layoutControlItem17.CustomizationFormText = "閿�鍞憳label";
- this.layoutControlItem17.Location = new System.Drawing.Point(404, 217);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem17.Size = new System.Drawing.Size(104, 31);
- this.layoutControlItem17.Text = "閿�鍞憳";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem17.TextVisible = false;
+ this.layoutControlItem19.Control = this.lb_qtRk;
+ this.layoutControlItem19.Location = new System.Drawing.Point(0, 248);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem19.Size = new System.Drawing.Size(508, 31);
+ this.layoutControlItem19.Text = "榻愬鍏ュ簱label";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem19.TextVisible = false;
//
// Frm_Config
//
@@ -594,10 +645,10 @@
((System.ComponentModel.ISupportInitialize)(this.txt_FSalesManId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -608,8 +659,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_qtRk.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
this.ResumeLayout(false);
}
@@ -642,7 +696,6 @@
private DevExpress.XtraEditors.TextEdit txt_sctlbfb;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraEditors.LabelControl lb_sctlbfb;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
@@ -650,9 +703,14 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraEditors.TextEdit txt_FSalesManId;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraEditors.LabelControl lb_FSalesManId;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraEditors.LabelControl lb_qtRk;
+ private DevExpress.XtraEditors.TextEdit txt_qtRk;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
index a10a4d1..4a55b0b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
@@ -51,6 +51,9 @@
//閿�鍞憳
sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
sb.Append(" values(newid(),'" + lb_FSalesManId.Text.Trim() + "','" + txt_FSalesManId.Text.Trim() + "','" + layoutControlItem16.Text.Trim() + "')");
+ //榻愬鍏ュ簱
+ sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+ sb.Append(" values(newid(),'" + lb_qtRk.Text.Trim() + "','" + txt_qtRk.Text.Trim() + "','" + layoutControlItem18.Text.Trim() + "')");
var _obj = new
{
sql = sb.ToString(),
@@ -126,12 +129,16 @@
txt_cgthsqcgy.Text = row["parameterValue"].ToString();
continue;
}
-
if (row["remark"].ToString() == layoutControlItem14.Text)
{
txt_sctlbfb.Text = row["parameterValue"].ToString();
continue;
}
+ if (row["remark"].ToString() == layoutControlItem18.Text)
+ {
+ txt_qtRk.Text = row["parameterValue"].ToString();
+ continue;
+ }
}
}
else
diff --git a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
index d91c8ae..2507632 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs
@@ -335,7 +335,11 @@
//
// gridColumn12
//
- this.gridColumn12.Caption = "褰撳墠搴撳瓨";
+ this.gridColumn12.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn12.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn12.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn12.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn12.Caption = "Mes/Erp搴撳瓨";
this.gridColumn12.FieldName = "kcQty";
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
--
Gitblit v1.9.3