From b77cf0b90deead4446855bd01d5b5931d045ed5b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 27 二月 2025 17:39:49 +0800
Subject: [PATCH] 销售

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs |  104 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 58 insertions(+), 46 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 9887491..1d884e4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -29,11 +29,11 @@
         /// </summary>
         private void InitializeComponent()
         {
-            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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
             this.gvMx1fseq = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1fEntrynote = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1fRealQty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -55,6 +55,8 @@
             this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.lb_fApproverStaus = new DevExpress.XtraEditors.LabelControl();
@@ -82,7 +84,6 @@
             this.lb_fCreatorId = new DevExpress.XtraEditors.LabelControl();
             this.txt_fCreatorId = new DevExpress.XtraEditors.TextEdit();
             this.gv_fCreatorId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_fStockOrgId = new DevExpress.XtraEditors.LabelControl();
             this.gv_fStockOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_fSaleOrgId = new DevExpress.XtraEditors.LabelControl();
             this.gv_fSaleOrgId = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -105,7 +106,6 @@
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.panel1 = new System.Windows.Forms.Panel();
             this.txt_fApproverStaus = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_fStockOrgId = new Gs.DevApp.UserControl.UcLookOrg();
             this.txt_fCustomerID = new DevExpress.XtraEditors.TextEdit();
             this.txt_salesId = new Gs.DevApp.UserControl.UcLookSales();
             this.lb_salesId = new DevExpress.XtraEditors.LabelControl();
@@ -119,6 +119,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
@@ -248,7 +250,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 389);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 386);
             this.tabMxPage1.Text = "鐢宠鏄庣粏";
             // 
             // gcMx1
@@ -259,8 +261,9 @@
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemSearchLookUpEdit1,
-            this.repositoryItemButtonEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 389);
+            this.repositoryItemButtonEdit1,
+            this.repositoryItemDateEdit1});
+            this.gcMx1.Size = new System.Drawing.Size(1124, 386);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -276,6 +279,7 @@
             this.gvMx1fRealQty,
             this.gvMx1fEntrynote,
             this.gvMx1fseq,
+            this.gridColumn11,
             this.gvMxDel});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
@@ -389,6 +393,31 @@
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 7;
             // 
+            // gridColumn11
+            // 
+            this.gridColumn11.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn11.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn11.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn11.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn11.Caption = "棰勮鍙戣揣鏃堕棿";
+            this.gridColumn11.ColumnEdit = this.repositoryItemDateEdit1;
+            this.gridColumn11.FieldName = "yjfhDate";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Tag = "edit";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 8;
+            this.gridColumn11.Width = 94;
+            // 
+            // repositoryItemDateEdit1
+            // 
+            this.repositoryItemDateEdit1.AutoHeight = false;
+            this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
+            // 
             // gvMxDel
             // 
             this.gvMxDel.Caption = "绉诲嚭";
@@ -396,16 +425,16 @@
             this.gvMxDel.MinWidth = 25;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 8;
+            this.gvMxDel.VisibleIndex = 9;
             this.gvMxDel.Width = 94;
             // 
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -438,7 +467,7 @@
             // 
             this.lb_fNote.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fNote.Appearance.Options.UseFont = true;
-            this.lb_fNote.Location = new System.Drawing.Point(40, 118);
+            this.lb_fNote.Location = new System.Drawing.Point(40, 89);
             this.lb_fNote.Name = "lb_fNote";
             this.lb_fNote.Size = new System.Drawing.Size(39, 21);
             this.lb_fNote.TabIndex = 243;
@@ -446,7 +475,7 @@
             // 
             // txt_fNote
             // 
-            this.txt_fNote.Location = new System.Drawing.Point(84, 114);
+            this.txt_fNote.Location = new System.Drawing.Point(84, 85);
             this.txt_fNote.Name = "txt_fNote";
             this.txt_fNote.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fNote.Properties.Appearance.Options.UseFont = true;
@@ -483,7 +512,7 @@
             this.txt_fDate.Name = "txt_fDate";
             this.txt_fDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fDate.Size = new System.Drawing.Size(173, 28);
+            this.txt_fDate.Size = new System.Drawing.Size(188, 28);
             this.txt_fDate.TabIndex = 240;
             this.txt_fDate.Tag = "readonly";
             // 
@@ -609,7 +638,7 @@
             this.txt_fCreateDate.Name = "txt_fCreateDate";
             this.txt_fCreateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCreateDate.Size = new System.Drawing.Size(173, 28);
+            this.txt_fCreateDate.Size = new System.Drawing.Size(188, 28);
             this.txt_fCreateDate.TabIndex = 226;
             this.txt_fCreateDate.Tag = "readonly";
             // 
