From 49e7d052cc72a98b10ba9c06268c8a1d79e94a5b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 15 四月 2025 11:14:10 +0800
Subject: [PATCH] fqc

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs |  227 +++++++++++++++++++++++++-------------------------------
 1 files changed, 100 insertions(+), 127 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
index 5750b52..2c16df1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeDj.Designer.cs
@@ -28,6 +28,7 @@
         /// </summary>
         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();
@@ -99,7 +100,7 @@
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
-            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
             this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -112,7 +113,7 @@
             this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -122,7 +123,9 @@
             this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -178,10 +181,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
-            this.tabMxPage1.SuspendLayout();
+            this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            this.tabMxPage2.SuspendLayout();
+            this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
@@ -245,7 +248,6 @@
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
@@ -256,7 +258,6 @@
             // 
             // gridView1
             // 
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gv_status,
@@ -284,7 +285,6 @@
             // 
             // gv_status
             // 
-            this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_status.AppearanceCell.Options.UseFont = true;
             this.gv_status.Caption = "瀹℃牳鏍囪瘑";
             this.gv_status.FieldName = "checkStatus";
@@ -298,7 +298,6 @@
             // 
             // gv_billNo
             // 
-            this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍏ュ簱鍗曞彿 ";
             this.gv_billNo.FieldName = "billNo";
@@ -312,7 +311,6 @@
             // 
             // gv_taskNo
             // 
-            this.gv_taskNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_taskNo.AppearanceCell.Options.UseFont = true;
             this.gv_taskNo.Caption = "鐢宠鍗曞彿";
             this.gv_taskNo.FieldName = "taskNo";
@@ -326,7 +324,6 @@
             // 
             // gv_depotsCode
             // 
-            this.gv_depotsCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
             this.gv_depotsCode.Caption = "浠撳簱ID";
             this.gv_depotsCode.FieldName = "depotsId";
@@ -338,7 +335,6 @@
             // 
             // gv_depotsId
             // 
-            this.gv_depotsId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_depotsId.AppearanceCell.Options.UseFont = true;
             this.gv_depotsId.Caption = "浠撳簱缂栧彿";
             this.gv_depotsId.FieldName = "ckNo";
@@ -362,7 +358,6 @@
             // 
             // gv_createBy
             // 
-            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
             this.gv_createBy.Caption = "鍒涘缓浜� ";
             this.gv_createBy.FieldName = "createBy";
@@ -376,7 +371,6 @@
             // 
             // gv_createDate
             // 
-            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_createDate.AppearanceCell.Options.UseFont = true;
             this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
             this.gv_createDate.FieldName = "createDate";
@@ -390,7 +384,6 @@
             // 
             // gv_lastupdateBy
             // 
-            this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
             this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
             this.gv_lastupdateBy.FieldName = "lastupdateBy";
@@ -404,7 +397,6 @@
             // 
             // gv_lastupdateDate
             // 
-            this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
             this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
             this.gv_lastupdateDate.FieldName = "lastupdateDate";
@@ -418,7 +410,6 @@
             // 
             // gv_remark
             // 
-            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_remark.AppearanceCell.Options.UseFont = true;
             this.gv_remark.Caption = "澶囨敞 ";
             this.gv_remark.FieldName = "sqRemark";
@@ -442,7 +433,6 @@
             // 
             // gv_checkUser
             // 
-            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_checkUser.AppearanceCell.Options.UseFont = true;
             this.gv_checkUser.Caption = "瀹℃牳浜� ";
             this.gv_checkUser.FieldName = "checkUser";
@@ -456,7 +446,6 @@
             // 
             // gv_checkDate
             // 
-            this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
             this.gv_checkDate.FieldName = "checkDate";
@@ -480,7 +469,6 @@
             // 
             // gv_guid
             // 
-            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_guid.AppearanceCell.Options.UseFont = true;
             this.gv_guid.Caption = "涓婚敭GUID";
             this.gv_guid.FieldName = "guid";
@@ -561,7 +549,6 @@
             // 
             // lbGuid
             // 
-            this.lbGuid.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lbGuid.Location = new System.Drawing.Point(990, 108);
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(323, 28);
@@ -570,41 +557,37 @@
             // 
             // txt_ckName
             // 
-            this.txt_ckName.Location = new System.Drawing.Point(440, 44);
+            this.txt_ckName.Location = new System.Drawing.Point(445, 43);
             this.txt_ckName.Name = "txt_ckName";
