From a9ab7535113cf39d419860c691a6fcf763122307 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 24 十月 2025 17:11:17 +0800
Subject: [PATCH] 1、采购退货申请 2、采购退货单 3、采购入库 4、iqc报表

---
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs          |   14 +
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs |   30 +++
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs      |   32 +++
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs |  419 +++++++++++++++++++++++++--------------------
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs        |   31 +++
 5 files changed, 337 insertions(+), 189 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
index c3d6eab..de75216 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -219,9 +219,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(3, 2, 3, 2);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(987, 62);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -229,10 +230,11 @@
             // xtraTabControl1
             // 
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(987, 468);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -241,8 +243,9 @@
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(985, 442);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -251,6 +254,7 @@
             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(3, 2, 3, 2);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -263,17 +267,19 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1126, 570);
+            this.split1.Size = new System.Drawing.Size(985, 442);
             this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+            this.gcMain1.Size = new System.Drawing.Size(985, 402);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -283,7 +289,7 @@
             this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.ColumnPanelRowHeight = 50;
+            this.gridView1.ColumnPanelRowHeight = 39;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn1,
             this.gv_status,
@@ -300,8 +306,9 @@
             this.gv_remark,
             this.gridColumn7,
             this.gridColumn11});
+            this.gridView1.DetailHeight = 272;
             this.gridView1.GridControl = this.gcMain1;
-            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.IndicatorWidth = 44;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -311,195 +318,206 @@
             // 
             this.gridColumn1.Caption = "閫�璐х粍缁�";
             this.gridColumn1.FieldName = "receivingOrg";
+            this.gridColumn1.MinWidth = 17;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Tag = "org.fnamber";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 0;
-            this.gridColumn1.Width = 250;
+            this.gridColumn1.Width = 60;
             // 
             // gv_status
             // 
             this.gv_status.AppearanceCell.Options.UseFont = true;
             this.gv_status.Caption = "瀹℃牳鐘舵��";
             this.gv_status.FieldName = "status";
-            this.gv_status.MaxWidth = 50;
-            this.gv_status.MinWidth = 50;
+            this.gv_status.MaxWidth = 44;
+            this.gv_status.MinWidth = 44;
             this.gv_status.Name = "gv_status";
             this.gv_status.OptionsColumn.AllowEdit = false;
             this.gv_status.Tag = "query_a.STATUS";
             this.gv_status.Visible = true;
             this.gv_status.VisibleIndex = 1;
-            this.gv_status.Width = 50;
+            this.gv_status.Width = 44;
             // 
             // gv_isFinish
             // 
             this.gv_isFinish.AppearanceCell.Options.UseFont = true;
             this.gv_isFinish.Caption = "鏄惁瀹屾垚";
             this.gv_isFinish.FieldName = "isFinish";
-            this.gv_isFinish.MaxWidth = 50;
-            this.gv_isFinish.MinWidth = 50;
+            this.gv_isFinish.MaxWidth = 44;
+            this.gv_isFinish.MinWidth = 44;
             this.gv_isFinish.Name = "gv_isFinish";
             this.gv_isFinish.OptionsColumn.AllowEdit = false;
             this.gv_isFinish.Tag = "query_a.IS_FINISH";
-            this.gv_isFinish.Width = 50;
+            this.gv_isFinish.Width = 44;
             // 
             // gv_isOut
             // 
             this.gv_isOut.AppearanceCell.Options.UseFont = true;
             this.gv_isOut.Caption = "濮斿鏍囪瘑";
             this.gv_isOut.FieldName = "isOut";
-            this.gv_isOut.MaxWidth = 50;
-            this.gv_isOut.MinWidth = 50;
+            this.gv_isOut.MaxWidth = 44;
+            this.gv_isOut.MinWidth = 44;
             this.gv_isOut.Name = "gv_isOut";
             this.gv_isOut.OptionsColumn.AllowEdit = false;
             this.gv_isOut.Tag = "query_a.IS_OUT";
             this.gv_isOut.Visible = true;
             this.gv_isOut.VisibleIndex = 2;
-            this.gv_isOut.Width = 50;
+            this.gv_isOut.Width = 44;
             // 
             // gv_billNo
             // 
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍗曟嵁缂栫爜";
             this.gv_billNo.FieldName = "billNo";
+            this.gv_billNo.MinWidth = 17;
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.BILL_NO";
             this.gv_billNo.Visible = true;
             this.gv_billNo.VisibleIndex = 3;
-            this.gv_billNo.Width = 120;
+            this.gv_billNo.Width = 90;
             // 
             // gv_lastUpdateUser
             // 
             this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true;
             this.gv_lastUpdateUser.Caption = "鏈�鍚庤窡鏂颁汉 ";
             this.gv_lastUpdateUser.FieldName = "lastUpdateUser";
+            this.gv_lastUpdateUser.MinWidth = 17;
             this.gv_lastUpdateUser.Name = "gv_lastUpdateUser";
             this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false;
             this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER";
             this.gv_lastUpdateUser.Visible = true;
             this.gv_lastUpdateUser.VisibleIndex = 4;
-            this.gv_lastUpdateUser.Width = 94;
+            this.gv_lastUpdateUser.Width = 69;
             // 
             // gv_lastUpdateTime
             // 
             this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
             this.gv_lastUpdateTime.Caption = "鏈�鍚庝慨鏀规椂闂� ";
             this.gv_lastUpdateTime.FieldName = "lastUpdateTime";
+            this.gv_lastUpdateTime.MinWidth = 17;
             this.gv_lastUpdateTime.Name = "gv_lastUpdateTime";
             this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
             this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";
             this.gv_lastUpdateTime.Visible = true;
             this.gv_lastUpdateTime.VisibleIndex = 5;
