From 0569cccc1f91346caca8cc8f2c65b9f174ce2891 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 24 十二月 2024 11:07:17 +0800
Subject: [PATCH] 委外

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs |  110 ++++++++++++++++++++++++++++++++----------------------
 1 files changed, 65 insertions(+), 45 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 04b0b55..1fe7d32 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -29,11 +29,11 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            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();
             this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -64,6 +64,7 @@
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
             this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
@@ -133,7 +134,7 @@
             this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
             this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
-            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -204,7 +205,7 @@
             // 
             this.gvMx2itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜 ";
+            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
             this.gvMx2itemBarcode.FieldName = "itemBarcode";
             this.gvMx2itemBarcode.MinWidth = 50;
             this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
@@ -355,6 +356,7 @@
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+            this.gvMx1.OptionsFilter.AllowFilterEditor = false;
             this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
             this.gvMx1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
             this.gvMx1.OptionsView.ShowGroupPanel = false;
@@ -541,13 +543,23 @@
             this.gridColumn7.VisibleIndex = 12;
             this.gridColumn7.Width = 94;
             // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "鍙墦鍗版�婚噺";
+            this.gridColumn10.FieldName = "kyPrtQty";
+            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 13;
+            this.gridColumn10.Width = 94;
+            // 
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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;
             // 
@@ -558,6 +570,7 @@
             // 
             // panelMx1
             // 
+            this.panelMx1.Controls.Add(this.ucBtnPrint1);
             this.panelMx1.Controls.Add(this.lbMxGuid);
             this.panelMx1.Controls.Add(this.txt_iCount_1);
             this.panelMx1.Controls.Add(this.labelControl14);
@@ -583,11 +596,12 @@
             // 
             // lbMxGuid
             // 
-            this.lbMxGuid.Location = new System.Drawing.Point(552, 75);
+            this.lbMxGuid.Location = new System.Drawing.Point(845, 7);
             this.lbMxGuid.Name = "lbMxGuid";
             this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
             this.lbMxGuid.TabIndex = 229;
             this.lbMxGuid.Text = "lbMxGuid";
+            this.lbMxGuid.Visible = false;
             // 
             // txt_iCount_1
             // 
@@ -679,7 +693,7 @@
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(77, 65);
+            this.txtWlgg.Location = new System.Drawing.Point(90, 65);
             this.txtWlgg.Name = "txtWlgg";
             this.txtWlgg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
@@ -691,13 +705,13 @@
             // 
             this.labelControl9.Location = new System.Drawing.Point(11, 70);
             this.labelControl9.Name = "labelControl9";
-            this.labelControl9.Size = new System.Drawing.Size(60, 18);
+            this.labelControl9.Size = new System.Drawing.Size(75, 18);
             this.labelControl9.TabIndex = 217;
-            this.labelControl9.Text = "鐗╂枡瑙勬牸";
+            this.labelControl9.Text = "鐗╂枡瑙勬牸锛�";
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(77, 34);
+            this.txtWlmc.Location = new System.Drawing.Point(90, 34);
             this.txtWlmc.Name = "txtWlmc";
             this.txtWlmc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
@@ -709,13 +723,13 @@
             // 
             this.labelControl8.Location = new System.Drawing.Point(11, 39);
             this.labelControl8.Name = "labelControl8";
-            this.labelControl8.Size = new System.Drawing.Size(60, 18);
+            this.labelControl8.Size = new System.Drawing.Size(75, 18);
             this.labelControl8.TabIndex = 215;
-            this.labelControl8.Text = "鐗╂枡鍚嶇О";
+            this.labelControl8.Text = "鐗╂枡鍚嶇О锛�";
             // 
             // txtWlid
             // 
-            this.txtWlid.Location = new System.Drawing.Point(77, 4);
+            this.txtWlid.Location = new System.Drawing.Point(90, 4);
             this.txtWlid.Name = "txtWlid";
             this.txtWlid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtWlid.Properties.Appearance.Options.UseFont = true;