-            this.txt_ckName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_ckName.Properties.Appearance.Options.UseFont = true;
-            this.txt_ckName.Size = new System.Drawing.Size(220, 28);
+            this.txt_ckName.Size = new System.Drawing.Size(225, 24);
             this.txt_ckName.StyleController = this.layoutMx1;
             this.txt_ckName.TabIndex = 609;
             // 
             // txt_sqRemark
             // 
-            this.txt_sqRemark.Location = new System.Drawing.Point(114, 140);
+            this.txt_sqRemark.Location = new System.Drawing.Point(114, 136);
             this.txt_sqRemark.Name = "txt_sqRemark";
-            this.txt_sqRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_sqRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_sqRemark.Size = new System.Drawing.Size(546, 28);
+            this.txt_sqRemark.Size = new System.Drawing.Size(556, 24);
             this.txt_sqRemark.StyleController = this.layoutMx1;
             this.txt_sqRemark.TabIndex = 240;
             // 
             // txt_checkUser
             // 
-            this.txt_checkUser.Location = new System.Drawing.Point(1092, 12);
+            this.txt_checkUser.Location = new System.Drawing.Point(1107, 12);
             this.txt_checkUser.Name = "txt_checkUser";
-            this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(221, 28);
+            this.txt_checkUser.Size = new System.Drawing.Size(227, 24);
             this.txt_checkUser.StyleController = this.layoutMx1;
             this.txt_checkUser.TabIndex = 608;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(766, 44);
+            this.txt_createDate.Location = new System.Drawing.Point(776, 43);
             this.txt_createDate.Name = "txt_createDate";