-            this.gv_lastUpdateTime.Width = 180;
+            this.gv_lastUpdateTime.Width = 135;
             // 
             // gv_checkUser
             // 
             this.gv_checkUser.AppearanceCell.Options.UseFont = true;
             this.gv_checkUser.Caption = "瀹℃牳浜� ";
             this.gv_checkUser.FieldName = "checkUser";
+            this.gv_checkUser.MinWidth = 17;
             this.gv_checkUser.Name = "gv_checkUser";
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.CHECK_USER";
             this.gv_checkUser.Visible = true;
             this.gv_checkUser.VisibleIndex = 6;
-            this.gv_checkUser.Width = 94;
+            this.gv_checkUser.Width = 69;
             // 
             // gv_checkDate
             // 
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "瀹℃牳鏃堕棿 ";
             this.gv_checkDate.FieldName = "checkDate";
+            this.gv_checkDate.MinWidth = 17;
             this.gv_checkDate.Name = "gv_checkDate";
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.CHECK_DATE";
             this.gv_checkDate.Visible = true;
             this.gv_checkDate.VisibleIndex = 7;
-            this.gv_checkDate.Width = 94;
+            this.gv_checkDate.Width = 69;
             // 
             // gv_returnMethod
             // 
             this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
             this.gv_returnMethod.Caption = "閫�鏂欐柟寮� ";
             this.gv_returnMethod.FieldName = "returnMethod";
+            this.gv_returnMethod.MinWidth = 17;
             this.gv_returnMethod.Name = "gv_returnMethod";
             this.gv_returnMethod.OptionsColumn.AllowEdit = false;
             this.gv_returnMethod.Tag = "query_a.RETURN_METHOD";
             this.gv_returnMethod.Visible = true;
             this.gv_returnMethod.VisibleIndex = 8;
-            this.gv_returnMethod.Width = 94;
+            this.gv_returnMethod.Width = 69;
             // 
             // gv_returnType
             // 
             this.gv_returnType.AppearanceCell.Options.UseFont = true;
             this.gv_returnType.Caption = "閫�鏂欑被鍨� ";
             this.gv_returnType.FieldName = "returnType";
+            this.gv_returnType.MinWidth = 17;
             this.gv_returnType.Name = "gv_returnType";
             this.gv_returnType.OptionsColumn.AllowEdit = false;
             this.gv_returnType.Tag = "query_a.RETURN_TYPE";
             this.gv_returnType.Visible = true;
             this.gv_returnType.VisibleIndex = 9;
-            this.gv_returnType.Width = 94;
+            this.gv_returnType.Width = 69;
             // 
             // gv_suppId
             // 
             this.gv_suppId.AppearanceCell.Options.UseFont = true;
             this.gv_suppId.Caption = "渚涘簲鍟�";
             this.gv_suppId.FieldName = "supName";
+            this.gv_suppId.MinWidth = 17;
             this.gv_suppId.Name = "gv_suppId";
             this.gv_suppId.OptionsColumn.AllowEdit = false;
             this.gv_suppId.Tag = "query_a.SUPP_ID";
             this.gv_suppId.Visible = true;
             this.gv_suppId.VisibleIndex = 10;
-            this.gv_suppId.Width = 94;
+            this.gv_suppId.Width = 69;
             // 
             // gv_remark
             // 
             this.gv_remark.AppearanceCell.Options.UseFont = true;
             this.gv_remark.Caption = "鐢宠澶囨敞";
             this.gv_remark.FieldName = "remark";
+            this.gv_remark.MinWidth = 17;
             this.gv_remark.Name = "gv_remark";
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.REMARK";
             this.gv_remark.Visible = true;
             this.gv_remark.VisibleIndex = 11;
-            this.gv_remark.Width = 94;
+            this.gv_remark.Width = 69;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "涓婚敭GUID";
             this.gridColumn7.FieldName = "guid";
-            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.MinWidth = 22;
             this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Width = 94;
+            this.gridColumn7.Width = 82;
             // 
             // gridColumn11
             // 
             this.gridColumn11.Caption = "婧愬崟";
             this.gridColumn11.FieldName = "fHasLinkTxt";
-            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.MinWidth = 22;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
             this.gridColumn11.VisibleIndex = 12;
-            this.gridColumn11.Width = 94;
+            this.gridColumn11.Width = 83;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 519);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.pageBar1.Location = new System.Drawing.Point(0, 402);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+            this.pageBar1.Size = new System.Drawing.Size(985, 30);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage2.Size = new System.Drawing.Size(985, 442);
             this.xtraTabPage2.Text = "鏁版嵁璇︽儏";
             // 
             // splitMx1
@@ -507,6 +525,7 @@
             this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx1.Horizontal = false;
             this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.splitMx1.Name = "splitMx1";
             // 
             // splitMx1.Panel1
@@ -519,8 +538,8 @@
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
-            this.splitMx1.SplitterPosition = 166;
+            this.splitMx1.Size = new System.Drawing.Size(985, 442);
+            this.splitMx1.SplitterPosition = 129;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -550,52 +569,57 @@
             this.layoutControlItem17,
             this.layoutControlItem13});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(832, 224, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 166);
+            this.layoutMx1.Size = new System.Drawing.Size(985, 129);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
             // txt_fOwnerIdHead
             // 
             this.txt_fOwnerIdHead.IsReadly = false;
