From 5cf52040c8b95c967433d627374e25645c404eb2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 01 九月 2025 09:37:45 +0800
Subject: [PATCH] 复制
---
DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs | 159 ++++----
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 43 +-
DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs | 10
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 3
DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.resx | 3
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 68 ++++
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx | 18 +
DevApp/Gs.DevApp/UserControl/CopyXls.cs | 144 +++++++-
DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.Designer.cs | 216 +++++++++++-
DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.cs | 51 ++
DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.resx | 19 +
DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs | 7
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs | 219 +++++++-----
15 files changed, 724 insertions(+), 249 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 3168274..f107564 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -36,9 +36,9 @@
</runtime>
<appSettings>
- <!--<add key="webapiurl" value="http://localhost:5263/" />-->
+ <add key="webapiurl" value="http://localhost:5263/" />
<!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.Designer.cs
index 71f05f2..64b5639 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.Designer.cs
@@ -41,21 +41,32 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_AreaBind));
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -70,6 +81,8 @@
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.鍒嗗尯Guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -103,6 +116,16 @@
this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptDel2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx3 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -120,6 +143,7 @@
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -145,6 +169,10 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptDel2)).BeginInit();
+ this.xtraTabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -211,7 +239,8 @@
this.gcMain1.Name = "gcMain1";
this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit2,
- this.repositoryItemButtonEdit3});
+ this.repositoryItemButtonEdit3,
+ this.repositoryItemButtonEdit1});
this.gcMain1.Size = new System.Drawing.Size(1002, 637);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -230,6 +259,7 @@
this.createTime,
this.gridColumn2,
this.gridColumn3,
+ this.gridColumn11,
this.鍒嗗尯Guid});
gridFormatRule1.Name = "Format0";
formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Red;
@@ -320,8 +350,6 @@
this.gridColumn3.ColumnEdit = this.repositoryItemButtonEdit3;
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 5;
this.gridColumn3.Width = 94;
//
// repositoryItemButtonEdit3
@@ -334,6 +362,27 @@
this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "缁戝畾搴撲綅";
+ this.gridColumn11.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 5;
+ this.gridColumn11.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions3.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions3.Image")));
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "缁戝畾搴撲綅", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
// 鍒嗗尯Guid
//
@@ -402,15 +451,15 @@
this.txt_defectCode.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.txt_defectCode.Name = "txt_defectCode";
this.txt_defectCode.Properties.Appearance.Options.UseFont = true;
- this.txt_defectCode.Size = new System.Drawing.Size(169, 24);
+ this.txt_defectCode.Size = new System.Drawing.Size(164, 24);
this.txt_defectCode.StyleController = this.layoutMx1;
this.txt_defectCode.TabIndex = 128;
//
// txt_defectName
//
- this.txt_defectName.Location = new System.Drawing.Point(574, 12);
+ this.txt_defectName.Location = new System.Drawing.Point(564, 12);
this.txt_defectName.Name = "txt_defectName";
- this.txt_defectName.Size = new System.Drawing.Size(169, 24);
+ this.txt_defectName.Size = new System.Drawing.Size(164, 24);
this.txt_defectName.StyleController = this.layoutMx1;
this.txt_defectName.TabIndex = 129;
//
@@ -452,7 +501,7 @@
rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1});
- this.Root.Size = new System.Drawing.Size(1002, 48);
+ this.Root.Size = new System.Drawing.Size(981, 48);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -460,17 +509,17 @@
this.layoutControlItem1.Control = this.txt_defectCode;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(245, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(240, 28);
this.layoutControlItem1.Text = "鍒嗗尯缂栧彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_defectName;
- this.layoutControlItem2.Location = new System.Drawing.Point(490, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(480, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(245, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(240, 28);
this.layoutControlItem2.Text = "鍒嗗尯鍚嶇О";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -484,7 +533,8 @@
this.tabMx.TabIndex = 4;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
- this.tabMxPage2});
+ this.tabMxPage2,
+ this.xtraTabPage3});
//
// tabMxPage1
//
@@ -572,10 +622,10 @@
// rptDel1
//
this.rptDel1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptDel1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDel1.Name = "rptDel1";
this.rptDel1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptDel1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDel1_ButtonClick);
@@ -594,6 +644,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
+ this.tabMxPage2.PageVisible = false;
this.tabMxPage2.Size = new System.Drawing.Size(1000, 559);
this.tabMxPage2.Text = "鐗╂枡缁戝畾";
//
@@ -701,13 +752,117 @@
// rptDel2
//
this.rptDel2.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptDel2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDel2.Name = "rptDel2";
this.rptDel2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptDel2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDel2_ButtonClick);
+ //
+ // xtraTabPage3
+ //
+ this.xtraTabPage3.Controls.Add(this.gcMx3);
+ this.xtraTabPage3.Name = "xtraTabPage3";
+ this.xtraTabPage3.Size = new System.Drawing.Size(1000, 559);
+ this.xtraTabPage3.Text = "浠撲綅缁戝畾";
+ //
+ // gcMx3
+ //
+ this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx3.Location = new System.Drawing.Point(0, 0);
+ this.gcMx3.MainView = this.gvMx3;
+ this.gcMx3.Name = "gcMx3";
+ this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit4});
+ this.gcMx3.Size = new System.Drawing.Size(1000, 559);
+ this.gcMx3.TabIndex = 1;
+ this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx3});
+ //
+ // gvMx3
+ //
+ this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn12,
+ this.gridColumn13,
+ this.gridColumn14,
+ this.gridColumn15,
+ this.gridColumn19,
+ this.gridColumn21});
+ this.gvMx3.GridControl = this.gcMx3;
+ this.gvMx3.Name = "gvMx3";
+ this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx3.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx3.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "gridColumn1";
+ this.gridColumn12.FieldName = "guid";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Width = 94;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "搴撲綅鍚嶇О";
+ this.gridColumn13.FieldName = "depotSectionName";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 1;
+ this.gridColumn13.Width = 94;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "搴撲綅缂栧彿";
+ this.gridColumn14.FieldName = "depotSectionCode";
+ this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 2;
+ this.gridColumn14.Width = 94;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "鎵�鍦ㄥ尯";
+ this.gridColumn15.FieldName = "defectName";
+ this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 0;
+ this.gridColumn15.Width = 94;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.Caption = "绉诲嚭";
+ this.gridColumn19.ColumnEdit = this.repositoryItemButtonEdit4;
+ this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 4;
+ this.gridColumn19.Width = 94;
+ //
+ // repositoryItemButtonEdit4
+ //
+ this.repositoryItemButtonEdit4.AutoHeight = false;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4";
+ this.repositoryItemButtonEdit4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit4.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit4_ButtonClick);
+ //
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "浣跨敤缁勭粐";
+ this.gridColumn21.FieldName = "orgName";
+ this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Visible = true;
+ this.gridColumn21.VisibleIndex = 3;
+ this.gridColumn21.Width = 94;
//
// gridColumn1
//
@@ -769,6 +924,7 @@
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
this.splitMx1.Panel1.ResumeLayout(false);
@@ -794,6 +950,10 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptDel2)).EndInit();
+ this.xtraTabPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit();
this.ResumeLayout(false);
}
@@ -852,5 +1012,17 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDel2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn 鍒嗗尯Guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
+ private DevExpress.XtraGrid.GridControl gcMx3;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.cs
index a1e6e56..7b7b43e 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.cs
@@ -18,6 +18,7 @@
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -89,6 +90,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
gvList.Add(gvMx2);
+ gvList.Add(gvMx3);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
@@ -126,6 +128,25 @@
else
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ }
+
+ JArray array3 = new JArray();
+ foreach (var a in _job["rtnData"]["list3"])
+ {
+ array3.Add(a);
+ }
+ DataTable dt3 = JsonConvert.DeserializeObject<DataTable>(array3.ToString());
+ if (dt3.Rows.Count > 0)
+ {
+ gcMx3.BindingContext = new BindingContext();
+ gcMx3.DataSource = dt3;
+ gcMx3.ForceInitialize();
+ gvMx3.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx3);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
}
}
else
@@ -173,6 +194,23 @@
}
}
/// <summary>
+ /// 缁戝畾搴撲綅
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, ButtonPressedEventArgs e)
+ {
+ if (e.Button.Index == 0)
+ {
+ var rowhandle = gridView1.FocusedRowHandle;
+ var dr = gridView1.GetDataRow(rowhandle);
+ var userGuid = dr["guid"].ToString();
+ var frm = new SelectKW(userGuid);
+ frm.ShowDialog();
+ }
+ }
+
+ /// <summary>
/// 鍒犻櫎浜哄憳
/// </summary>
/// <param name="sender"></param>
@@ -190,8 +228,15 @@
{
delBind(e,gvMx2);
}
-
-
+ /// <summary>
+ /// 鍒犻櫎搴撲綅
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit4_ButtonClick(object sender, ButtonPressedEventArgs e)
+ {
+ delBind(e, gvMx3);
+ }
private void delBind(ButtonPressedEventArgs e, DevExpress.XtraGrid.Views.Grid.GridView gv)
{
var rowhandle = gv.FocusedRowHandle;
@@ -227,5 +272,7 @@
}
}
}
+
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.resx b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.resx
index 5160e8b..8a9a3e1 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.resx
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_AreaBind.resx
@@ -117,6 +117,25 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="editorButtonImageOptions3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAwdEVYdFRpdGxlAENlbnRlcjtQb3NpdGlvbjtBbGln
+ bm1lbnQ7TG9jYXRpb247QW5jaG9yO23YHgwAAAJ5SURBVDhPlZJLTxNhFIa/aBQU/w/+AhcadedCDaAb
+ LgVqSwvhYkuVIEihpdypVyQmiqCJXCQaWlpQolRXRgygFHUJlF5oZzrt6/nOgII7F8+836TnPHPynQrP
+ UMjXPfwJXY8kHxnP0B4hdD4Mwf1AsgjX/UV03PvAtHnf+YUQh0Vz31tkAR16/MkDZHcBMkwWDk8QJDgi
+ mnrm+YdkSsNOKk1oSFA2ji7BNrKE+idf+H3RdR7vnWex0HIGGbLY3QFdcLN7jgWyKCGbk5RE9ePPmFra
+ QlF3CLGkioXW00h8HcJExUloJLC5/FJwVMhR5EhxaopToU4aBR3zOOeYYaI7KoKOU5goz8e4IR+alkF9
+ u08X2FwBHim2kyZULpbnaILOjIJtyojMuIJIXIVKgtrbM1KQI663+3kka6OXbncOHXfn0M4E4byzRwBO
+ b5BuPoC2wQDUdAY1LW90QZ3Th7SWhcXuxfqvCMIE588I1pgtrP0gdrN1cBaKqsHa/FoKcoU0KWQ02wa4
+ OUyFEln8fR/f1jeZ1oFZ3pbpxrQUHBMWMqXUDEwN/QcbZFKDZDX8l5Z+P21JhbFxSheYm6aRVDQY63qp
+ WP/SKuX+JslKeAMraxu41efjy66wT0rBcWFyvOL/QGVtDzXqY3IxN+jnZWqUzTKbe/2I0iYMDeO6wGif
+ 4r0barpQTpRVe2CwejjLrJ0otbhRWuVGCVFc5UKx2UWrVFBWz4I8UW6b/GfvKu99m74ikcVMTMFWLEUo
+ 2IymUFL7UhcUmp7OXLW8wBXLcxQRhVVjKDSPocA0yly+9oy5ZNxjBBcrR3ChdNhHghyCH3m7nPgPcoUQ
+ h34DYhnnAPsOKdcAAAAASUVORK5CYII=
+</value>
+ </data>
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
index f629eae..ee98b78 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/DefectCode.cs
@@ -46,6 +46,13 @@
frm.UpdateParent += (s2, ee2) =>
{
getPageList(1);
+ // 渚嬪锛岄�氳繃ID鏌ユ壘鑺傜偣锛�
+ TreeListNode node = tlMenu.FindNodeByKeyID(strUpGuid);
+ if (node != null)
+ {
+ node.Expanded = true; // 灞曞紑鑺傜偣
+ tlMenu.MakeNodeVisible(node); // 纭繚鍙
+ }
};
frm.ShowDialog();
};
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index b73c4f1..1e0403b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -197,31 +197,33 @@
string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
if (File.Exists(filePath))
{
- var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.鍏跺畠鍏ュ簱.ToString(), txt_qt022.GetId());
+ var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.鍏跺畠鍏ュ簱.ToString());
frm.UpdateParent += (ss, ee) =>
{
try
{
var lst = ee.DynamicList;
- MessageBox.Show(lst.Count.ToString());
- //DataTable _Table = (DataTable)gcMx1.DataSource;
- //foreach (dynamic dym in lst)
- //{
- // DataRow _row = _Table.NewRow();
- // _row["fSeq"] = dym.fSeq;
- // _row["statStatus"] = "Y-鏄�";
- // _row["collectionName"] = "绌�";
- // _row["processNo"] = dym.processNo;
- // _row["processName"] = dym.processName;
- // _Table.Rows.Add(_row);
- //}
- //gcMx1.BindingContext = new BindingContext();
- //gcMx1.DataSource = _Table;
- //gcMx1.ForceInitialize();
- //gvMx1.CloseEditor();
- //gvMx1.PostEditor();
- //gvMx1.UpdateCurrentRow();
- //gvMx1.BestFitColumns();
+ DataTable _Table = (DataTable)gcMx1.DataSource;
+ foreach (dynamic dym in lst)
+ {
+ DataRow _row = _Table.NewRow();
+ _row["qd002"] = dym.itemNo;
+ _row["qd003"] = dym.itemName;
+ _row["qd004"] = dym.itemModel;
+ _row["kcDw"] = dym.dwName;
+ _row["itemId"] = dym.itemId;
+ _row["qd007"] = dym.sl;
+ _row["qd010"] = dym.bz;
+ _row["qd012"] = dym.bllx;
+ _Table.Rows.Add(_row);
+ }
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _Table;
+ gcMx1.ForceInitialize();
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
}
catch (Exception ex)
{
@@ -602,7 +604,6 @@
/// <param name="strGuid"></param>
private void getModel(string strGuid)
{
-
gcMx1.DataSource = null;
bool isEdit = false;
if (toolBarMenu1.currentAction == "add") return;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
index 889940e..4ad4a31 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.Designer.cs
@@ -29,6 +29,7 @@
/// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -46,6 +47,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.gridControl1 = new DevExpress.XtraGrid.GridControl();
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -61,7 +63,7 @@
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -86,10 +88,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -97,11 +99,10 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+ 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(1410, 736);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1});
@@ -109,9 +110,8 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -120,7 +120,6 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -134,19 +133,17 @@
this.split1.Panel2.Controls.Add(this.gridControl1);
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1408, 698);
- this.split1.SplitterPosition = 268;
+ this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.SplitterPosition = 219;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1408, 367);
+ this.gcMain1.Size = new System.Drawing.Size(1126, 300);
this.gcMain1.TabIndex = 5;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -167,9 +164,8 @@
this.gridColumn6,
this.gridColumn7,
this.gridColumn18});
- this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 62;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -179,137 +175,145 @@
//
this.gridColumn8.Caption = "宸ュ崟鍗曞彿";
this.gridColumn8.FieldName = "daa001";
- this.gridColumn8.MinWidth = 30;
+ this.gridColumn8.MinWidth = 24;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Tag = "daa001";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 0;
- this.gridColumn8.Width = 112;
+ this.gridColumn8.Width = 90;
//
// itemNo1
//
this.itemNo1.Caption = "鐗╂枡缂栫爜";
this.itemNo1.FieldName = "itemNo";
- this.itemNo1.MinWidth = 30;
+ this.itemNo1.MinWidth = 24;
this.itemNo1.Name = "itemNo1";
this.itemNo1.Tag = "itemNo";
this.itemNo1.Visible = true;
this.itemNo1.VisibleIndex = 1;
- this.itemNo1.Width = 112;
+ this.itemNo1.Width = 90;
//
// itemName
//
this.itemName.Caption = "鐗╂枡鍚嶇О";
this.itemName.FieldName = "itemName";
- this.itemName.MinWidth = 30;
+ this.itemName.MinWidth = 24;
this.itemName.Name = "itemName";
this.itemName.Tag = "itemName";
this.itemName.Visible = true;
this.itemName.VisibleIndex = 2;
- this.itemName.Width = 112;
+ this.itemName.Width = 90;
//
// itemModel
//
this.itemModel.Caption = "瑙勬牸鍨嬪彿";
this.itemModel.FieldName = "itemModel";
- this.itemModel.MinWidth = 30;
+ this.itemModel.MinWidth = 24;
this.itemModel.Name = "itemModel";
this.itemModel.Tag = "itemModel";
this.itemModel.Visible = true;
this.itemModel.VisibleIndex = 3;
- this.itemModel.Width = 112;
+ this.itemModel.Width = 90;
//
// gridColumn1
//
this.gridColumn1.Caption = "瀹為檯寮�宸ユ棩鏈�";
this.gridColumn1.FieldName = "daa016";
- this.gridColumn1.MinWidth = 30;
+ this.gridColumn1.MinWidth = 24;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 4;
- this.gridColumn1.Width = 112;
+ this.gridColumn1.Width = 90;
//
// gridColumn2
//
this.gridColumn2.Caption = "瀹為檯瀹屽伐鏃ユ湡";
this.gridColumn2.FieldName = "daa017";
- this.gridColumn2.MinWidth = 30;
+ this.gridColumn2.MinWidth = 24;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 5;
- this.gridColumn2.Width = 112;
+ this.gridColumn2.Width = 90;
//
// gridColumn3
//
this.gridColumn3.Caption = "宸ュ崟鏁伴噺";
this.gridColumn3.FieldName = "daa008";
- this.gridColumn3.MinWidth = 30;
+ this.gridColumn3.MinWidth = 24;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 6;
- this.gridColumn3.Width = 112;
+ this.gridColumn3.Width = 90;
//
// gridColumn4
//
this.gridColumn4.Caption = "宸茬敓浜ф暟";
this.gridColumn4.FieldName = "quantity1";
- this.gridColumn4.MinWidth = 30;
+ this.gridColumn4.MinWidth = 24;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 7;
- this.gridColumn4.Width = 112;
+ this.gridColumn4.Width = 90;
//
// gridColumn5
//
this.gridColumn5.Caption = "绾垮埆";
this.gridColumn5.FieldName = "lineName";
- this.gridColumn5.MinWidth = 30;
+ this.gridColumn5.MinWidth = 24;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 8;
- this.gridColumn5.Width = 112;
+ this.gridColumn5.Width = 90;
//
// gridColumn6
//
this.gridColumn6.Caption = "鍏ュ簱鏁伴噺";
this.gridColumn6.FieldName = "quantity2";
- this.gridColumn6.MinWidth = 30;
+ this.gridColumn6.MinWidth = 24;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 9;
- this.gridColumn6.Width = 112;
+ this.gridColumn6.Width = 90;
//
// gridColumn7
//
this.gridColumn7.Caption = "鍏ュ簱杩涘害";
this.gridColumn7.FieldName = "quantity3";
- this.gridColumn7.MinWidth = 30;
+ this.gridColumn7.MinWidth = 24;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 10;
- this.gridColumn7.Width = 112;
+ this.gridColumn7.Width = 90;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.Caption = "缁勭粐鏈烘瀯";
+ this.gridColumn18.FieldName = "orgName";
+ this.gridColumn18.MinWidth = 24;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 11;
+ this.gridColumn18.Width = 90;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 367);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Location = new System.Drawing.Point(0, 300);
+ 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(1408, 48);
+ this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// gridControl1
//
this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gridControl1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gridControl1.Location = new System.Drawing.Point(0, 0);
this.gridControl1.MainView = this.gridView2;
- this.gridControl1.Margin = new System.Windows.Forms.Padding(4);
this.gridControl1.Name = "gridControl1";
- this.gridControl1.Size = new System.Drawing.Size(1408, 268);
+ this.gridControl1.Size = new System.Drawing.Size(1126, 219);
this.gridControl1.TabIndex = 5;
this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView2});
@@ -330,9 +334,8 @@
this.gridColumn15,
this.gridColumn16,
this.gridColumn17});
- this.gridView2.DetailHeight = 428;
this.gridView2.GridControl = this.gridControl1;
- this.gridView2.IndicatorWidth = 62;
+ this.gridView2.IndicatorWidth = 50;
this.gridView2.Name = "gridView2";
this.gridView2.OptionsFind.ShowSearchNavButtons = false;
this.gridView2.OptionsView.ShowAutoFilterRow = true;
@@ -342,145 +345,134 @@
//
this.gridColumn9.Caption = "浜у搧鏉＄爜";
this.gridColumn9.FieldName = "itemBarcode";
- this.gridColumn9.MinWidth = 30;
+ this.gridColumn9.MinWidth = 24;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Tag = "daa001";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 0;
- this.gridColumn9.Width = 112;
+ this.gridColumn9.Width = 90;
//
// gridColumn20
//
this.gridColumn20.Caption = "浠撳簱缂栧彿";
this.gridColumn20.FieldName = "depotCode";
- this.gridColumn20.MinWidth = 30;
+ this.gridColumn20.MinWidth = 24;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 1;
- this.gridColumn20.Width = 112;
+ this.gridColumn20.Width = 90;
//
// gridColumn21
//
this.gridColumn21.Caption = "搴撲綅缂栧彿";
this.gridColumn21.FieldName = "depotSectionCode";
- this.gridColumn21.MinWidth = 30;
+ this.gridColumn21.MinWidth = 24;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 2;
- this.gridColumn21.Width = 112;
+ this.gridColumn21.Width = 90;
//
// gridColumn22
//
this.gridColumn22.Caption = "鏁伴噺";
this.gridColumn22.FieldName = "quantity";
- this.gridColumn22.MinWidth = 30;
+ this.gridColumn22.MinWidth = 24;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 3;
- this.gridColumn22.Width = 112;
+ this.gridColumn22.Width = 90;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐗╂枡缂栫爜";
this.gridColumn10.FieldName = "itemNo";
- this.gridColumn10.MinWidth = 30;
+ this.gridColumn10.MinWidth = 24;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Tag = "itemNo";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 4;
- this.gridColumn10.Width = 112;
+ this.gridColumn10.Width = 90;
//
// gridColumn11
//
this.gridColumn11.Caption = "鐗╂枡鍚嶇О";
this.gridColumn11.FieldName = "itemName";
- this.gridColumn11.MinWidth = 30;
+ this.gridColumn11.MinWidth = 24;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Tag = "itemName";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 5;
- this.gridColumn11.Width = 112;
+ this.gridColumn11.Width = 90;
//
// gridColumn12
//
this.gridColumn12.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn12.FieldName = "itemModel";
- this.gridColumn12.MinWidth = 30;
+ this.gridColumn12.MinWidth = 24;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Tag = "itemModel";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 6;
- this.gridColumn12.Width = 112;
+ this.gridColumn12.Width = 90;
//
// gridColumn13
//
this.gridColumn13.Caption = "鍏ュ簱鏃堕棿";
this.gridColumn13.FieldName = "rkDate";
- this.gridColumn13.MinWidth = 30;
+ this.gridColumn13.MinWidth = 24;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 7;
- this.gridColumn13.Width = 112;
+ this.gridColumn13.Width = 90;
//
// gridColumn14
//
this.gridColumn14.Caption = "妫�楠屾椂闂�";
this.gridColumn14.FieldName = "fcheckDate";
- this.gridColumn14.MinWidth = 30;
+ this.gridColumn14.MinWidth = 24;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 8;
- this.gridColumn14.Width = 112;
+ this.gridColumn14.Width = 90;
//
// gridColumn15
//
this.gridColumn15.Caption = "鍏ュ簱鏃跺樊";
this.gridColumn15.FieldName = "diff1";
- this.gridColumn15.MinWidth = 30;
+ this.gridColumn15.MinWidth = 24;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 9;
- this.gridColumn15.Width = 112;
+ this.gridColumn15.Width = 90;
//
// gridColumn16
//
this.gridColumn16.Caption = "閫佹鏃堕棿";
this.gridColumn16.FieldName = "sjDate";
- this.gridColumn16.MinWidth = 30;
+ this.gridColumn16.MinWidth = 24;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 10;
- this.gridColumn16.Width = 112;
+ this.gridColumn16.Width = 90;
//
// gridColumn17
//
this.gridColumn17.Caption = "妫�楠屾椂宸�";
this.gridColumn17.FieldName = "diff2";
- this.gridColumn17.MinWidth = 30;
+ this.gridColumn17.MinWidth = 24;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 11;
- this.gridColumn17.Width = 112;
- //
- // gridColumn18
- //
- this.gridColumn18.Caption = "缁勭粐鏈烘瀯";
- this.gridColumn18.FieldName = "orgName";
- this.gridColumn18.MinWidth = 30;
- this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 11;
- this.gridColumn18.Width = 112;
+ this.gridColumn17.Width = 90;
//
// CPMX
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1410, 834);
+ this.ClientSize = new System.Drawing.Size(1128, 682);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "CPMX";
this.Text = "鎴愬搧鍏ュ簱璁板綍琛�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -533,5 +525,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.Utils.ToolTipController tips;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs
index ea51c6b..3487237 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.cs
@@ -25,16 +25,15 @@
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.getXmlConfig();
-
// 璁剧疆gridView1鍙傛暟锛屽苟娣诲姞琛岄�夋嫨浜嬩欢澶勭悊
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", null);
-
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", null, tips, true, (mxxGuid) =>
+ {
+ /// MessageBox.Show(mxxGuid.ToString());
+ });
// 娣诲姞gridView1鐨勮閫夋嫨鍙樺寲浜嬩欢
gridView1.FocusedRowChanged += GridView1_FocusedRowChanged;
-
// 璁剧疆gridView2鍙傛暟
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView2);
-
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
}, (value) =>
@@ -86,7 +85,6 @@
{
daa001 = workOrderNo
};
-
string json = JsonConvert.SerializeObject(requestObj);
// 璋冪敤鍚庡彴鎺ュ彛鑾峰彇鏄庣粏鏁版嵁
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.resx
index d58980a..a4826a3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CPMX.resx
@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index 7490e44..dcba6fc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -30,6 +30,7 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesDbck));
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -128,6 +129,7 @@
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.btnCopyXls = new DevExpress.XtraEditors.SimpleButton();
this.txt_djtype = new DevExpress.XtraEditors.ComboBoxEdit();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_fRemarks = new DevExpress.XtraEditors.TextEdit();
@@ -177,6 +179,7 @@
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -296,6 +299,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -797,6 +801,7 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.btnCopyXls);
this.layoutMx1.Controls.Add(this.txt_djtype);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_fRemarks);
@@ -832,17 +837,27 @@
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
+ // btnCopyXls
+ //
+ this.btnCopyXls.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCopyXls.ImageOptions.Image")));
+ this.btnCopyXls.Location = new System.Drawing.Point(12, 167);
+ this.btnCopyXls.Name = "btnCopyXls";
+ this.btnCopyXls.Size = new System.Drawing.Size(116, 27);
+ this.btnCopyXls.StyleController = this.layoutMx1;
+ this.btnCopyXls.TabIndex = 445;
+ this.btnCopyXls.Text = "蹇嵎褰曞叆";
+ //
// txt_djtype
//
this.txt_djtype.EditValue = "鏍囧噯鐩存帴璋冩嫧鍗�(ZJDB01_SYS)";
- this.txt_djtype.Location = new System.Drawing.Point(390, 126);
+ this.txt_djtype.Location = new System.Drawing.Point(385, 136);
this.txt_djtype.Name = "txt_djtype";
this.txt_djtype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_djtype.Properties.Items.AddRange(new object[] {
"鏍囧噯鐩存帴璋冩嫧鍗�(ZJDB01_SYS)"});
this.txt_djtype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_djtype.Size = new System.Drawing.Size(170, 24);
+ this.txt_djtype.Size = new System.Drawing.Size(165, 24);
this.txt_djtype.StyleController = this.layoutMx1;
this.txt_djtype.TabIndex = 391;
//
@@ -856,17 +871,17 @@
//
// txt_fRemarks
//
- this.txt_fRemarks.Location = new System.Drawing.Point(114, 126);
+ this.txt_fRemarks.Location = new System.Drawing.Point(114, 136);
this.txt_fRemarks.Name = "txt_fRemarks";
this.txt_fRemarks.Properties.Appearance.Options.UseFont = true;
- this.txt_fRemarks.Size = new System.Drawing.Size(170, 24);
+ this.txt_fRemarks.Size = new System.Drawing.Size(165, 24);
this.txt_fRemarks.StyleController = this.layoutMx1;
this.txt_fRemarks.TabIndex = 371;
//
// txt_fOwnerTypeInIdHead
//
this.txt_fOwnerTypeInIdHead.EditValue = "缁勭粐(BD_OwnerOrg)";
- this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(390, 97);
+ this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(385, 105);
this.txt_fOwnerTypeInIdHead.Name = "txt_fOwnerTypeInIdHead";
this.txt_fOwnerTypeInIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -875,16 +890,16 @@
"渚涘簲鍟�(BD_Supplier)",
"瀹㈡埛(BD_Customer)"});
this.txt_fOwnerTypeInIdHead.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fOwnerTypeInIdHead.Size = new System.Drawing.Size(170, 24);
+ this.txt_fOwnerTypeInIdHead.Size = new System.Drawing.Size(165, 24);
this.txt_fOwnerTypeInIdHead.StyleController = this.layoutMx1;
this.txt_fOwnerTypeInIdHead.TabIndex = 382;
//
// txt_fCreateDate
//
- this.txt_fCreateDate.Location = new System.Drawing.Point(666, 40);
+ this.txt_fCreateDate.Location = new System.Drawing.Point(656, 43);
this.txt_fCreateDate.Name = "txt_fCreateDate";
this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreateDate.Size = new System.Drawing.Size(170, 24);
+ this.txt_fCreateDate.Size = new System.Drawing.Size(165, 24);
this.txt_fCreateDate.StyleController = this.layoutMx1;
this.txt_fCreateDate.TabIndex = 386;
this.txt_fCreateDate.Tag = "readonly";
@@ -892,7 +907,7 @@
// txt_fOwnerTypeIdHead
//
this.txt_fOwnerTypeIdHead.EditValue = "缁勭粐(BD_OwnerOrg)";
- this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(390, 68);
+ this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(385, 74);
this.txt_fOwnerTypeIdHead.Name = "txt_fOwnerTypeIdHead";
this.txt_fOwnerTypeIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -901,28 +916,28 @@
"渚涘簲鍟�(BD_Supplier)",
"瀹㈡埛(BD_Customer)"});
this.txt_fOwnerTypeIdHead.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fOwnerTypeIdHead.Size = new System.Drawing.Size(170, 24);
+ this.txt_fOwnerTypeIdHead.Size = new System.Drawing.Size(165, 24);
this.txt_fOwnerTypeIdHead.StyleController = this.layoutMx1;
this.txt_fOwnerTypeIdHead.TabIndex = 380;
//
// txt_fBusinessType
//
this.txt_fBusinessType.EditValue = "鏍囧噯(NORMAL)";
- this.txt_fBusinessType.Location = new System.Drawing.Point(114, 68);
+ this.txt_fBusinessType.Location = new System.Drawing.Point(114, 74);
this.txt_fBusinessType.Name = "txt_fBusinessType";
this.txt_fBusinessType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBusinessType.Properties.Items.AddRange(new object[] {
"鏍囧噯(NORMAL)"});
this.txt_fBusinessType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fBusinessType.Size = new System.Drawing.Size(170, 24);
+ this.txt_fBusinessType.Size = new System.Drawing.Size(165, 24);
this.txt_fBusinessType.StyleController = this.layoutMx1;
this.txt_fBusinessType.TabIndex = 374;
//
// txt_fTransferDirect
//
this.txt_fTransferDirect.EditValue = "-璇烽�夋嫨-";
- this.txt_fTransferDirect.Location = new System.Drawing.Point(114, 97);
+ this.txt_fTransferDirect.Location = new System.Drawing.Point(114, 105);
this.txt_fTransferDirect.Name = "txt_fTransferDirect";
this.txt_fTransferDirect.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -931,16 +946,16 @@
"閫�璐�(RETURN)",
"鏅��(GENERAL)"});
this.txt_fTransferDirect.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fTransferDirect.Size = new System.Drawing.Size(170, 24);
+ this.txt_fTransferDirect.Size = new System.Drawing.Size(165, 24);
this.txt_fTransferDirect.StyleController = this.layoutMx1;
this.txt_fTransferDirect.TabIndex = 362;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(666, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(656, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(170, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(165, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 384;
this.txt_createBy.Tag = "readonly";
@@ -950,7 +965,7 @@
this.txt_fBillNo.Location = new System.Drawing.Point(114, 12);
this.txt_fBillNo.Name = "txt_fBillNo";
this.txt_fBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_fBillNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_fBillNo.Size = new System.Drawing.Size(165, 24);
this.txt_fBillNo.StyleController = this.layoutMx1;
this.txt_fBillNo.TabIndex = 327;
this.txt_fBillNo.Tag = "readonly";
@@ -958,7 +973,7 @@
// txt_ftranstype
//
this.txt_ftranstype.EditValue = "缁勭粐鍐呰皟鎷�(InnerOrgTransfer)";
- this.txt_ftranstype.Location = new System.Drawing.Point(390, 40);
+ this.txt_ftranstype.Location = new System.Drawing.Point(385, 43);
this.txt_ftranstype.Name = "txt_ftranstype";
this.txt_ftranstype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -966,132 +981,132 @@
"缁勭粐鍐呰皟鎷�(InnerOrgTransfer)",
"璺ㄧ粍缁囪皟鎷�(OverOrgTransfer)"});
this.txt_ftranstype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_ftranstype.Size = new System.Drawing.Size(170, 24);
+ this.txt_ftranstype.Size = new System.Drawing.Size(165, 24);
this.txt_ftranstype.StyleController = this.layoutMx1;
this.txt_ftranstype.TabIndex = 378;
//
// txt_fapporgid
//
this.txt_fapporgid.IsReadly = false;
- this.txt_fapporgid.Location = new System.Drawing.Point(390, 12);
+ this.txt_fapporgid.Location = new System.Drawing.Point(385, 12);
this.txt_fapporgid.Name = "txt_fapporgid";
- this.txt_fapporgid.Size = new System.Drawing.Size(170, 24);
+ this.txt_fapporgid.Size = new System.Drawing.Size(165, 24);
this.txt_fapporgid.TabIndex = 376;
//
// txt_fBillTypeID
//
this.txt_fBillTypeID.EditValue = "鏍囧噯璋冩嫧鐢宠鍗�(DBSQD01_SYS)";
- this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 40);
+ this.txt_fBillTypeID.Location = new System.Drawing.Point(114, 43);
this.txt_fBillTypeID.Name = "txt_fBillTypeID";
this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
"鏍囧噯璋冩嫧鐢宠鍗�(DBSQD01_SYS)"});
this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fBillTypeID.Size = new System.Drawing.Size(170, 24);
+ this.txt_fBillTypeID.Size = new System.Drawing.Size(165, 24);
this.txt_fBillTypeID.StyleController = this.layoutMx1;
this.txt_fBillTypeID.TabIndex = 361;
//
// txt_chkBy
//
- this.txt_chkBy.Location = new System.Drawing.Point(942, 12);
+ this.txt_chkBy.Location = new System.Drawing.Point(927, 12);
this.txt_chkBy.Name = "txt_chkBy";
this.txt_chkBy.Properties.Appearance.Options.UseFont = true;
- this.txt_chkBy.Size = new System.Drawing.Size(172, 24);
+ this.txt_chkBy.Size = new System.Drawing.Size(166, 24);
this.txt_chkBy.StyleController = this.layoutMx1;
this.txt_chkBy.TabIndex = 258;
this.txt_chkBy.Tag = "readonly";
//
// txt_fapprovedate
//
- this.txt_fapprovedate.Location = new System.Drawing.Point(942, 40);
+ this.txt_fapprovedate.Location = new System.Drawing.Point(927, 43);
this.txt_fapprovedate.Name = "txt_fapprovedate";
this.txt_fapprovedate.Properties.Appearance.Options.UseFont = true;
- this.txt_fapprovedate.Size = new System.Drawing.Size(172, 24);
+ this.txt_fapprovedate.Size = new System.Drawing.Size(166, 24);
this.txt_fapprovedate.StyleController = this.layoutMx1;
this.txt_fapprovedate.TabIndex = 262;
this.txt_fapprovedate.Tag = "readonly";
//
// txt_wjStatus
//
- this.txt_wjStatus.Location = new System.Drawing.Point(564, 155);
+ this.txt_wjStatus.Location = new System.Drawing.Point(554, 167);
this.txt_wjStatus.Name = "txt_wjStatus";
this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_wjStatus.Size = new System.Drawing.Size(272, 24);
+ this.txt_wjStatus.Size = new System.Drawing.Size(267, 24);
this.txt_wjStatus.StyleController = this.layoutMx1;
this.txt_wjStatus.TabIndex = 387;
this.txt_wjStatus.Tag = "readonly";
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(840, 68);
+ this.txt_chkStatus.Location = new System.Drawing.Point(825, 74);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_chkStatus.Size = new System.Drawing.Size(274, 24);
+ this.txt_chkStatus.Size = new System.Drawing.Size(268, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 388;
this.txt_chkStatus.Tag = "readonly";
//
// txt_source
//
- this.txt_source.Location = new System.Drawing.Point(390, 155);
+ this.txt_source.Location = new System.Drawing.Point(385, 167);
this.txt_source.Name = "txt_source";
- this.txt_source.Size = new System.Drawing.Size(170, 24);
+ this.txt_source.Size = new System.Drawing.Size(165, 24);
this.txt_source.StyleController = this.layoutMx1;
this.txt_source.TabIndex = 390;
this.txt_source.Tag = "readonly";
//
// txt_fCloserId
//
- this.txt_fCloserId.Location = new System.Drawing.Point(666, 97);
+ this.txt_fCloserId.Location = new System.Drawing.Point(656, 105);
this.txt_fCloserId.Name = "txt_fCloserId";
- this.txt_fCloserId.Size = new System.Drawing.Size(170, 24);
+ this.txt_fCloserId.Size = new System.Drawing.Size(165, 24);
this.txt_fCloserId.StyleController = this.layoutMx1;
this.txt_fCloserId.TabIndex = 392;
this.txt_fCloserId.Tag = "readonly";
//
// txt_fCloseDate
//
- this.txt_fCloseDate.Location = new System.Drawing.Point(666, 126);
+ this.txt_fCloseDate.Location = new System.Drawing.Point(656, 136);
this.txt_fCloseDate.Name = "txt_fCloseDate";
- this.txt_fCloseDate.Size = new System.Drawing.Size(170, 24);
+ this.txt_fCloseDate.Size = new System.Drawing.Size(165, 24);
this.txt_fCloseDate.StyleController = this.layoutMx1;
this.txt_fCloseDate.TabIndex = 393;
this.txt_fCloseDate.Tag = "readonly";
//
// txt_fCloseStatusTxt
//
- this.txt_fCloseStatusTxt.Location = new System.Drawing.Point(666, 68);
+ this.txt_fCloseStatusTxt.Location = new System.Drawing.Point(656, 74);
this.txt_fCloseStatusTxt.Name = "txt_fCloseStatusTxt";
- this.txt_fCloseStatusTxt.Size = new System.Drawing.Size(170, 24);
+ this.txt_fCloseStatusTxt.Size = new System.Drawing.Size(165, 24);
this.txt_fCloseStatusTxt.StyleController = this.layoutMx1;
this.txt_fCloseStatusTxt.TabIndex = 394;
this.txt_fCloseStatusTxt.Tag = "readonly";
//
// txt_qt028
//
- this.txt_qt028.Location = new System.Drawing.Point(942, 97);
+ this.txt_qt028.Location = new System.Drawing.Point(927, 105);
this.txt_qt028.Name = "txt_qt028";
- this.txt_qt028.Size = new System.Drawing.Size(172, 24);
+ this.txt_qt028.Size = new System.Drawing.Size(166, 24);
this.txt_qt028.StyleController = this.layoutMx1;
this.txt_qt028.TabIndex = 395;
this.txt_qt028.Tag = "readonly";
//
// txt_qt027
//
- this.txt_qt027.Location = new System.Drawing.Point(942, 126);
+ this.txt_qt027.Location = new System.Drawing.Point(927, 136);
this.txt_qt027.Name = "txt_qt027";
- this.txt_qt027.Size = new System.Drawing.Size(172, 24);
+ this.txt_qt027.Size = new System.Drawing.Size(166, 24);
this.txt_qt027.StyleController = this.layoutMx1;
this.txt_qt027.TabIndex = 396;
this.txt_qt027.Tag = "readonly";
//
// txt_qt026
//
- this.txt_qt026.Location = new System.Drawing.Point(840, 155);
+ this.txt_qt026.Location = new System.Drawing.Point(825, 167);
this.txt_qt026.Name = "txt_qt026";
this.txt_qt026.Properties.Caption = "鍞悗瀹℃牳鐘舵��";
- this.txt_qt026.Size = new System.Drawing.Size(274, 24);
+ this.txt_qt026.Size = new System.Drawing.Size(268, 24);
this.txt_qt026.StyleController = this.layoutMx1;
this.txt_qt026.TabIndex = 397;
this.txt_qt026.Tag = "readonly";
@@ -1135,7 +1150,8 @@
this.layoutControlItem24,
this.layoutControlItem25,
this.layoutControlItem11,
- this.layoutControlItem17});
+ this.layoutControlItem17,
+ this.layoutControlItem26});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1170,7 +1186,7 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1126, 192);
+ this.Root.Size = new System.Drawing.Size(1105, 206);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1178,101 +1194,101 @@
this.layoutControlItem1.Control = this.txt_fBillNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fapporgid;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "鐢宠缁勭粐";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_createBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem3.Text = "鐢宠浜哄憳";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_fBillTypeID;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem4.Text = "鐢宠绫诲瀷";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_ftranstype;
- this.layoutControlItem5.Location = new System.Drawing.Point(276, 28);
+ this.layoutControlItem5.Location = new System.Drawing.Point(271, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem5.Text = "璋冩嫧绫诲瀷 ";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fCreateDate;
- this.layoutControlItem6.Location = new System.Drawing.Point(552, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(542, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem6.Text = "鐢宠鏃堕棿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fBusinessType;
- this.layoutControlItem7.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem7.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem7.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem7.Text = "涓氬姟绫诲瀷";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fOwnerTypeIdHead;
- this.layoutControlItem8.Location = new System.Drawing.Point(276, 56);
+ this.layoutControlItem8.Location = new System.Drawing.Point(271, 62);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem8.Text = "璋冨嚭璐т富绫诲瀷";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_chkBy;
- this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fapprovedate;
- this.layoutControlItem10.Location = new System.Drawing.Point(828, 28);
+ this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem10.Tag = "readonly";
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
@@ -1280,53 +1296,53 @@
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_fTransferDirect;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 85);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem13.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem13.Text = "璋冩嫧鏂瑰悜";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fOwnerTypeInIdHead;
- this.layoutControlItem14.Location = new System.Drawing.Point(276, 85);
+ this.layoutControlItem14.Location = new System.Drawing.Point(271, 93);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem14.Text = "璋冨叆璐т富绫诲瀷";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_djtype;
- this.layoutControlItem19.Location = new System.Drawing.Point(276, 114);
+ this.layoutControlItem19.Location = new System.Drawing.Point(271, 124);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem19.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem19.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fRemarks;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 114);
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem15.Text = "鐢宠澶囨敞";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_chkStatus;
- this.layoutControlItem12.Location = new System.Drawing.Point(828, 56);
+ this.layoutControlItem12.Location = new System.Drawing.Point(813, 62);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem12.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem12.Text = "瀹℃牳鐘舵��";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
@@ -1334,66 +1350,66 @@
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_fCloseDate;
- this.layoutControlItem21.Location = new System.Drawing.Point(552, 114);
+ this.layoutControlItem21.Location = new System.Drawing.Point(542, 124);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem21.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem21.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem21.Text = "鍏抽棴鏃堕棿";
this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_fCloserId;
- this.layoutControlItem20.Location = new System.Drawing.Point(552, 85);
+ this.layoutControlItem20.Location = new System.Drawing.Point(542, 93);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem20.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem20.Text = "鍏抽棴浜哄憳";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_fCloseStatusTxt;
- this.layoutControlItem22.Location = new System.Drawing.Point(552, 56);
+ this.layoutControlItem22.Location = new System.Drawing.Point(542, 62);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem22.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem22.Text = "鍏抽棴鐘舵��";
this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_qt028;
- this.layoutControlItem23.Location = new System.Drawing.Point(828, 85);
+ this.layoutControlItem23.Location = new System.Drawing.Point(813, 93);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem23.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem23.Text = "鍞悗瀹℃牳浜哄憳";
this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_qt027;
- this.layoutControlItem24.Location = new System.Drawing.Point(828, 114);
+ this.layoutControlItem24.Location = new System.Drawing.Point(813, 124);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem24.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem24.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem24.Text = "鍞悗瀹℃牳鏃堕棿";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_qt026;
- this.layoutControlItem25.Location = new System.Drawing.Point(828, 143);
+ this.layoutControlItem25.Location = new System.Drawing.Point(813, 155);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem25.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem25.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem25.Text = "鍞悗瀹℃牳鐘舵��";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
@@ -1401,11 +1417,11 @@
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_wjStatus;
- this.layoutControlItem11.Location = new System.Drawing.Point(552, 143);
+ this.layoutControlItem11.Location = new System.Drawing.Point(542, 155);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem11.Text = "瀹岀粨鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -1413,13 +1429,27 @@
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_source;
- this.layoutControlItem17.Location = new System.Drawing.Point(276, 143);
+ this.layoutControlItem17.Location = new System.Drawing.Point(271, 155);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem17.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem17.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem17.Text = "婧愬崟绫诲瀷";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem26
+ //
+ this.layoutControlItem26.Control = this.btnCopyXls;
+ this.layoutControlItem26.Location = new System.Drawing.Point(0, 155);
+ this.layoutControlItem26.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem26.MinSize = new System.Drawing.Size(90, 31);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem26.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem26.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem26.Text = "蹇嵎褰曞叆";
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem26.TextVisible = false;
//
// tabMx
//
@@ -1973,7 +2003,7 @@
//
// gridColumn21
//
- this.gridColumn21.Caption = "璋冨嚭璐т富Gui";
+ this.gridColumn21.Caption = "璋冨嚭璐т富Guid";
this.gridColumn21.ColumnEdit = this.rptDcHz;
this.gridColumn21.FieldName = "dcHzGuid";
this.gridColumn21.MinWidth = 25;
@@ -2091,6 +2121,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2259,5 +2290,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn51;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn52;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn53;
+ private DevExpress.XtraEditors.SimpleButton btnCopyXls;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index b1cbc5c..459dfc5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -7,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.IO;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -86,6 +87,73 @@
gvMx1.SetFocusedRowCellValue("dcHz", _orgName);
gvMx1.SetFocusedRowCellValue("dcHzGuid", _orgId);
};
+
+ #region 2025-08-27 澶嶅埗beg
+ btnCopyXls.Click += (s, e) =>
+ {
+ string kcZz = txt_fapporgid.GetId();
+ if (string.IsNullOrEmpty(kcZz))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨鐢宠缁勭粐鍚庢墠鑳戒娇鐢ㄥ鍒跺姛鑳斤紒");
+ txt_fapporgid.Focus();
+ return;
+ }
+ string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
+ if (File.Exists(filePath))
+ {
+ var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.鐗╂枡璋冩嫧.ToString());
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ string _orgId = txt_fapporgid.GetId();
+ string _orgName = txt_fapporgid.GetName();
+ var lst = ee.DynamicList;
+ DataTable _Table = (DataTable)gcMx1.DataSource;
+ foreach (dynamic dym in lst)
+ {
+ DataRow _row = _Table.NewRow();
+ _row["itemNo"] = dym.itemNo;
+ _row["itemName"] = dym.itemName;
+ _row["itemModel"] = dym.itemModel;
+ _row["itemUnit"] = dym.dwName;
+ _row["itemId"] = dym.itemId;
+ _row["shNum"] = dym.sl;
+ _row["remark"] = dym.bz;
+ if (!string.IsNullOrEmpty(_orgId))
+ {
+ _row["dcOrg"] = _orgName;
+ _row["dcOrgGuid"] = _orgId;
+ _row["drOrg"] = _orgName;
+ _row["drOrgGuid"] = _orgId;
+ _row["drHz"] = _orgName;
+ _row["drHzGuid"] = _orgId;
+ _row["dcHz"] = _orgName;
+ _row["dcHzGuid"] = _orgId;
+ }
+ _Table.Rows.Add(_row);
+ }
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _Table;
+ gcMx1.ForceInitialize();
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
+ }
+ catch (Exception ex)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鎵句笉鍒皒lsCopy.xls鏂囦欢锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ };
+ #endregion
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx
index a4826a3..fde1187 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.resx
@@ -117,6 +117,24 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btnCopyXls.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs
+ O4ktWcsAAAJgSURBVDhPjdFdSFNhHMfx1XQvbhokvdx00X3ddlEEQRB0WzeRvYBFkESRWVgstZpz5ZL5
+ Oo0CaysbFBlWSos2hroU1wsWmFA3WelyO9s82862s/36P4+4zqKLDnyQB5//9zx7jgpAgdFoVHc6g75u
+ 11t0ud6RIDqcQbQz96ZgJ7bb437ap1mZ+TtQ2uGcQj4PkudyTG6ZTG7emQTt0xcC9KwialKi1WoNg54Z
+ SJIEIZrgwkICkWgKMTGDdDaHG30BFihTBtSW3oDP2vcGLb0TJACLYwzNjgDM5FrPGG4NBBESREiZHCw9
+ oyxgUAZKmx2jRcdWHp0du9Hux49fUaTSMpra/SxgVAY0VztZIA8xmeWWkjIXF2V+bJPNi2/zAhKSDFOb
+ lwXKlQFtfauXvzGWyCLKiFkISxmOvfWs+SW+zC0iTv+7YPWwQIUyoDvf4uHHZQMRuqwI/Y1RRExl6XfL
+ ePZ6BqFwHIlUBi98n6HX6ytproSwy1eVnWp8jqycRyiaJhIWBInelsHcyCBmG2oKPpj3I9C6owgLGE6a
+ hiiQwzwNRuJpGk4jHEti9nIN4HVxKdd1DBzaDAgPufi0ma954PjFp8jQZf2MLH/vu8OfcODKSMEJ+znU
+ 9W8p8n346J9Add0Tfttx9hUSEvaccWNCBOeeDmFf/SYsop8b/9rE18qArur0fd+R2sc4XPsI7qH3PNDw
+ aoGr7p7gA86PO7lLD7byddfejbDuXm9jgdVETyrIGrLhfwK0by3R8G+pRI9uW5UDSruOrSuy/WBlGx9m
+ zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg==
+</value>
+ </data>
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 966eb87..2da2b2e 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -509,6 +509,12 @@
<Compile Include="DevFrm\PDA\SelectItem.Designer.cs">
<DependentUpon>SelectItem.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\PDA\SelectKW.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\PDA\SelectKW.Designer.cs">
+ <DependentUpon>SelectKW.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\PDA\SelectLine.cs">
<SubType>Form</SubType>
</Compile>
@@ -1744,6 +1750,9 @@
<EmbeddedResource Include="DevFrm\PDA\SelectItem.resx">
<DependentUpon>SelectItem.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\PDA\SelectKW.resx">
+ <DependentUpon>SelectKW.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\PDA\SelectLine.resx">
<DependentUpon>SelectLine.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 07e1a34..b369d8a 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2527,7 +2527,8 @@
public enum OrderType
{
- 鍏跺畠鍏ュ簱
+ 鍏跺畠鍏ュ簱,
+ 鐗╂枡璋冩嫧
}
diff --git a/DevApp/Gs.DevApp/UserControl/CopyXls.cs b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
index 031e8ca..7854fe6 100644
--- a/DevApp/Gs.DevApp/UserControl/CopyXls.cs
+++ b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
@@ -1,12 +1,16 @@
锘縰sing CefSharp.DevTools.Debugger;
using DevExpress.Spreadsheet;
+using DevExpress.Utils.DirectXPaint;
using DevExpress.XtraEditors;
+using DevExpress.XtraLayout.Customization;
using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Configuration;
using System.Data;
+using System.Data.SqlTypes;
using System.Drawing;
using System.IO;
using System.Linq;
@@ -23,7 +27,7 @@
private string orgId;
private static readonly string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
- public CopyXls(string orgId, string _orderGuid, string _orderType, string _orgId)
+ public CopyXls(string _orgId, string _orderGuid, string _orderType)
{
InitializeComponent();
this.orderType = _orderType;
@@ -36,10 +40,20 @@
{
IWorkbook workbook = spreadsheetControl1.Document;
workbook.LoadDocument(filePath);
- SetCellText(spreadsheetControl1.ActiveWorksheet, "A1", "鐗╂枡缂栧彿", true);
- SetCellText(spreadsheetControl1.ActiveWorksheet, "B1", "鐢宠鏁伴噺", true);
- SetCellText(spreadsheetControl1.ActiveWorksheet, "C1", "鐢宠澶囨敞", true);
- SetCellText(spreadsheetControl1.ActiveWorksheet, "D1", "涓嶈壇绫诲瀷", true);
+ switch (this.orderType)
+ {
+ case "鍏跺畠鍏ュ簱":
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "A1", "鐗╂枡缂栧彿", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "B1", "鐢宠鏁伴噺", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "C1", "鐢宠澶囨敞", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "D1", "涓嶈壇绫诲瀷", true);
+ break;
+ case "鐗╂枡璋冩嫧":
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "A1", "鐗╂枡缂栧彿", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "B1", "鐢宠鏁伴噺", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "C1", "鐢宠澶囨敞", true);
+ break;
+ }
}
else
{
@@ -60,7 +74,6 @@
}
else
{
- //Text = "姝ｅ湪浠庛��" + fileName + "銆戝鍒跺埌銆�" + this.orderType.ToString()+"銆�";
Text = "姝ｅ湪蹇嵎褰曞叆鍒般��" + this.orderType.ToString() + "銆戯紝缁勭粐ID涓恒��" + this.orgId.ToString() + "銆�";
}
}
@@ -72,21 +85,114 @@
/// <param name="e"></param>
private void btnSave_Click(object sender, EventArgs e)
{
- var list = new List<dynamic>();
- for (int row = 2; row <= spreadsheetControl1.ActiveWorksheet.GetUsedRange().RowCount; row++)
+ int rowsCount = spreadsheetControl1.ActiveWorksheet.GetUsedRange().RowCount;
+ spreadsheetControl1.ActiveWorksheet.MoveToEnd();
+ if (rowsCount < 2)
{
- string itemNo = spreadsheetControl1.ActiveWorksheet.Cells["A1"].Value.ToString();
- string sl = spreadsheetControl1.ActiveWorksheet.Cells["B1"].Value.ToString();
- string bz = spreadsheetControl1.ActiveWorksheet.Cells["C1"].Value.ToString();
- string bllx = spreadsheetControl1.ActiveWorksheet.Cells["D1"].Value.ToString();
- list.Add(new
- {
- itemNo = itemNo,
- sl = sl,
- bz = bz,
- bllx = bllx,
- });
+ MsgHelper.ShowError("澶嶅埗澶辫触锛氳〃鏍间笉鑳戒负绌猴紒");
+ return;
}
+ if (!MsgHelper.AskQuestion("鍏辨湁銆�" + (rowsCount - 1).ToString() + "銆戞潯鏁版嵁锛岀‘瀹氬鍒跺悧锛�"))
+ return;
+ var list = new List<dynamic>();
+ switch (this.orderType)
+ {
+ case "鍏跺畠鍏ュ簱":
+ #region MyRegion
+ {
+ for (int row = 2; row <= rowsCount; row++)
+ {
+ string itemNo = spreadsheetControl1.ActiveWorksheet.Cells["A" + row.ToString()].Value.ToString().Trim();
+ string sl = spreadsheetControl1.ActiveWorksheet.Cells["B" + row.ToString()].Value.ToString().Trim();
+ string bz = spreadsheetControl1.ActiveWorksheet.Cells["C" + row.ToString()].Value.ToString().Trim();
+ string bllx = spreadsheetControl1.ActiveWorksheet.Cells["D" + row.ToString()].Value.ToString().Trim();
+ var _obj = new
+ {
+ itemNo = itemNo,
+ orgId = this.orgId,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "MesItemsManager/GetModelByOrg", JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ var dy = _rtn.rtnData;
+ list.Add(new
+ {
+ itemNo = itemNo,
+ sl = sl,
+ bz = bz,
+ bllx = bllx,
+ itemName = dy.itemName,
+ itemModel = dy.itemModel,
+ dwName = dy.kfName,
+ itemId = dy.itemId
+ });
+ }
+ else
+ {
+ MsgHelper.ShowError("澶嶅埗澶辫触锛氥��" + itemNo + "銆戝彲鑳戒笉瀛樺湪,璇锋鏌ュ悗閲嶈瘯锛�");
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("澶嶅埗澶辫触锛氥��" + itemNo + "銆戝彂鐢熼敊璇�,璇锋鏌ュ悗閲嶈瘯锛�" + ex.Message);
+ return;
+ }
+ }
+ }
+ #endregion
+ break;
+ case "鐗╂枡璋冩嫧":
+ #region MyRegion
+ {
+ for (int row = 2; row <= rowsCount; row++)
+ {
+ string itemNo = spreadsheetControl1.ActiveWorksheet.Cells["A" + row.ToString()].Value.ToString().Trim();
+ string sl = spreadsheetControl1.ActiveWorksheet.Cells["B" + row.ToString()].Value.ToString().Trim();
+ string bz = spreadsheetControl1.ActiveWorksheet.Cells["C" + row.ToString()].Value.ToString().Trim();
+ var _obj = new
+ {
+ itemNo = itemNo,
+ orgId = this.orgId,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "MesItemsManager/GetModelByOrg", JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ var dy = _rtn.rtnData;
+ list.Add(new
+ {
+ itemNo = itemNo,
+ sl = sl,
+ bz = bz,
+ itemName = dy.itemName,
+ itemModel = dy.itemModel,
+ dwName = dy.kfName,
+ itemId = dy.itemId
+ });
+ }
+ else
+ {
+ MsgHelper.ShowError("澶嶅埗澶辫触锛氥��" + itemNo + "銆戝彲鑳戒笉瀛樺湪,璇锋鏌ュ悗閲嶈瘯锛�");
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("澶嶅埗澶辫触锛氥��" + itemNo + "銆戝彂鐢熼敊璇�,璇锋鏌ュ悗閲嶈瘯锛�" + ex.Message);
+ return;
+ }
+ }
+ }
+ #endregion
+ break;
+ }
+
UpdateParent?.Invoke(this,
new UpdateParentEventArgs { DynamicList = list });
Close();
--
Gitblit v1.9.3