From 9ce8cb1ee053fb5ad4b51d724a5736e0e27ff0aa Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 23 五月 2025 09:10:52 +0800
Subject: [PATCH] 仓库

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs |   85 ++++++++++++++++++++++++------------------
 1 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 2ccfd20..f6bebc1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -61,11 +61,11 @@
             this.gv_fApproveDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fSalesManID = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fCustomerID = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fNote = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
             this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -152,6 +152,7 @@
             this.gvMx1fseq = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn37 = 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();
@@ -303,11 +304,11 @@
             this.gv_fApproveDate,
             this.gv_fSalesManID,
             this.gv_fCustomerID,
-            this.gv_fDate,
             this.gv_fNote,
             this.gridColumn33,
             this.gridColumn34,
-            this.gridColumn35});
+            this.gridColumn35,
+            this.gridColumn36});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -462,19 +463,6 @@
             this.gv_fCustomerID.Tag = "query_a.FCustomerID";
             this.gv_fCustomerID.Width = 94;
             // 
-            // gv_fDate
-            // 
-            this.gv_fDate.AppearanceCell.Options.UseFont = true;
-            this.gv_fDate.Caption = "鏃ユ湡 ";
-            this.gv_fDate.FieldName = "fDate";
-            this.gv_fDate.MinWidth = 50;
-            this.gv_fDate.Name = "gv_fDate";
-            this.gv_fDate.OptionsColumn.AllowEdit = false;
-            this.gv_fDate.Tag = "query_a.FDate";
-            this.gv_fDate.Visible = true;
-            this.gv_fDate.VisibleIndex = 9;
-            this.gv_fDate.Width = 94;
-            // 
             // gv_fNote
             // 
             this.gv_fNote.AppearanceCell.Options.UseFont = true;
@@ -485,7 +473,7 @@
             this.gv_fNote.OptionsColumn.AllowEdit = false;
             this.gv_fNote.Tag = "query_a.FNote";
             this.gv_fNote.Visible = true;
-            this.gv_fNote.VisibleIndex = 10;
+            this.gv_fNote.VisibleIndex = 9;
             this.gv_fNote.Width = 94;
             // 
             // gridColumn33
@@ -495,7 +483,7 @@
             this.gridColumn33.MinWidth = 25;
             this.gridColumn33.Name = "gridColumn33";
             this.gridColumn33.Visible = true;
-            this.gridColumn33.VisibleIndex = 11;
+            this.gridColumn33.VisibleIndex = 10;
             this.gridColumn33.Width = 94;
             // 
             // gridColumn34
@@ -505,7 +493,7 @@
             this.gridColumn34.MinWidth = 25;
             this.gridColumn34.Name = "gridColumn34";
             this.gridColumn34.Visible = true;
-            this.gridColumn34.VisibleIndex = 12;
+            this.gridColumn34.VisibleIndex = 11;
             this.gridColumn34.Width = 94;
             // 
             // gridColumn35
@@ -515,8 +503,16 @@
             this.gridColumn35.MinWidth = 25;
             this.gridColumn35.Name = "gridColumn35";
             this.gridColumn35.Visible = true;
-            this.gridColumn35.VisibleIndex = 13;
+            this.gridColumn35.VisibleIndex = 12;
             this.gridColumn35.Width = 94;
+            // 
+            // gridColumn36
+            // 
+            this.gridColumn36.Caption = "涓婚敭Guid";
+            this.gridColumn36.FieldName = "guid";
+            this.gridColumn36.MinWidth = 25;
+            this.gridColumn36.Name = "gridColumn36";
+            this.gridColumn36.Width = 94;
             // 
             // pageBar1
             // 