-            this.txt_fOwnerIdHead.Location = new System.Drawing.Point(355, 132);
+            this.txt_fOwnerIdHead.Location = new System.Drawing.Point(306, 112);
+            this.txt_fOwnerIdHead.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_fOwnerIdHead.Name = "txt_fOwnerIdHead";
-            this.txt_fOwnerIdHead.Size = new System.Drawing.Size(195, 24);
+            this.txt_fOwnerIdHead.Size = new System.Drawing.Size(175, 20);
             this.txt_fOwnerIdHead.TabIndex = 537;
             // 
             // txt_fPurchaseDeptId
             // 
             this.txt_fPurchaseDeptId.IsReadly = false;
-            this.txt_fPurchaseDeptId.Location = new System.Drawing.Point(626, 132);
+            this.txt_fPurchaseDeptId.Location = new System.Drawing.Point(543, 112);
+            this.txt_fPurchaseDeptId.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_fPurchaseDeptId.Name = "txt_fPurchaseDeptId";
-            this.txt_fPurchaseDeptId.Size = new System.Drawing.Size(195, 24);
+            this.txt_fPurchaseDeptId.Size = new System.Drawing.Size(175, 20);
             this.txt_fPurchaseDeptId.TabIndex = 535;
             // 
             // txt_fRequireOrgId
             // 
             this.txt_fRequireOrgId.IsReadly = false;
-            this.txt_fRequireOrgId.Location = new System.Drawing.Point(84, 132);
+            this.txt_fRequireOrgId.Location = new System.Drawing.Point(69, 112);
+            this.txt_fRequireOrgId.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_fRequireOrgId.Name = "txt_fRequireOrgId";
-            this.txt_fRequireOrgId.Size = new System.Drawing.Size(195, 24);
+            this.txt_fRequireOrgId.Size = new System.Drawing.Size(175, 20);
             this.txt_fRequireOrgId.TabIndex = 534;
             // 
             // btnSelect
             // 
             this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
-            this.btnSelect.Location = new System.Drawing.Point(12, 96);
+            this.btnSelect.Location = new System.Drawing.Point(11, 82);
+            this.btnSelect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(116, 27);
+            this.btnSelect.Size = new System.Drawing.Size(101, 20);
             this.btnSelect.StyleController = this.layoutMx1;
             this.btnSelect.TabIndex = 525;
             this.btnSelect.Text = "閫夋嫨閫�璐ф槑缁�";
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(840, 114);
+            this.lbGuid.Location = new System.Drawing.Point(735, 89);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(274, 30);
+            this.lbGuid.Size = new System.Drawing.Size(240, 23);
             this.lbGuid.TabIndex = 1;
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
@@ -603,15 +627,17 @@
             // txt_thOrgId
             // 
             this.txt_thOrgId.IsReadly = false;
-            this.txt_thOrgId.Location = new System.Drawing.Point(84, 40);
+            this.txt_thOrgId.Location = new System.Drawing.Point(69, 34);
+            this.txt_thOrgId.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_thOrgId.Name = "txt_thOrgId";
-            this.txt_thOrgId.Size = new System.Drawing.Size(195, 24);
+            this.txt_thOrgId.Size = new System.Drawing.Size(175, 20);
             this.txt_thOrgId.TabIndex = 526;
             // 
             // txt_returnType
             // 
             this.txt_returnType.EditValue = "-璇烽�夋嫨-";
-            this.txt_returnType.Location = new System.Drawing.Point(355, 40);
+            this.txt_returnType.Location = new System.Drawing.Point(306, 34);
+            this.txt_returnType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_returnType.Name = "txt_returnType";
             this.txt_returnType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -623,16 +649,17 @@
             "渚涘簲鍟嗙墿鍝佸彿閿欒",
             "閲囪喘鏂欏彿鍙樻洿"});
             this.txt_returnType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_returnType.Size = new System.Drawing.Size(195, 24);
+            this.txt_returnType.Size = new System.Drawing.Size(175, 20);
             this.txt_returnType.StyleController = this.layoutMx1;
             this.txt_returnType.TabIndex = 521;
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+            this.txt_billNo.Location = new System.Drawing.Point(69, 10);
+            this.txt_billNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(195, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(175, 20);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             this.txt_billNo.Tag = "readonly";
@@ -640,7 +667,8 @@
             // txt_returnMethod
             // 
             this.txt_returnMethod.EditValue = "-璇烽�夋嫨-";
-            this.txt_returnMethod.Location = new System.Drawing.Point(355, 12);
+            this.txt_returnMethod.Location = new System.Drawing.Point(306, 10);
+            this.txt_returnMethod.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_returnMethod.Name = "txt_returnMethod";
             this.txt_returnMethod.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -649,35 +677,38 @@
             "閫�鏂欒ˉ鏂�",
             "閫�鏂欏苟鎵f"});
             this.txt_returnMethod.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_returnMethod.Size = new System.Drawing.Size(195, 24);
+            this.txt_returnMethod.Size = new System.Drawing.Size(175, 20);
             this.txt_returnMethod.StyleController = this.layoutMx1;
             this.txt_returnMethod.TabIndex = 520;
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(897, 40);
+            this.txt_checkDate.Location = new System.Drawing.Point(780, 34);
+            this.txt_checkDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_checkDate.Name = "txt_checkDate";
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(196, 24);
+            this.txt_checkDate.Size = new System.Drawing.Size(177, 20);
             this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 226;
             this.txt_checkDate.Tag = "readonly";
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(355, 68);
+            this.txt_remark.Location = new System.Drawing.Point(306, 58);
+            this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(195, 24);
+            this.txt_remark.Size = new System.Drawing.Size(175, 20);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 252;
             // 
             // txt_checkUser
             // 