-            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(220, 28);
+            this.txt_createDate.Size = new System.Drawing.Size(225, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 222;
             // 
@@ -612,112 +595,104 @@
             // 
             this.txt_billNo.Location = new System.Drawing.Point(114, 12);
             this.txt_billNo.Name = "txt_billNo";
-            this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(220, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(225, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             // 
             // txt_abtNo
             // 
-            this.txt_abtNo.Location = new System.Drawing.Point(440, 12);
+            this.txt_abtNo.Location = new System.Drawing.Point(445, 12);
             this.txt_abtNo.Name = "txt_abtNo";
-            this.txt_abtNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_abtNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_abtNo.Size = new System.Drawing.Size(220, 28);
+            this.txt_abtNo.Size = new System.Drawing.Size(225, 24);
             this.txt_abtNo.StyleController = this.layoutMx1;
             this.txt_abtNo.TabIndex = 507;
             // 
             // txt_djlx
             // 
-            this.txt_djlx.Location = new System.Drawing.Point(440, 108);
+            this.txt_djlx.Location = new System.Drawing.Point(445, 105);
             this.txt_djlx.Name = "txt_djlx";
-            this.txt_djlx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_djlx.Properties.Appearance.Options.UseFont = true;
-            this.txt_djlx.Size = new System.Drawing.Size(220, 28);
+            this.txt_djlx.Size = new System.Drawing.Size(225, 24);
             this.txt_djlx.StyleController = this.layoutMx1;
             this.txt_djlx.TabIndex = 598;
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(766, 12);
+            this.txt_createBy.Location = new System.Drawing.Point(776, 12);
             this.txt_createBy.Name = "txt_createBy";
-            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(220, 28);
+            this.txt_createBy.Size = new System.Drawing.Size(225, 24);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 219;
             // 
             // txt_kcOrg
             // 
-            this.txt_kcOrg.Location = new System.Drawing.Point(114, 44);
+            this.txt_kcOrg.Location = new System.Drawing.Point(114, 43);
             this.txt_kcOrg.Name = "txt_kcOrg";
-            this.txt_kcOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_kcOrg.Properties.Appearance.Options.UseFont = true;
-            this.txt_kcOrg.Size = new System.Drawing.Size(220, 28);
+            this.txt_kcOrg.Size = new System.Drawing.Size(225, 24);
             this.txt_kcOrg.StyleController = this.layoutMx1;
             this.txt_kcOrg.TabIndex = 593;
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(1092, 44);
+            this.txt_checkDate.Location = new System.Drawing.Point(1107, 43);
             this.txt_checkDate.Name = "txt_checkDate";
-            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(221, 28);
+            this.txt_checkDate.Size = new System.Drawing.Size(227, 24);
             this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 587;
             // 
             // txt_status
             // 
-            this.txt_status.Location = new System.Drawing.Point(990, 76);
+            this.txt_status.Location = new System.Drawing.Point(1005, 74);
             this.txt_status.Name = "txt_status";
             this.txt_status.Properties.Caption = "瀹℃牳鐘舵��";
-            this.txt_status.Size = new System.Drawing.Size(323, 24);
+            this.txt_status.Size = new System.Drawing.Size(329, 24);
             this.txt_status.StyleController = this.layoutMx1;
             this.txt_status.TabIndex = 609;
             // 
             // txt_lastupdateBy
             // 
-            this.txt_lastupdateBy.Location = new System.Drawing.Point(766, 76);
+            this.txt_lastupdateBy.Location = new System.Drawing.Point(776, 74);
             this.txt_lastupdateBy.Name = "txt_lastupdateBy";
-            this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_lastupdateBy.Size = new System.Drawing.Size(220, 28);
+            this.txt_lastupdateBy.Size = new System.Drawing.Size(225, 24);
             this.txt_lastupdateBy.StyleController = this.layoutMx1;
             this.txt_lastupdateBy.TabIndex = 610;
             // 
             // txt_lastupdateDate
             // 
-            this.txt_lastupdateDate.Location = new System.Drawing.Point(766, 108);
+            this.txt_lastupdateDate.Location = new System.Drawing.Point(776, 105);
             this.txt_lastupdateDate.Name = "txt_lastupdateDate";
-            this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_lastupdateDate.Size = new System.Drawing.Size(220, 28);
+            this.txt_lastupdateDate.Size = new System.Drawing.Size(225, 24);
             this.txt_lastupdateDate.StyleController = this.layoutMx1;
             this.txt_lastupdateDate.TabIndex = 611;
             // 
             // txt_ckNo
             // 
-            this.txt_ckNo.Location = new System.Drawing.Point(440, 76);
+            this.txt_ckNo.Location = new System.Drawing.Point(445, 74);
             this.txt_ckNo.Name = "txt_ckNo";
-            this.txt_ckNo.Size = new System.Drawing.Size(220, 24);
+            this.txt_ckNo.Size = new System.Drawing.Size(225, 24);
             this.txt_ckNo.StyleController = this.layoutMx1;
             this.txt_ckNo.TabIndex = 613;
             // 
             // txt_xsNo
             // 
-            this.txt_xsNo.Location = new System.Drawing.Point(114, 108);
+            this.txt_xsNo.Location = new System.Drawing.Point(114, 105);
             this.txt_xsNo.Name = "txt_xsNo";
-            this.txt_xsNo.Size = new System.Drawing.Size(220, 24);
+            this.txt_xsNo.Size = new System.Drawing.Size(225, 24);
             this.txt_xsNo.StyleController = this.layoutMx1;
             this.txt_xsNo.TabIndex = 614;
             // 
             // txt_custName
             // 
-            this.txt_custName.Location = new System.Drawing.Point(114, 76);
+            this.txt_custName.Location = new System.Drawing.Point(114, 74);
             this.txt_custName.Name = "txt_custName";
-            this.txt_custName.Size = new System.Drawing.Size(220, 24);
+            this.txt_custName.Size = new System.Drawing.Size(225, 24);
             this.txt_custName.StyleController = this.layoutMx1;
             this.txt_custName.TabIndex = 615;
             // 
@@ -785,7 +760,7 @@
             rowDefinition3,
             rowDefinition4,
             rowDefinition5});
-            this.Root.Size = new System.Drawing.Size(1325, 180);
+            this.Root.Size = new System.Drawing.Size(1346, 176);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -793,59 +768,59 @@
             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(326, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem1.Text = "鍏ュ簱鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_abtNo;
-            this.layoutControlItem2.Location = new System.Drawing.Point(326, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(331, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem2.Text = "鐢宠鍗曞彿";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_checkUser;
-            this.layoutControlItem4.Location = new System.Drawing.Point(978, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(993, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem4.Size = new System.Drawing.Size(327, 32);
+            this.layoutControlItem4.Size = new System.Drawing.Size(333, 31);
             this.layoutControlItem4.Text = "瀹℃牳浜�";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_kcOrg;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 31);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem5.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem5.Text = "搴撳瓨缁勭粐";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_checkDate;
-            this.layoutControlItem8.Location = new System.Drawing.Point(978, 32);
+            this.layoutControlItem8.Location = new System.Drawing.Point(993, 31);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(327, 32);
+            this.layoutControlItem8.Size = new System.Drawing.Size(333, 31);
             this.layoutControlItem8.Text = "瀹℃牳鏃ユ湡";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_status;
-            this.layoutControlItem12.Location = new System.Drawing.Point(978, 64);
+            this.layoutControlItem12.Location = new System.Drawing.Point(993, 62);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(327, 32);
+            this.layoutControlItem12.Size = new System.Drawing.Size(333, 31);
             this.layoutControlItem12.Text = "瀹℃牳鐘舵��";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
@@ -853,107 +828,107 @@
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_sqRemark;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 128);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 124);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem16.Size = new System.Drawing.Size(652, 32);
+            this.layoutControlItem16.Size = new System.Drawing.Size(662, 32);
             this.layoutControlItem16.Text = "澶囨敞";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_ckName;
-            this.layoutControlItem14.Location = new System.Drawing.Point(326, 32);
+            this.layoutControlItem14.Location = new System.Drawing.Point(331, 31);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem14.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem14.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem14.Text = "浠撳簱鍚嶇О";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_ckNo;
-            this.layoutControlItem6.Location = new System.Drawing.Point(326, 64);
+            this.layoutControlItem6.Location = new System.Drawing.Point(331, 62);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem6.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem6.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem6.Text = "浠撳簱缂栧彿";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_custName;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 64);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 62);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem9.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem9.Text = "瀹㈡埛鍚嶇О";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_xsNo;
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 93);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem7.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem7.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem7.Text = "閿�鍞崟鍙�";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_djlx;
-            this.layoutControlItem3.Location = new System.Drawing.Point(326, 96);
+            this.layoutControlItem3.Location = new System.Drawing.Point(331, 93);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem3.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_createBy;
-            this.layoutControlItem11.Location = new System.Drawing.Point(652, 0);
+            this.layoutControlItem11.Location = new System.Drawing.Point(662, 0);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem11.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem11.Text = "鍒涘缓浜�";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_createDate;
-            this.layoutControlItem15.Location = new System.Drawing.Point(652, 32);
+            this.layoutControlItem15.Location = new System.Drawing.Point(662, 31);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem15.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem15.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem15.Text = "鍒涘缓鏃堕棿";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txt_lastupdateBy;
-            this.layoutControlItem17.Location = new System.Drawing.Point(652, 64);
+            this.layoutControlItem17.Location = new System.Drawing.Point(662, 62);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem17.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem17.Text = "鏈�鍚庢洿鏂颁汉";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_lastupdateDate;
-            this.layoutControlItem18.Location = new System.Drawing.Point(652, 96);
+            this.layoutControlItem18.Location = new System.Drawing.Point(662, 93);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem18.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem18.Size = new System.Drawing.Size(331, 31);
             this.layoutControlItem18.Text = "鏈�鍚庢洿鏂版椂闂�";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -966,15 +941,15 @@
             this.tabMx.Size = new System.Drawing.Size(1346, 382);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.tabMxPage2,
