From 3d429071ceeda5ce75ca660c13459c13f3d92337 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 26 二月 2025 10:30:11 +0800
Subject: [PATCH] 调拨

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs |  120 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 65 insertions(+), 55 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index aa1dbf3..d89e316 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -47,6 +47,8 @@
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
             this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.lb_fApproverStaus = new DevExpress.XtraEditors.LabelControl();
             this.txt_fApproverStaus = new DevExpress.XtraEditors.TextEdit();
             this.gv_fApproverStaus = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -88,28 +90,28 @@
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.panel1 = new System.Windows.Forms.Panel();
+            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();
             this.txt_fSaleOrgId = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fStockOrgId = new DevExpress.XtraEditors.TextEdit();
             this.txt_fBillTypeID = new DevExpress.XtraEditors.ComboBoxEdit();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).BeginInit();
@@ -131,10 +133,8 @@
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fStockOrgId.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             this.SuspendLayout();
             // 
             // gvMx1fseq
@@ -240,7 +240,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 282);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 354);
             this.tabMxPage1.Text = "鏄庣粏1";
             // 
             // gcMx1
@@ -252,7 +252,7 @@
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemSearchLookUpEdit1,
             this.repositoryItemButtonEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 282);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 354);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -308,6 +308,27 @@
             this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
             this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
             // 
+            // gvMxDel
+            // 
+            this.gvMxDel.Caption = "绉诲嚭";
+            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gvMxDel.MinWidth = 25;
+            this.gvMxDel.Name = "gvMxDel";
+            this.gvMxDel.Visible = true;
+            this.gvMxDel.VisibleIndex = 8;
+            this.gvMxDel.Width = 94;
+            // 
+            // 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);
+            // 
             // lb_fApproverStaus
             // 
             this.lb_fApproverStaus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -331,8 +352,8 @@
             // 
             this.gv_fApproverStaus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fApproverStaus.AppearanceCell.Options.UseFont = true;
-            this.gv_fApproverStaus.Caption = "FApproverStaus ";
-            this.gv_fApproverStaus.FieldName = "fApproverStaus";
+            this.gv_fApproverStaus.Caption = "瀹℃牳鏍囪瘑";
+            this.gv_fApproverStaus.FieldName = "chkStatus";
             this.gv_fApproverStaus.MinWidth = 50;
             this.gv_fApproverStaus.Name = "gv_fApproverStaus";
             this.gv_fApproverStaus.OptionsColumn.AllowEdit = false;
@@ -386,7 +407,7 @@
             // 
             // txt_fDate
             // 
-            this.txt_fDate.Location = new System.Drawing.Point(830, 84);
+            this.txt_fDate.Location = new System.Drawing.Point(849, 84);
             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;
@@ -509,7 +530,7 @@
             // 
             // txt_fCreateDate
             // 
-            this.txt_fCreateDate.Location = new System.Drawing.Point(830, 52);
+            this.txt_fCreateDate.Location = new System.Drawing.Point(849, 52);
             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;
@@ -542,7 +563,7 @@
             // 
             // txt_fApproverID
             // 
-            this.txt_fApproverID.Location = new System.Drawing.Point(580, 52);
+            this.txt_fApproverID.Location = new System.Drawing.Point(592, 52);
             this.txt_fApproverID.Name = "txt_fApproverID";
             this.txt_fApproverID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fApproverID.Properties.Appearance.Options.UseFont = true;
@@ -553,7 +574,7 @@
             // 
             this.gv_fApproverID.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fApproverID.AppearanceCell.Options.UseFont = true;
-            this.gv_fApproverID.Caption = "FApproverID ";
+            this.gv_fApproverID.Caption = "瀹℃牳浜�";
             this.gv_fApproverID.FieldName = "fApproverID";
             this.gv_fApproverID.MinWidth = 50;
             this.gv_fApproverID.Name = "gv_fApproverID";
@@ -779,13 +800,24 @@
             this.gv_fCustomerID,
             this.gv_fDate,
             this.gv_fNote,
-            this.gv_fApproverStaus});
+            this.gv_fApproverStaus,
+            this.gridColumn2});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "瀹岀粨鏍囪瘑";
+            this.gridColumn2.FieldName = "wjStatus";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 14;
+            this.gridColumn2.Width = 94;
             // 
             // xtraTabControl1
             // 
@@ -831,10 +863,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 256);
+            this.tabMx.Location = new System.Drawing.Point(0, 184);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 314);
+            this.tabMx.Size = new System.Drawing.Size(1126, 386);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -842,11 +874,11 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            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);
             this.panel1.Controls.Add(this.txt_fSaleOrgId);