-            this.txt_checkUser.Location = new System.Drawing.Point(897, 12);
+            this.txt_checkUser.Location = new System.Drawing.Point(780, 10);
+            this.txt_checkUser.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_checkUser.Name = "txt_checkUser";
             this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(196, 24);
+            this.txt_checkUser.Size = new System.Drawing.Size(177, 20);
             this.txt_checkUser.StyleController = this.layoutMx1;
             this.txt_checkUser.TabIndex = 222;
             this.txt_checkUser.Tag = "readonly";
@@ -685,77 +716,84 @@
             // txt_suppId
             // 
             this.txt_suppId.IsReadly = false;
-            this.txt_suppId.Location = new System.Drawing.Point(84, 68);
+            this.txt_suppId.Location = new System.Drawing.Point(69, 58);
             this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
             this.txt_suppId.Name = "txt_suppId";
-            this.txt_suppId.Size = new System.Drawing.Size(195, 24);
+            this.txt_suppId.Size = new System.Drawing.Size(175, 20);
             this.txt_suppId.TabIndex = 259;
             // 
             // txt_isOut
             // 
-            this.txt_isOut.Location = new System.Drawing.Point(554, 68);
+            this.txt_isOut.Location = new System.Drawing.Point(485, 58);
+            this.txt_isOut.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_isOut.Name = "txt_isOut";
             this.txt_isOut.Properties.Caption = "濮斿鏍囪瘑";
-            this.txt_isOut.Size = new System.Drawing.Size(267, 24);
+            this.txt_isOut.Size = new System.Drawing.Size(233, 20);
             this.txt_isOut.StyleController = this.layoutMx1;
             this.txt_isOut.TabIndex = 527;
             this.txt_isOut.Tag = "readOnly";
             // 
             // txt_status
             // 
-            this.txt_status.Location = new System.Drawing.Point(825, 68);
+            this.txt_status.Location = new System.Drawing.Point(722, 58);
+            this.txt_status.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_status.Name = "txt_status";
             this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_status.Size = new System.Drawing.Size(268, 24);
+            this.txt_status.Size = new System.Drawing.Size(235, 20);
             this.txt_status.StyleController = this.layoutMx1;
             this.txt_status.TabIndex = 528;
             this.txt_status.Tag = "readonly";
             // 
             // txt_isFinish
             // 
-            this.txt_isFinish.Location = new System.Drawing.Point(825, 96);
+            this.txt_isFinish.Location = new System.Drawing.Point(722, 82);
+            this.txt_isFinish.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_isFinish.Name = "txt_isFinish";
             this.txt_isFinish.Properties.Caption = "瀹岀粨鏍囪瘑";
-            this.txt_isFinish.Size = new System.Drawing.Size(268, 24);
+            this.txt_isFinish.Size = new System.Drawing.Size(235, 20);
             this.txt_isFinish.StyleController = this.layoutMx1;
             this.txt_isFinish.TabIndex = 529;
             this.txt_isFinish.Tag = "readonly";
             // 
             // lastUpdateUser
             // 
-            this.lastUpdateUser.Location = new System.Drawing.Point(626, 12);
+            this.lastUpdateUser.Location = new System.Drawing.Point(543, 10);
+            this.lastUpdateUser.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.lastUpdateUser.Name = "lastUpdateUser";
-            this.lastUpdateUser.Size = new System.Drawing.Size(195, 24);
+            this.lastUpdateUser.Size = new System.Drawing.Size(175, 20);
             this.lastUpdateUser.StyleController = this.layoutMx1;
             this.lastUpdateUser.TabIndex = 530;
             this.lastUpdateUser.Tag = "readonly";
             // 
             // lastUpdateTime
             // 
-            this.lastUpdateTime.Location = new System.Drawing.Point(626, 40);
+            this.lastUpdateTime.Location = new System.Drawing.Point(543, 34);
+            this.lastUpdateTime.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.lastUpdateTime.Name = "lastUpdateTime";
-            this.lastUpdateTime.Size = new System.Drawing.Size(195, 24);
+            this.lastUpdateTime.Size = new System.Drawing.Size(175, 20);
             this.lastUpdateTime.StyleController = this.layoutMx1;
             this.lastUpdateTime.TabIndex = 531;
             this.lastUpdateTime.Tag = "readonly";
             // 
             // txt_guid
             // 
-            this.txt_guid.Location = new System.Drawing.Point(942, 148);
+            this.txt_guid.Location = new System.Drawing.Point(824, 115);
+            this.txt_guid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_guid.Name = "txt_guid";
-            this.txt_guid.Size = new System.Drawing.Size(172, 24);
+            this.txt_guid.Size = new System.Drawing.Size(150, 20);
             this.txt_guid.StyleController = this.layoutMx1;
             this.txt_guid.TabIndex = 532;
             // 
             // txt_fHasLinkRad
             // 
-            this.txt_fHasLinkRad.Location = new System.Drawing.Point(355, 96);
+            this.txt_fHasLinkRad.Location = new System.Drawing.Point(306, 82);
+            this.txt_fHasLinkRad.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";
             this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
             new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�")});
             this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
-            this.txt_fHasLinkRad.Size = new System.Drawing.Size(195, 32);
+            this.txt_fHasLinkRad.Size = new System.Drawing.Size(175, 26);
             this.txt_fHasLinkRad.StyleController = this.layoutMx1;
             this.txt_fHasLinkRad.TabIndex = 533;
             // 
@@ -768,7 +806,7 @@
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem17.Size = new System.Drawing.Size(278, 35);
             this.layoutControlItem17.Text = "涓婚敭Guid";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(50, 20);
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(44, 16);
             // 
             // layoutControlItem13
             // 