@@ -727,9 +741,9 @@
             // 
             this.labelControl7.Location = new System.Drawing.Point(25, 9);
             this.labelControl7.Name = "labelControl7";
-            this.labelControl7.Size = new System.Drawing.Size(46, 18);
+            this.labelControl7.Size = new System.Drawing.Size(61, 18);
             this.labelControl7.TabIndex = 213;
-            this.labelControl7.Text = "鐗╂枡ID";
+            this.labelControl7.Text = "鐗╂枡ID锛�";
             // 
             // gv_urgentFlag
             // 
@@ -737,13 +751,14 @@
             this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
             this.gv_urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
             this.gv_urgentFlag.FieldName = "urgentFlag";
+            this.gv_urgentFlag.MaxWidth = 50;
             this.gv_urgentFlag.MinWidth = 50;
             this.gv_urgentFlag.Name = "gv_urgentFlag";
             this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
             this.gv_urgentFlag.Tag = "query_a.urgent_flag";
             this.gv_urgentFlag.Visible = true;
             this.gv_urgentFlag.VisibleIndex = 0;
-            this.gv_urgentFlag.Width = 94;
+            this.gv_urgentFlag.Width = 50;
             // 
             // gv_fstatus
             // 
@@ -751,13 +766,14 @@
             this.gv_fstatus.AppearanceCell.Options.UseFont = true;
             this.gv_fstatus.Caption = "宸蹭氦妫�楠�";
             this.gv_fstatus.FieldName = "fstatus";
+            this.gv_fstatus.MaxWidth = 50;
             this.gv_fstatus.MinWidth = 50;
             this.gv_fstatus.Name = "gv_fstatus";
             this.gv_fstatus.OptionsColumn.AllowEdit = false;
             this.gv_fstatus.Tag = "query_a.fstatus";
             this.gv_fstatus.Visible = true;
             this.gv_fstatus.VisibleIndex = 1;
-            this.gv_fstatus.Width = 94;
+            this.gv_fstatus.Width = 50;
             // 
             // gv_suppNo
             // 
@@ -793,13 +809,13 @@
             this.gv_insDate.AppearanceCell.Options.UseFont = true;
             this.gv_insDate.Caption = "鏉ユ枡鏃ユ湡";
             this.gv_insDate.FieldName = "insDate";
-            this.gv_insDate.MinWidth = 50;
+            this.gv_insDate.MinWidth = 180;
             this.gv_insDate.Name = "gv_insDate";
             this.gv_insDate.OptionsColumn.AllowEdit = false;
             this.gv_insDate.Tag = "query_a.ins_date";
             this.gv_insDate.Visible = true;
             this.gv_insDate.VisibleIndex = 6;
-            this.gv_insDate.Width = 94;
+            this.gv_insDate.Width = 180;
             // 
             // gv_checkDate
             // 
@@ -807,13 +823,13 @@
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "鎻愪氦鏃ユ湡";
             this.gv_checkDate.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 50;
+            this.gv_checkDate.MinWidth = 180;
             this.gv_checkDate.Name = "gv_checkDate";
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.check_date";
             this.gv_checkDate.Visible = true;
             this.gv_checkDate.VisibleIndex = 7;
-            this.gv_checkDate.Width = 94;
+            this.gv_checkDate.Width = 180;
             // 
             // gv_remark
             // 
@@ -849,13 +865,14 @@
             this.gv_status.AppearanceCell.Options.UseFont = true;
             this.gv_status.Caption = "鍏ュ簱";
             this.gv_status.FieldName = "status";
+            this.gv_status.MaxWidth = 50;
             this.gv_status.MinWidth = 50;
             this.gv_status.Name = "gv_status";
             this.gv_status.OptionsColumn.AllowEdit = false;
             this.gv_status.Tag = "query_a.status";
             this.gv_status.Visible = true;
             this.gv_status.VisibleIndex = 2;