@@ -864,7 +860,7 @@
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem10.Size = new System.Drawing.Size(278, 30);
-            this.layoutControlItem10.Text = "瀹℃牳浜�";
+            this.layoutControlItem10.Text = "瀹℃牳浜哄憳";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem11
@@ -901,7 +897,7 @@
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem6.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem6.Text = "鍒涘缓浜�";
+            this.layoutControlItem6.Text = "鍒涘缓浜哄憳";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem7
@@ -940,7 +936,7 @@
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem9.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem9.Text = "閿�鍞憳";
+            this.layoutControlItem9.Text = "閿�鍞汉鍛�";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem5
@@ -1082,7 +1078,8 @@
             this.gvMx1pid,
             this.gvMx1salesDetailId,
             this.gvMx1fseq,
-            this.gvMxDel});
+            this.gvMxDel,
+            this.gridColumn37});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1120,6 +1117,9 @@
             // 
             // gridView2
             // 
+            this.gridView2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView2.ColumnPanelRowHeight = 50;
             this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn10,
             this.gridColumn3,
@@ -1160,6 +1160,7 @@
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 2;
+            this.gridColumn4.Width = 50;
             // 
             // gridColumn5
             // 
@@ -1168,38 +1169,38 @@
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 3;
+            this.gridColumn5.Width = 50;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "渚涘簲缁勭粐";
             this.gridColumn7.FieldName = "gyOrg";
             this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 4;
             // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "搴撳瓨缁勭粐";
             this.gridColumn8.FieldName = "kcOrg";
             this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 5;
             // 
             // gridColumn9
             // 
-            this.gridColumn9.Caption = "鍓╀綑鏈嚭鏁伴噺";
+            this.gridColumn9.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn9.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn9.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn9.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn9.Caption = "鏈彂璐ф暟閲�";
             this.gridColumn9.FieldName = "syQty";
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 6;
+            this.gridColumn9.VisibleIndex = 4;
+            this.gridColumn9.Width = 50;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "閿�鍞粍缁�";
             this.gridColumn6.FieldName = "salesOrgName";
             this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 7;
             // 
             // gridColumn30
             // 
@@ -1207,7 +1208,7 @@
             this.gridColumn30.FieldName = "itemName";
             this.gridColumn30.Name = "gridColumn30";
             this.gridColumn30.Visible = true;
-            this.gridColumn30.VisibleIndex = 8;
+            this.gridColumn30.VisibleIndex = 5;
             // 
             // gridColumn31
             // 
@@ -1215,7 +1216,7 @@
             this.gridColumn31.FieldName = "itemModel";
             this.gridColumn31.Name = "gridColumn31";
             this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 9;
+            this.gridColumn31.VisibleIndex = 6;
             // 
             // gridColumn32
             // 
@@ -1223,7 +1224,8 @@
             this.gridColumn32.FieldName = "jjdw";
             this.gridColumn32.Name = "gridColumn32";
             this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 10;
+            this.gridColumn32.VisibleIndex = 7;
+            this.gridColumn32.Width = 50;
             // 
             // gvMx1fMustQty
             // 
@@ -1285,7 +1287,7 @@
             // gvMx1fRealQty
             // 
             this.gvMx1fRealQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fRealQty.Caption = "瀹炲彂鏁伴噺 ";
+            this.gvMx1fRealQty.Caption = "鏈瀹炲彂鏁伴噺 ";
             this.gvMx1fRealQty.FieldName = "fRealQty";
             this.gvMx1fRealQty.MinWidth = 50;
             this.gvMx1fRealQty.Name = "gvMx1fRealQty";
@@ -1535,6 +1537,14 @@
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
+            // gridColumn37
+            // 
+            this.gridColumn37.Caption = "鐗╂枡ID";
+            this.gridColumn37.FieldName = "itemId";
+            this.gridColumn37.MinWidth = 25;
+            this.gridColumn37.Name = "gridColumn37";
+            this.gridColumn37.Width = 94;
+            // 
             // picCheckBox
             // 
             this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1640,7 +1650,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_fApproveDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fSalesManID;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fCustomerID;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fNote;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fApproverStaus;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
@@ -1734,5 +1743,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3