@@ -826,7 +864,7 @@
             rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition3.Height = 100D;
             rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition4.Height = 36D;
+            rowDefinition4.Height = 30D;
             rowDefinition4.SizeType = System.Windows.Forms.SizeType.AutoSize;
             rowDefinition5.Height = 100D;
             rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -836,7 +874,7 @@
             rowDefinition3,
             rowDefinition4,
             rowDefinition5});
-            this.Root.Size = new System.Drawing.Size(1105, 168);
+            this.Root.Size = new System.Drawing.Size(968, 142);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -844,72 +882,72 @@
             this.layoutControlItem1.Control = this.txt_billNo;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem1.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem1.Text = "鐢宠鍗曞彿";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_thOrgId;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 24);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem2.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem2.Text = "閫夋嫨缁勭粐";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_checkUser;
             this.layoutControlItem9.CustomizationFormText = "瀹℃牳浜哄憳";
-            this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem9.Location = new System.Drawing.Point(711, 0);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem9.Size = new System.Drawing.Size(272, 28);
+            this.layoutControlItem9.Size = new System.Drawing.Size(239, 24);
             this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_checkDate;
-            this.layoutControlItem10.Location = new System.Drawing.Point(813, 28);
+            this.layoutControlItem10.Location = new System.Drawing.Point(711, 24);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem10.Size = new System.Drawing.Size(272, 28);
+            this.layoutControlItem10.Size = new System.Drawing.Size(239, 24);
             this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.lastUpdateUser;
             this.layoutControlItem14.CustomizationFormText = "鏈�鍚庢洿鏂�";
-            this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem14.Location = new System.Drawing.Point(474, 0);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem14.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem14.Text = "鏇存柊浜哄憳";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.lastUpdateTime;
-            this.layoutControlItem15.Location = new System.Drawing.Point(542, 28);
+            this.layoutControlItem15.Location = new System.Drawing.Point(474, 24);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem15.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem15.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem15.Text = "鏇存柊鏃堕棿";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_status;
-            this.layoutControlItem11.Location = new System.Drawing.Point(813, 56);
+            this.layoutControlItem11.Location = new System.Drawing.Point(711, 48);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(272, 28);
+            this.layoutControlItem11.Size = new System.Drawing.Size(239, 24);
             this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
@@ -917,22 +955,22 @@
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_suppId;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 48);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem4.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem4.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem4.Text = "閫変緵搴斿晢";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.btnSelect;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 84);
-            this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
-            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 72);
+            this.layoutControlItem16.MaxSize = new System.Drawing.Size(105, 24);
+            this.layoutControlItem16.MinSize = new System.Drawing.Size(17, 24);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(271, 36);
+            this.layoutControlItem16.Size = new System.Drawing.Size(237, 30);
             this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem16.Text = "閫�璐ф槑缁�";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -941,11 +979,11 @@
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_isFinish;
-            this.layoutControlItem12.Location = new System.Drawing.Point(813, 84);
+            this.layoutControlItem12.Location = new System.Drawing.Point(711, 72);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(272, 36);
+            this.layoutControlItem12.Size = new System.Drawing.Size(239, 30);
             this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
@@ -955,92 +993,92 @@
             this.layoutControlItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
             this.layoutControlItem3.AppearanceItemCaption.Options.UseBackColor = true;
             this.layoutControlItem3.Control = this.txt_fHasLinkRad;
-            this.layoutControlItem3.Location = new System.Drawing.Point(271, 84);
+            this.layoutControlItem3.Location = new System.Drawing.Point(237, 72);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 36);
+            this.layoutControlItem3.Size = new System.Drawing.Size(237, 30);
             this.layoutControlItem3.Text = "婧愬崟绫诲瀷";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layItem1
             // 
             this.layItem1.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
             this.layItem1.AppearanceItemCaption.Options.UseBackColor = true;
             this.layItem1.Control = this.txt_fRequireOrgId;
-            this.layItem1.Location = new System.Drawing.Point(0, 120);
+            this.layItem1.Location = new System.Drawing.Point(0, 102);
             this.layItem1.Name = "layItem1";
             this.layItem1.OptionsTableLayoutItem.RowIndex = 4;
-            this.layItem1.Size = new System.Drawing.Size(271, 28);
+            this.layItem1.Size = new System.Drawing.Size(237, 24);
             this.layItem1.Text = "闇�姹傜粍缁�";
-            this.layItem1.TextSize = new System.Drawing.Size(60, 18);
+            this.layItem1.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layItem4
             // 
             this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
             this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;
             this.layItem4.Control = this.txt_fOwnerIdHead;
-            this.layItem4.Location = new System.Drawing.Point(271, 120);
+            this.layItem4.Location = new System.Drawing.Point(237, 102);
             this.layItem4.Name = "layItem4";
             this.layItem4.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layItem4.OptionsTableLayoutItem.RowIndex = 4;
-            this.layItem4.Size = new System.Drawing.Size(271, 28);
+            this.layItem4.Size = new System.Drawing.Size(237, 24);
             this.layItem4.Text = "璐т富";
-            this.layItem4.TextSize = new System.Drawing.Size(60, 18);
+            this.layItem4.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layItem2
             // 
             this.layItem2.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
             this.layItem2.AppearanceItemCaption.Options.UseBackColor = true;
             this.layItem2.Control = this.txt_fPurchaseDeptId;
-            this.layItem2.Location = new System.Drawing.Point(542, 120);
+            this.layItem2.Location = new System.Drawing.Point(474, 102);
             this.layItem2.Name = "layItem2";
             this.layItem2.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layItem2.OptionsTableLayoutItem.RowIndex = 4;