-            this.tabMxPage1});
+            this.tabMxPage1,
+            this.tabMxPage2});
             // 
-            // tabMxPage1
+            // tabMxPage2
             // 
-            this.tabMxPage1.Controls.Add(this.gcMx2);
-            this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1344, 350);
-            this.tabMxPage1.Text = "鍏ュ簱鏉$爜";
+            this.tabMxPage2.Controls.Add(this.gcMx2);
+            this.tabMxPage2.Name = "tabMxPage2";
+            this.tabMxPage2.Size = new System.Drawing.Size(1344, 350);
+            this.tabMxPage2.Text = "鍏ュ簱鏉$爜";
             // 
             // gcMx2
             // 
@@ -1008,7 +983,6 @@
             // 
             // gvMx1itemBarcode
             // 
-            this.gvMx1itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜";
             this.gvMx1itemBarcode.FieldName = "itemBarcode";
@@ -1021,7 +995,6 @@
             // 
             // gvMx1cItemCode
             // 
-            this.gvMx1cItemCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1cItemCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1cItemCode.Caption = "鐗╂枡缂栫爜";
             this.gvMx1cItemCode.FieldName = "itemNo";
@@ -1034,7 +1007,6 @@
             // 
             // gvMx1itemSname
             // 
-            this.gvMx1itemSname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1itemSname.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemSname.Caption = "鐗╂枡鍚嶇О";
             this.gvMx1itemSname.FieldName = "itemName";
@@ -1047,7 +1019,6 @@
             // 
             // gvMx1itemNo
             // 
-            this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemNo.Caption = "瑙勬牸鍨嬪彿";
             this.gvMx1itemNo.FieldName = "itemModel";