@@ -677,7 +706,7 @@
             this.txt_fCreatorId.Name = "txt_fCreatorId";
             this.txt_fCreatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
-            this.txt_fCreatorId.Size = new System.Drawing.Size(173, 28);
+            this.txt_fCreatorId.Size = new System.Drawing.Size(188, 28);
             this.txt_fCreatorId.TabIndex = 219;
             this.txt_fCreatorId.Tag = "readonly";
             // 
@@ -694,16 +723,6 @@
             this.gv_fCreatorId.Visible = true;
             this.gv_fCreatorId.VisibleIndex = 5;
             this.gv_fCreatorId.Width = 94;
-            // 
-            // lb_fStockOrgId
-            // 
-            this.lb_fStockOrgId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_fStockOrgId.Appearance.Options.UseFont = true;
-            this.lb_fStockOrgId.Location = new System.Drawing.Point(6, 86);
-            this.lb_fStockOrgId.Name = "lb_fStockOrgId";
-            this.lb_fStockOrgId.Size = new System.Drawing.Size(73, 21);
-            this.lb_fStockOrgId.TabIndex = 217;
-            this.lb_fStockOrgId.Text = "鍙戣揣缁勭粐 ";
             // 
             // gv_fStockOrgId
             // 
@@ -943,10 +962,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 149);
+            this.tabMx.Location = new System.Drawing.Point(0, 152);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 421);
+            this.tabMx.Size = new System.Drawing.Size(1126, 418);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -955,7 +974,6 @@
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
             this.panel1.Controls.Add(this.txt_fApproverStaus);
-            this.panel1.Controls.Add(this.txt_fStockOrgId);
             this.panel1.Controls.Add(this.txt_fCustomerID);
             this.panel1.Controls.Add(this.txt_salesId);
             this.panel1.Controls.Add(this.lb_salesId);
@@ -979,7 +997,6 @@
             this.panel1.Controls.Add(this.txt_fApproverID);
             this.panel1.Controls.Add(this.lb_fCreatorId);
             this.panel1.Controls.Add(this.txt_fCreatorId);
-            this.panel1.Controls.Add(this.lb_fStockOrgId);
             this.panel1.Controls.Add(this.lb_fSaleOrgId);
             this.panel1.Controls.Add(this.lb_fBillTypeID);
             this.panel1.Controls.Add(this.lb_billNo);
@@ -990,7 +1007,7 @@
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1126, 149);
+            this.panel1.Size = new System.Drawing.Size(1126, 152);
             this.panel1.TabIndex = 1;
             // 
             // txt_fApproverStaus
@@ -1001,14 +1018,6 @@
             this.txt_fApproverStaus.Properties.Caption = "";
             this.txt_fApproverStaus.Size = new System.Drawing.Size(59, 24);
             this.txt_fApproverStaus.TabIndex = 370;
-            // 
-            // txt_fStockOrgId
-            // 
-            this.txt_fStockOrgId.IsReadly = false;
-            this.txt_fStockOrgId.Location = new System.Drawing.Point(84, 81);
-            this.txt_fStockOrgId.Name = "txt_fStockOrgId";
-            this.txt_fStockOrgId.Size = new System.Drawing.Size(179, 30);
-            this.txt_fStockOrgId.TabIndex = 369;
             // 
             // txt_fCustomerID
             // 
@@ -1058,7 +1067,7 @@
             this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
             "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)"});
             this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fBillTypeID.Size = new System.Drawing.Size(173, 24);
+            this.txt_fBillTypeID.Size = new System.Drawing.Size(188, 24);
             this.txt_fBillTypeID.TabIndex = 362;
             // 
             // labelControl11
@@ -1069,6 +1078,7 @@
             this.labelControl11.Size = new System.Drawing.Size(45, 18);
             this.labelControl11.TabIndex = 130;
             this.labelControl11.Text = "涓婚敭锛�";
+            this.labelControl11.Visible = false;
             // 
             // lbGuid
             // 
@@ -1077,6 +1087,7 @@
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
             this.lbGuid.TabIndex = 1;
+            this.lbGuid.Visible = false;
             // 
             // picCheckBox
             // 
@@ -1104,6 +1115,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
@@ -1189,8 +1202,6 @@
         private DevExpress.XtraEditors.LabelControl lb_fCreatorId;
         private DevExpress.XtraEditors.TextEdit txt_fCreatorId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fCreatorId;
-
-        private DevExpress.XtraEditors.LabelControl lb_fStockOrgId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fStockOrgId;
 
         private DevExpress.XtraEditors.LabelControl lb_fSaleOrgId;
@@ -1217,7 +1228,6 @@
         private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View;
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private UserControl.UcLookOrg txt_fStockOrgId;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraEditors.CheckEdit txt_fApproverStaus;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
@@ -1228,5 +1238,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3