-            this.layItem2.Size = new System.Drawing.Size(271, 28);
+            this.layItem2.Size = new System.Drawing.Size(237, 24);
             this.layItem2.Text = "閲囪喘閮ㄩ棬";
-            this.layItem2.TextSize = new System.Drawing.Size(60, 18);
+            this.layItem2.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_returnMethod;
-            this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem5.Location = new System.Drawing.Point(237, 0);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem5.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem5.Text = "閫�鏂欐柟寮�";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_returnType;
-            this.layoutControlItem6.Location = new System.Drawing.Point(271, 28);
+            this.layoutControlItem6.Location = new System.Drawing.Point(237, 24);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem6.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem6.Text = "閫�鏂欏師鍥�";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_remark;
-            this.layoutControlItem7.Location = new System.Drawing.Point(271, 56);
+            this.layoutControlItem7.Location = new System.Drawing.Point(237, 48);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem7.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem7.Text = "鐢宠澶囨敞";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_isOut;
-            this.layoutControlItem8.Location = new System.Drawing.Point(542, 56);
+            this.layoutControlItem8.Location = new System.Drawing.Point(474, 48);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem8.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem8.Text = "濮斿鏍囪瘑";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem8.TextVisible = false;
@@ -1049,9 +1087,10 @@
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabMx.Location = new System.Drawing.Point(0, 0);
+            this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 392);
+            this.tabMx.Size = new System.Drawing.Size(985, 303);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1059,20 +1098,23 @@
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
+            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 360);
+            this.tabMxPage1.Size = new System.Drawing.Size(983, 277);
             this.tabMxPage1.Text = "鐢宠鏄庣粏";
             // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1,
             this.rptCk});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 360);
+            this.gcMx1.Size = new System.Drawing.Size(983, 277);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1104,6 +1146,7 @@
             this.gridColumn9,
             this.gridColumn12,
             this.gridColumn13});
+            this.gvMx1.DetailHeight = 272;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1114,103 +1157,103 @@
             // 
             this.rkmxGuid.Caption = "鍏ュ簱鏄庣粏GUID";
             this.rkmxGuid.FieldName = "rkmxGuid";
-            this.rkmxGuid.MinWidth = 25;
+            this.rkmxGuid.MinWidth = 22;
             this.rkmxGuid.Name = "rkmxGuid";
-            this.rkmxGuid.Width = 94;
+            this.rkmxGuid.Width = 82;
             // 
             // gvMx1id
             // 
             this.gvMx1id.AppearanceCell.Options.UseFont = true;
             this.gvMx1id.Caption = "鏄庣粏GUID";
             this.gvMx1id.FieldName = "id";
-            this.gvMx1id.MinWidth = 50;
+            this.gvMx1id.MinWidth = 44;
             this.gvMx1id.Name = "gvMx1id";
             this.gvMx1id.Tag = "query_a.ID";
-            this.gvMx1id.Width = 94;
+            this.gvMx1id.Width = 82;
             // 
             // gvMx1mid
             // 
             this.gvMx1mid.AppearanceCell.Options.UseFont = true;
             this.gvMx1mid.Caption = "涓昏〃GUID";
             this.gvMx1mid.FieldName = "mid";
-            this.gvMx1mid.MinWidth = 50;
+            this.gvMx1mid.MinWidth = 44;
             this.gvMx1mid.Name = "gvMx1mid";
             this.gvMx1mid.Tag = "query_a.MID";
-            this.gvMx1mid.Width = 94;
+            this.gvMx1mid.Width = 82;
             // 
             // gvMx1invBillNo
             // 
             this.gvMx1invBillNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1invBillNo.Caption = "鍏ュ簱鍗曞彿";
             this.gvMx1invBillNo.FieldName = "invBillNo";
-            this.gvMx1invBillNo.MinWidth = 50;
+            this.gvMx1invBillNo.MinWidth = 44;
             this.gvMx1invBillNo.Name = "gvMx1invBillNo";
             this.gvMx1invBillNo.Tag = "query_a.INV_BILL_NO";
             this.gvMx1invBillNo.Visible = true;
             this.gvMx1invBillNo.VisibleIndex = 1;
-            this.gvMx1invBillNo.Width = 94;
+            this.gvMx1invBillNo.Width = 82;
             // 
             // gvMx1ebeln
             // 
             this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebeln.Caption = "閲囪喘鍗曞彿";
             this.gvMx1ebeln.FieldName = "cgdh";
-            this.gvMx1ebeln.MinWidth = 50;
+            this.gvMx1ebeln.MinWidth = 44;
             this.gvMx1ebeln.Name = "gvMx1ebeln";
             this.gvMx1ebeln.Tag = "query_a.EBELN";
             this.gvMx1ebeln.Visible = true;
             this.gvMx1ebeln.VisibleIndex = 2;
-            this.gvMx1ebeln.Width = 94;
+            this.gvMx1ebeln.Width = 82;
             // 
             // gvMx1itemId
             // 
             this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemId.Caption = "鐗╂枡ID";
             this.gvMx1itemId.FieldName = "itemId";
-            this.gvMx1itemId.MinWidth = 50;
+            this.gvMx1itemId.MinWidth = 44;
             this.gvMx1itemId.Name = "gvMx1itemId";
             this.gvMx1itemId.Tag = "query_a.ITEM_ID";
-            this.gvMx1itemId.Width = 94;
+            this.gvMx1itemId.Width = 82;
             // 
             // gridColumn2
             // 
             this.gridColumn2.Caption = "鐗╂枡缂栫爜";
             this.gridColumn2.FieldName = "wlbm";