@@ -1060,7 +1031,6 @@
             // 
             // gvMx1quantity
             // 
-            this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
             this.gvMx1quantity.Caption = "鏁伴噺";
             this.gvMx1quantity.FieldName = "quantity";
@@ -1073,7 +1043,6 @@
             // 
             // gvMx1unit
             // 
-            this.gvMx1unit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1unit.AppearanceCell.Options.UseFont = true;
             this.gvMx1unit.Caption = "搴撳瓨鍗曚綅";
             this.gvMx1unit.FieldName = "kcUnit";
@@ -1086,7 +1055,6 @@
             // 
             // gvMx1depotCode
             // 
-            this.gvMx1depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1depotCode.Caption = "浠撳簱缂栫爜";
             this.gvMx1depotCode.FieldName = "depotCode";
@@ -1099,7 +1067,6 @@
             // 
             // gvMx1depotSectionCode
             // 
-            this.gvMx1depotSectionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜";
             this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
@@ -1112,7 +1079,6 @@
             // 
             // gridColumn1
             // 
-            this.gridColumn1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridColumn1.AppearanceCell.Options.UseFont = true;
             this.gridColumn1.Caption = "寤虹珛鑰�";
             this.gridColumn1.FieldName = "createBy";
@@ -1124,7 +1090,6 @@
             // 
             // gridColumn2
             // 
-            this.gridColumn2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridColumn2.AppearanceCell.Options.UseFont = true;
             this.gridColumn2.Caption = "寤虹珛鏃堕棿";
             this.gridColumn2.FieldName = "createDate";
@@ -1134,12 +1099,12 @@
             this.gridColumn2.VisibleIndex = 9;
             this.gridColumn2.Width = 94;
             // 
-            // tabMxPage2
+            // tabMxPage1
             // 
-            this.tabMxPage2.Controls.Add(this.gcMx1);
-            this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1344, 350);
-            this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
+            this.tabMxPage1.Controls.Add(this.gcMx1);
+            this.tabMxPage1.Name = "tabMxPage1";
+            this.tabMxPage1.Size = new System.Drawing.Size(1344, 350);
+            this.tabMxPage1.Text = "鍏ュ簱鏄庣粏";
             // 
             // gcMx1
             // 
@@ -1161,7 +1126,8 @@
             this.gvMx2quantity,
             this.gvMx2unit,
             this.gridColumn5,
-            this.gridColumn6});
+            this.gridColumn6,
+            this.gridColumn7});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1190,7 +1156,6 @@
             // 
             // gvMx2itemSname
             // 
-            this.gvMx2itemSname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О";
             this.gvMx2itemSname.FieldName = "itemName";
@@ -1203,7 +1168,6 @@
             // 
             // gvMx2quantity
             // 
-            this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
             this.gvMx2quantity.Caption = "鏁伴噺";
             this.gvMx2quantity.FieldName = "quantity";
@@ -1216,7 +1180,6 @@
             // 
             // gvMx2unit
             // 
-            this.gvMx2unit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2unit.AppearanceCell.Options.UseFont = true;
             this.gvMx2unit.Caption = "搴撳瓨鍗曚綅";
             this.gvMx2unit.FieldName = "kcUnit";
@@ -1229,7 +1192,6 @@
             // 
             // gridColumn5
             // 
-            this.gridColumn5.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridColumn5.AppearanceCell.Options.UseFont = true;
             this.gridColumn5.Caption = "寤虹珛鑰�";
             this.gridColumn5.FieldName = "createBy";
@@ -1241,7 +1203,6 @@
             // 
             // gridColumn6
             // 
-            this.gridColumn6.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridColumn6.AppearanceCell.Options.UseFont = true;
             this.gridColumn6.Caption = "寤虹珛鏃堕棿";
             this.gridColumn6.FieldName = "createDate";
@@ -1250,6 +1211,16 @@
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 6;
             this.gridColumn6.Width = 94;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "澶囨敞淇℃伅";
+            this.gridColumn7.FieldName = "sqRemark";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 7;
+            this.gridColumn7.Width = 94;
             // 
             // picCheckBox
             // 
@@ -1327,10 +1298,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
-            this.tabMxPage1.ResumeLayout(false);
+            this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            this.tabMxPage2.ResumeLayout(false);
+            this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
@@ -1389,7 +1360,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
         private DevExpress.XtraTab.XtraTabControl tabMx;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
         private DevExpress.XtraGrid.GridControl gcMx2;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
@@ -1402,7 +1373,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -1424,5 +1395,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3