From 9c38dbf93ea5b7dea6b34b03cb3143812b20147d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 02 七月 2025 23:05:41 +0800
Subject: [PATCH] BUG

---
 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs |  302 ++++++++++++++++----------------------------------
 1 files changed, 96 insertions(+), 206 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
index f48bf14..f10beb3 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
@@ -29,18 +29,18 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            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.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -49,17 +49,12 @@
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_isFinish = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_isOut = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_lastUpdateUser = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_lastUpdateTime = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_returnMethod = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_returnType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -106,12 +101,10 @@
             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.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
             this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -127,7 +120,6 @@
             this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -174,11 +166,11 @@
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -258,17 +250,12 @@
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn1,
             this.gv_status,
-            this.gv_isFinish,
-            this.gv_isOut,
             this.gv_billNo,
             this.gv_lastUpdateUser,
             this.gv_lastUpdateTime,
             this.gv_checkUser,
             this.gv_checkDate,
             this.gv_returnMethod,
-            this.gv_returnType,
-            this.gv_depotId,
-            this.gv_suppId,
             this.gv_remark,
             this.gridColumn7});
             this.gridView1.GridControl = this.gcMain1;
@@ -280,53 +267,27 @@
             // 
             // gridColumn1
             // 
-            this.gridColumn1.Caption = "閫�璐х粍缁�";
-            this.gridColumn1.FieldName = "receivingOrg";
+            this.gridColumn1.Caption = "鐢宠缁勭粐";
+            this.gridColumn1.FieldName = "kcOrg";
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Tag = "org.fnamber";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 0;
+            this.gridColumn1.VisibleIndex = 1;
             this.gridColumn1.Width = 250;
             // 
             // gv_status
             // 
             this.gv_status.AppearanceCell.Options.UseFont = true;
             this.gv_status.Caption = "瀹℃牳鐘舵��";
-            this.gv_status.FieldName = "status";
+            this.gv_status.FieldName = "checkStatus";
             this.gv_status.MaxWidth = 50;
             this.gv_status.MinWidth = 50;
             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.VisibleIndex = 0;
             this.gv_status.Width = 50;
-            // 
-            // 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.Name = "gv_isFinish";
-            this.gv_isFinish.OptionsColumn.AllowEdit = false;
-            this.gv_isFinish.Tag = "query_a.IS_FINISH";
-            this.gv_isFinish.Width = 50;
-            // 
-            // 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.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;
             // 
             // gv_billNo
             // 
@@ -337,43 +298,43 @@
             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.VisibleIndex = 2;
             this.gv_billNo.Width = 120;
             // 
             // gv_lastUpdateUser
             // 
             this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true;
             this.gv_lastUpdateUser.Caption = "鏈�鍚庤窡鏂颁汉 ";
-            this.gv_lastUpdateUser.FieldName = "lastUpdateUser";
+            this.gv_lastUpdateUser.FieldName = "lastUpdateBy";
             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.VisibleIndex = 3;
             this.gv_lastUpdateUser.Width = 94;
             // 
             // gv_lastUpdateTime
             // 
             this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
             this.gv_lastUpdateTime.Caption = "鏈�鍚庝慨鏀规椂闂� ";
-            this.gv_lastUpdateTime.FieldName = "lastUpdateTime";
+            this.gv_lastUpdateTime.FieldName = "lastUpdateDate";
             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.VisibleIndex = 4;
             this.gv_lastUpdateTime.Width = 180;
             // 
             // gv_checkUser
             // 
             this.gv_checkUser.AppearanceCell.Options.UseFont = true;
             this.gv_checkUser.Caption = "瀹℃牳浜� ";
-            this.gv_checkUser.FieldName = "checkUser";
+            this.gv_checkUser.FieldName = "checkBy";
             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.VisibleIndex = 5;
             this.gv_checkUser.Width = 94;
             // 
             // gv_checkDate
@@ -385,56 +346,20 @@
             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.VisibleIndex = 6;
             this.gv_checkDate.Width = 94;
             // 
             // gv_returnMethod
             // 
             this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
-            this.gv_returnMethod.Caption = "閫�鏂欐柟寮� ";
-            this.gv_returnMethod.FieldName = "returnMethod";
+            this.gv_returnMethod.Caption = "鐢宠绫诲瀷";
+            this.gv_returnMethod.FieldName = "billType";
             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.VisibleIndex = 7;
             this.gv_returnMethod.Width = 94;