-            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.MinWidth = 22;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 3;
-            this.gridColumn2.Width = 94;
+            this.gridColumn2.Width = 82;
             // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn5.FieldName = "wlmc";
-            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.MinWidth = 22;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 4;
-            this.gridColumn5.Width = 94;
+            this.gridColumn5.Width = 82;
             // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn3.FieldName = "wlgg";
-            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.MinWidth = 22;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 5;
-            this.gridColumn3.Width = 94;
+            this.gridColumn3.Width = 82;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "鍗曚綅";
             this.gridColumn4.FieldName = "dwName";
-            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.MinWidth = 22;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 6;
-            this.gridColumn4.Width = 94;
+            this.gridColumn4.Width = 82;
             // 
             // gvMx1sqNum
             // 
@@ -1221,24 +1264,24 @@
             this.gvMx1sqNum.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1sqNum.Caption = "鐢宠鏁伴噺";
             this.gvMx1sqNum.FieldName = "sqNum";
-            this.gvMx1sqNum.MinWidth = 50;
+            this.gvMx1sqNum.MinWidth = 44;
             this.gvMx1sqNum.Name = "gvMx1sqNum";
             this.gvMx1sqNum.Tag = "yz_quantity_0_edit";
             this.gvMx1sqNum.Visible = true;
             this.gvMx1sqNum.VisibleIndex = 8;
-            this.gvMx1sqNum.Width = 94;
+            this.gvMx1sqNum.Width = 82;
             // 
             // gvMx1ysNum
             // 
             this.gvMx1ysNum.AppearanceCell.Options.UseFont = true;
             this.gvMx1ysNum.Caption = "宸叉壂鏁伴噺";
             this.gvMx1ysNum.FieldName = "ysNum";
-            this.gvMx1ysNum.MinWidth = 50;
+            this.gvMx1ysNum.MinWidth = 44;
             this.gvMx1ysNum.Name = "gvMx1ysNum";
             this.gvMx1ysNum.Tag = "query_a.YS_NUM";
             this.gvMx1ysNum.Visible = true;
             this.gvMx1ysNum.VisibleIndex = 11;
-            this.gvMx1ysNum.Width = 94;
+            this.gvMx1ysNum.Width = 82;
             // 
             // gvMx1remark
             // 
@@ -1249,64 +1292,64 @@
             this.gvMx1remark.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1remark.Caption = "澶囨敞";
             this.gvMx1remark.FieldName = "remark";
-            this.gvMx1remark.MinWidth = 50;
+            this.gvMx1remark.MinWidth = 44;
             this.gvMx1remark.Name = "gvMx1remark";
             this.gvMx1remark.Tag = "edit";
             this.gvMx1remark.Visible = true;
             this.gvMx1remark.VisibleIndex = 10;
-            this.gvMx1remark.Width = 94;
+            this.gvMx1remark.Width = 82;
             // 
             // gvMx1orderNo
             // 
             this.gvMx1orderNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1orderNo.Caption = "搴忓彿";
             this.gvMx1orderNo.FieldName = "orderNo";
-            this.gvMx1orderNo.MinWidth = 50;
+            this.gvMx1orderNo.MinWidth = 44;
             this.gvMx1orderNo.Name = "gvMx1orderNo";
             this.gvMx1orderNo.Tag = "query_a.ORDER_NO";
             this.gvMx1orderNo.Visible = true;
             this.gvMx1orderNo.VisibleIndex = 0;
-            this.gvMx1orderNo.Width = 94;
+            this.gvMx1orderNo.Width = 82;
             // 
             // gvMx1eid
             // 
             this.gvMx1eid.AppearanceCell.Options.UseFont = true;
             this.gvMx1eid.Caption = "閲囪喘璁㈠崟ID";
             this.gvMx1eid.FieldName = "eid";
-            this.gvMx1eid.MinWidth = 50;
+            this.gvMx1eid.MinWidth = 44;
             this.gvMx1eid.Name = "gvMx1eid";
             this.gvMx1eid.Tag = "query_a.EID";
-            this.gvMx1eid.Width = 94;
+            this.gvMx1eid.Width = 82;
             // 
             // gvMx1erpid
             // 
             this.gvMx1erpid.AppearanceCell.Options.UseFont = true;
             this.gvMx1erpid.Caption = "閲囪喘璁㈠崟琛孖D";
             this.gvMx1erpid.FieldName = "erpid";
-            this.gvMx1erpid.MinWidth = 50;
+            this.gvMx1erpid.MinWidth = 44;
             this.gvMx1erpid.Name = "gvMx1erpid";
             this.gvMx1erpid.Tag = "query_a.ERPID";
-            this.gvMx1erpid.Width = 94;
+            this.gvMx1erpid.Width = 82;
             // 
             // gvMx1invWorkLine
             // 
             this.gvMx1invWorkLine.AppearanceCell.Options.UseFont = true;
             this.gvMx1invWorkLine.Caption = "鍏ュ簱鍗曡鍙�";
             this.gvMx1invWorkLine.FieldName = "invWorkLine";
-            this.gvMx1invWorkLine.MinWidth = 50;
+            this.gvMx1invWorkLine.MinWidth = 44;
             this.gvMx1invWorkLine.Name = "gvMx1invWorkLine";
             this.gvMx1invWorkLine.Tag = "query_a.INV_WORK_LINE";
-            this.gvMx1invWorkLine.Width = 94;
+            this.gvMx1invWorkLine.Width = 82;
             // 
             // gvMxDel
             // 
             this.gvMxDel.Caption = "绉诲嚭";
             this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 25;