-            this.gv_status.Width = 94;
+            this.gv_status.Width = 50;
             // 
             // gv_billNo
             // 
@@ -863,17 +880,18 @@
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
             this.gv_billNo.FieldName = "billNo";
-            this.gv_billNo.MinWidth = 50;
+            this.gv_billNo.MinWidth = 120;
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.bill_no";
             this.gv_billNo.Visible = true;
             this.gv_billNo.VisibleIndex = 3;
-            this.gv_billNo.Width = 94;
+            this.gv_billNo.Width = 120;
             // 
             // toolBarMenu1
             // 
             this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
             this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
@@ -899,8 +917,13 @@
             // 
             // gridView1
             // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.Appearance.ViewCaption.Options.UseTextOptions = true;
+            this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gv_urgentFlag,
             this.gv_fstatus,
@@ -937,12 +960,12 @@
             // 
             this.gridColumn2.Caption = "渚涘簲鍟嗗悕绉�";
             this.gridColumn2.FieldName = "suppName";
-            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.MinWidth = 200;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.OptionsColumn.AllowEdit = false;
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 9;
-            this.gridColumn2.Width = 94;
+            this.gridColumn2.Width = 200;
             // 
             // gridColumn3
             // 
@@ -973,7 +996,7 @@
             this.xtraTabPage1.Controls.Add(this.pageBar1);
             this.xtraTabPage1.Name = "xtraTabPage1";
             this.xtraTabPage1.Size = new System.Drawing.Size(1344, 570);
-            this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // pageBar1
             // 
@@ -983,7 +1006,6 @@
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.RowsCount = 50;
             this.pageBar1.Size = new System.Drawing.Size(1344, 39);
             this.pageBar1.TabIndex = 3;
             this.pageBar1.TotalPages = 0;
@@ -993,9 +1015,8 @@
             this.xtraTabPage2.Controls.Add(this.tabMx);
             this.xtraTabPage2.Controls.Add(this.panel1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.PageEnabled = false;
             this.xtraTabPage2.Size = new System.Drawing.Size(1344, 570);
-            this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // tabMx
             // 
@@ -1123,7 +1144,6 @@
             // txt_depotsId
             // 
             this.txt_depotsId.IsReadly = true;
-            this.txt_depotsId.KeyFile = "";
             this.txt_depotsId.Location = new System.Drawing.Point(413, 51);
             this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
             this.txt_depotsId.Name = "txt_depotsId";
@@ -1143,7 +1163,6 @@
             // txt_suppId
             // 
             this.txt_suppId.IsReadly = true;
-            this.txt_suppId.KeyFile = "";
             this.txt_suppId.Location = new System.Drawing.Point(111, 51);
             this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
             this.txt_suppId.Name = "txt_suppId";
@@ -1302,15 +1321,14 @@
             this.txt_billNo.Size = new System.Drawing.Size(215, 28);
             this.txt_billNo.TabIndex = 211;
             // 
-            // gridColumn10
+            // ucBtnPrint1
             // 
-            this.gridColumn10.Caption = "鍙墦鍗版�婚噺";
-            this.gridColumn10.FieldName = "kyPrtQty";
-            this.gridColumn10.MinWidth = 25;
-            this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 13;
-            this.gridColumn10.Width = 94;
+            this.ucBtnPrint1.guidKey = null;
+            this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
+            this.ucBtnPrint1.Name = "ucBtnPrint1";
+            this.ucBtnPrint1.rptParameter = null;
+            this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
+            this.ucBtnPrint1.TabIndex = 232;
             // 
             // Frm_ArrivalBarcode
             // 
@@ -1320,6 +1338,7 @@
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_ArrivalBarcode";
+            this.Text = "鍒拌揣鏉$爜鎵撳嵃";
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
@@ -1464,5 +1483,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraEditors.LabelControl lbMxGuid;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private UserControl.UcBtnPrint ucBtnPrint1;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3