-            // 
-            // gv_returnType
-            // 
-            this.gv_returnType.AppearanceCell.Options.UseFont = true;
-            this.gv_returnType.Caption = "閫�鏂欑被鍨� ";
-            this.gv_returnType.FieldName = "returnType";
-            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;
-            // 
-            // gv_depotId
-            // 
-            this.gv_depotId.AppearanceCell.Options.UseFont = true;
-            this.gv_depotId.Caption = "浠撳簱";
-            this.gv_depotId.FieldName = "dptName";
-            this.gv_depotId.Name = "gv_depotId";
-            this.gv_depotId.OptionsColumn.AllowEdit = false;
-            this.gv_depotId.Tag = "query_a.DEPOT_ID";
-            this.gv_depotId.Visible = true;
-            this.gv_depotId.VisibleIndex = 10;
-            this.gv_depotId.Width = 94;
-            // 
-            // gv_suppId
-            // 
-            this.gv_suppId.AppearanceCell.Options.UseFont = true;
-            this.gv_suppId.Caption = "渚涘簲鍟�";
-            this.gv_suppId.FieldName = "supName";
-            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 = 11;
-            this.gv_suppId.Width = 94;
             // 
             // gv_remark
             // 
@@ -445,7 +370,7 @@
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.REMARK";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 12;
+            this.gv_remark.VisibleIndex = 8;
             this.gv_remark.Width = 94;
             // 
             // gridColumn7
@@ -594,7 +519,7 @@
             this.txt_remark.Location = new System.Drawing.Point(385, 74);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(436, 24);
+            this.txt_remark.Size = new System.Drawing.Size(165, 24);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 252;
             // 
@@ -684,29 +609,29 @@
             this.layoutControlItem11});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition4.Width = 100D;
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition8.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition2.Height = 100D;
-            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition3.Height = 100D;
-            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8});
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3});
+            rowDefinition4,
+            rowDefinition5,
+            rowDefinition6});
             this.Root.Size = new System.Drawing.Size(1105, 113);
             this.Root.TextVisible = false;
             // 
@@ -757,9 +682,8 @@
             this.layoutControlItem7.Location = new System.Drawing.Point(271, 62);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
+            this.layoutControlItem7.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem7.Text = "鐢宠澶囨敞";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -866,12 +790,9 @@
             this.gridColumn15,
             this.gridColumn16,
             this.gridColumn17,
-            this.gridColumn18,
-            this.gridColumn19,
             this.gridColumn20,
             this.gridColumn21,
-            this.gridColumn22,
-            this.gridColumn23});
+            this.gvMxDel});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -904,6 +825,8 @@
             this.gridColumn9.MinWidth = 50;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Tag = "query_a.ITEM_ID";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 0;
             this.gridColumn9.Width = 94;
             // 
             // gridColumn10
@@ -913,7 +836,7 @@
             this.gridColumn10.MinWidth = 25;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 1;
+            this.gridColumn10.VisibleIndex = 2;
             this.gridColumn10.Width = 94;
             // 
             // gridColumn11
@@ -923,7 +846,7 @@
             this.gridColumn11.MinWidth = 25;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 2;
+            this.gridColumn11.VisibleIndex = 3;
             this.gridColumn11.Width = 94;
             // 
             // gridColumn12
@@ -933,53 +856,53 @@
             this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 3;
+            this.gridColumn12.VisibleIndex = 4;
             this.gridColumn12.Width = 94;
             // 
             // gridColumn13
             // 
             this.gridColumn13.AppearanceCell.Options.UseFont = true;
             this.gridColumn13.Caption = "鏁伴噺";
-            this.gridColumn13.FieldName = "gqsl";
+            this.gridColumn13.FieldName = "itemBarCodeSl";
             this.gridColumn13.MinWidth = 50;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Tag = "yz_quantity_0_edit";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 4;
+            this.gridColumn13.VisibleIndex = 5;
             this.gridColumn13.Width = 94;
             // 
             // gridColumn14
             // 
             this.gridColumn14.AppearanceCell.Options.UseFont = true;