+            this.gvMxDel.MinWidth = 22;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
             this.gvMxDel.VisibleIndex = 13;
-            this.gvMxDel.Width = 94;
+            this.gvMxDel.Width = 82;
             // 
             // repositoryItemButtonEdit1
             // 
@@ -1323,11 +1366,11 @@
             // 
             this.gridColumn6.Caption = "鍏ュ簱鏁伴噺";
             this.gridColumn6.FieldName = "rksl";
-            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.MinWidth = 22;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 7;
-            this.gridColumn6.Width = 94;
+            this.gridColumn6.Width = 82;
             // 
             // gridColumn8
             // 
@@ -1337,19 +1380,19 @@
             this.gridColumn8.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn8.Caption = "Mes/Erp搴撳瓨";
             this.gridColumn8.FieldName = "kcQty";
-            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.MinWidth = 22;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 12;
-            this.gridColumn8.Width = 94;
+            this.gridColumn8.Width = 82;
             // 
             // gridColumn10
             // 
             this.gridColumn10.Caption = "浠撳簱ID";
             this.gridColumn10.FieldName = "depotId";
-            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.MinWidth = 22;
             this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Width = 94;
+            this.gridColumn10.Width = 82;
             // 
             // gridColumn9
             // 
@@ -1360,11 +1403,11 @@
             this.gridColumn9.Caption = "閫夋嫨浠撳簱";
             this.gridColumn9.ColumnEdit = this.rptCk;
             this.gridColumn9.FieldName = "depotName";
-            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.MinWidth = 22;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 9;
-            this.gridColumn9.Width = 94;
+            this.gridColumn9.Width = 82;
             // 
             // rptCk
             // 
@@ -1379,28 +1422,29 @@
             // 
             this.gridColumn12.Caption = "SRM鏍囪瘑";
             this.gridColumn12.FieldName = "isSrmChk";
-            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.MinWidth = 22;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
             this.gridColumn12.VisibleIndex = 14;
-            this.gridColumn12.Width = 94;
+            this.gridColumn12.Width = 82;
             // 
             // gridColumn13
             // 
             this.gridColumn13.Caption = "SRM鍒拌揣鍗曞彿";
             this.gridColumn13.FieldName = "paperBillNo";
-            this.gridColumn13.MinWidth = 25;
+            this.gridColumn13.MinWidth = 22;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
             this.gridColumn13.VisibleIndex = 15;
-            this.gridColumn13.Width = 94;
+            this.gridColumn13.Width = 82;
             // 
             // picCheckBox
             // 
             this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(965, 64);
+            this.picCheckBox.Location = new System.Drawing.Point(844, 50);
+            this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+            this.picCheckBox.Size = new System.Drawing.Size(88, 39);
             this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.picCheckBox.TabIndex = 8;
             this.picCheckBox.TabStop = false;
@@ -1408,12 +1452,13 @@
             // 
             // Frm_MesCgthSq
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.ClientSize = new System.Drawing.Size(987, 530);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Frm_MesCgthSq";
             this.Text = "閲囪喘閫�璐х敵璇�";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
index 30cce3a..e35256c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -176,6 +176,12 @@
                 lbGuid, txt_billNo, gridView1);
             toolBarMenu1.guidKey = rowGuid;
         }
+
+        /// <summary>
+        /// 杩欐槸鎵撳嵃
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
         {
             //guidKey, rptParameter
@@ -187,8 +193,8 @@
                 MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-            this.toolBarMenu1.rptParameter = "rpt_CGTH{"
-                                               + ""
+            this.toolBarMenu1.rptParameter = "rpt_CGTHSQ{"
+                                               + "100"
                                                + "," + ""
                                                + "," + ""
                                                + "," + ""
@@ -802,5 +808,9 @@
             }
         }
 
+   
+    
+    
+    
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
index 3d73f65..22fb8d4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs
@@ -24,6 +24,7 @@
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+            toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -328,5 +329,35 @@
 
         }
 
+
+        /// <summary>
+        /// 杩欐槸鎵撳嵃
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
+        {
+            //guidKey, rptParameter
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            this.toolBarMenu1.rptParameter = "rpt_CGTH{"
+                                               + "100"
+                                               + "," + ""
+                                               + "," + ""
+                                               + "," + ""
+                                               + "," + ""
+                                               + "}";
+            this.toolBarMenu1.guidKey = rowGuid;
+
+        }
+
+
+
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 80bd659..2d38eaa 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -49,6 +49,7 @@
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
+            toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -835,5 +836,34 @@
             }
         }
 
+
+
+        /// <summary>
+        /// 杩欐槸鎵撳嵃
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
+        {
+            //guidKey, rptParameter
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_releaseNo, gridView1, "releaseNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            this.toolBarMenu1.rptParameter = "rpt_IQCrpt{"
+                                               + "100"
+                                               + "," + ""
+                                               + "," + ""
+                                               + "," + ""
+                                               + "," + ""
+                                               + "}";
+            this.toolBarMenu1.guidKey = rowGuid;
+
+        }
+
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
index b94876f..8e22894 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
@@ -23,6 +23,7 @@
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+            toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
@@ -303,5 +304,36 @@
                 MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
+
+
+        /// <summary>
+        /// 杩欐槸鎵撳嵃
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
+        {
+            //guidKey, rptParameter
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_billNo, gridView1, "billNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            this.toolBarMenu1.rptParameter = "rpt_CGRK{"
+                                               + "100"
+                                               + "," + ""
+                                               + "," + ""
+                                               + "," + ""
+                                               + "," + ""
+                                               + "}";
+            this.toolBarMenu1.guidKey = rowGuid;
+
+        }
+
+
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3