-            this.panel1.Controls.Add(this.txt_fStockOrgId);
             this.panel1.Controls.Add(this.txt_fBillTypeID);
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.lbGuid);
@@ -878,12 +910,20 @@
             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, 256);
+            this.panel1.Size = new System.Drawing.Size(1126, 184);
             this.panel1.TabIndex = 1;
+            // 
+            // txt_fStockOrgId
+            // 
+            this.txt_fStockOrgId.IsReadly = false;
+            this.txt_fStockOrgId.Location = new System.Drawing.Point(80, 48);
+            this.txt_fStockOrgId.Name = "txt_fStockOrgId";
+            this.txt_fStockOrgId.Size = new System.Drawing.Size(138, 30);
+            this.txt_fStockOrgId.TabIndex = 369;
             // 
             // txt_fCustomerID
             // 
-            this.txt_fCustomerID.Location = new System.Drawing.Point(565, 86);
+            this.txt_fCustomerID.Location = new System.Drawing.Point(592, 86);
             this.txt_fCustomerID.Name = "txt_fCustomerID";
             this.txt_fCustomerID.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fCustomerID.Properties.Appearance.Options.UseFont = true;
@@ -893,7 +933,7 @@
             // txt_salesId
             // 
             this.txt_salesId.IsReadly = false;
-            this.txt_salesId.Location = new System.Drawing.Point(144, 190);
+            this.txt_salesId.Location = new System.Drawing.Point(80, 150);
             this.txt_salesId.Name = "txt_salesId";
             this.txt_salesId.Size = new System.Drawing.Size(234, 29);
             this.txt_salesId.TabIndex = 367;
@@ -902,7 +942,7 @@
             // 
             this.lb_salesId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_salesId.Appearance.Options.UseFont = true;
-            this.lb_salesId.Location = new System.Drawing.Point(39, 190);
+            this.lb_salesId.Location = new System.Drawing.Point(20, 150);
             this.lb_salesId.Name = "lb_salesId";
             this.lb_salesId.Size = new System.Drawing.Size(68, 21);
             this.lb_salesId.TabIndex = 366;
@@ -917,19 +957,10 @@
             this.txt_fSaleOrgId.Size = new System.Drawing.Size(150, 28);
             this.txt_fSaleOrgId.TabIndex = 365;
             // 
-            // txt_fStockOrgId
-            // 
-            this.txt_fStockOrgId.Location = new System.Drawing.Point(90, 52);
-            this.txt_fStockOrgId.Name = "txt_fStockOrgId";
-            this.txt_fStockOrgId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_fStockOrgId.Properties.Appearance.Options.UseFont = true;
-            this.txt_fStockOrgId.Size = new System.Drawing.Size(150, 28);
-            this.txt_fStockOrgId.TabIndex = 364;
-            // 
             // txt_fBillTypeID
             // 
             this.txt_fBillTypeID.EditValue = "鏍囧噯閿�鍞嚭搴撳崟(XSCKD01_SYS)";
-            this.txt_fBillTypeID.Location = new System.Drawing.Point(584, 17);
+            this.txt_fBillTypeID.Location = new System.Drawing.Point(592, 17);
             this.txt_fBillTypeID.Name = "txt_fBillTypeID";
             this.txt_fBillTypeID.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -967,27 +998,6 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // gvMxDel
-            // 
-            this.gvMxDel.Caption = "绉诲嚭";
-            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 25;
-            this.gvMxDel.Name = "gvMxDel";
-            this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 8;
-            this.gvMxDel.Width = 94;
-            // 
-            // 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_SalesDeliver
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1002,6 +1012,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fApproverStaus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fNote.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fDate.Properties)).EndInit();
@@ -1024,10 +1035,8 @@
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fCustomerID.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fSaleOrgId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fStockOrgId.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1109,7 +1118,6 @@
         private System.Windows.Forms.PictureBox picCheckBox;
         private DevExpress.XtraEditors.ComboBoxEdit txt_fBillTypeID;
         private DevExpress.XtraEditors.TextEdit txt_fSaleOrgId;
-        private DevExpress.XtraEditors.TextEdit txt_fStockOrgId;
         private DevExpress.XtraEditors.LabelControl lb_salesId;
         private UserControl.UcLookSales txt_salesId;
         private DevExpress.XtraEditors.TextEdit txt_fCustomerID;
@@ -1118,5 +1126,7 @@
         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;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3