-            this.gridColumn14.Caption = "鏈夋晥鏈熻嚦(澶嶆鍓�)";
-            this.gridColumn14.FieldName = "sqsl";
+            this.gridColumn14.Caption = "鏈夋晥鏈熻嚦";
+            this.gridColumn14.FieldName = "yxqDate";
             this.gridColumn14.MinWidth = 50;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Tag = "yz_quantity_0_edit";
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 5;
+            this.gridColumn14.VisibleIndex = 6;
             this.gridColumn14.Width = 94;
             // 
             // gridColumn15
             // 
             this.gridColumn15.Caption = "閲嶆娆℃暟";
-            this.gridColumn15.FieldName = "wcsl";
+            this.gridColumn15.FieldName = "cjcs";
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 7;
+            this.gridColumn15.VisibleIndex = 8;
             this.gridColumn15.Width = 94;
             // 
             // gridColumn16
             // 
             this.gridColumn16.AppearanceCell.Options.UseFont = true;
-            this.gridColumn16.Caption = "鍓╀綑瓒呮湡澶╂暟";
-            this.gridColumn16.FieldName = "remark";
+            this.gridColumn16.Caption = "鍓╀綑澶╂暟";
+            this.gridColumn16.FieldName = "syts";
             this.gridColumn16.MinWidth = 50;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Tag = "edit";
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 6;
+            this.gridColumn16.VisibleIndex = 7;
             this.gridColumn16.Width = 94;
             // 
             // gridColumn17
@@ -989,63 +912,49 @@
             this.gridColumn17.MinWidth = 25;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 0;
+            this.gridColumn17.VisibleIndex = 1;
             this.gridColumn17.Width = 94;
-            // 
-            // gridColumn18
-            // 
-            this.gridColumn18.Caption = "閫佹浜�";
-            this.gridColumn18.MinWidth = 25;
-            this.gridColumn18.Name = "gridColumn18";
-            this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 8;
-            this.gridColumn18.Width = 94;
-            // 
-            // gridColumn19
-            // 
-            this.gridColumn19.Caption = "閫佹鏃堕棿";
-            this.gridColumn19.MinWidth = 25;
-            this.gridColumn19.Name = "gridColumn19";
-            this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 9;
-            this.gridColumn19.Width = 94;
             // 
             // gridColumn20
             // 
-            this.gridColumn20.Caption = "鍙栧嚭搴撲綅";
+            this.gridColumn20.Caption = "褰撳墠搴撲綅";
+            this.gridColumn20.FieldName = "qckw";
             this.gridColumn20.MinWidth = 25;
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 10;
+            this.gridColumn20.VisibleIndex = 9;
             this.gridColumn20.Width = 94;
             // 
             // gridColumn21
             // 
             this.gridColumn21.Caption = "澶嶆缁撴灉";
+            this.gridColumn21.FieldNameSortGroup = "fjjg";
             this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 11;
+            this.gridColumn21.VisibleIndex = 10;
             this.gridColumn21.Width = 94;
             // 
-            // gridColumn22
+            // gvMxDel
             // 
-            this.gridColumn22.Caption = "鏈夋晥鏈熻嚦(澶嶆鍚�)";
-            this.gridColumn22.MinWidth = 25;
-            this.gridColumn22.Name = "gridColumn22";
-            this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 12;
-            this.gridColumn22.Width = 94;
+            this.gvMxDel.Caption = "绉诲嚭";
+            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gvMxDel.MinWidth = 25;
+            this.gvMxDel.Name = "gvMxDel";
+            this.gvMxDel.Visible = true;
+            this.gvMxDel.VisibleIndex = 11;
+            this.gvMxDel.Width = 94;
             // 
-            // gridColumn23
+            // repositoryItemButtonEdit1
             // 
-            this.gridColumn23.Caption = "绉诲嚭";
-            this.gridColumn23.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gridColumn23.MinWidth = 25;
-            this.gridColumn23.Name = "gridColumn23";
-            this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 13;
-            this.gridColumn23.Width = 94;
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
             // 
             // tabMxPage2
             // 
@@ -1207,17 +1116,6 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", 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);
-            // 
             // Frm_Cqsq
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1274,11 +1172,11 @@
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1292,17 +1190,12 @@
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gv_status;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_isFinish;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_isOut;
         private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateUser;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateTime;
         private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
         private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_returnMethod;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_returnType;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
         private UserControls.Data.UcPageBar pageBar1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
@@ -1346,12 +1239,9 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;

--
Gitblit v1.9.3