From be94e54dc7cd0eb2e66f25d7def9a873c563564c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 10 一月 2025 09:53:30 +0800
Subject: [PATCH] 细节

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs |  369 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 214 insertions(+), 155 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index fed6dca..7dfe72f 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 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.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -45,6 +45,8 @@
             this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -59,18 +61,17 @@
             this.gvMx1okRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1ebelnQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
+            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
             this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
             this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
-            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
             this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
             this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
             this.txtKdy = new DevExpress.XtraEditors.TextEdit();
             this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
@@ -97,26 +98,29 @@
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = 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_dptName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_gysNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
             this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
             this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
             this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
-            this.txtDepotsId = new DevExpress.XtraEditors.TextEdit();
+            this.txt_depotsCode = new DevExpress.XtraEditors.TextEdit();
             this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
             this.label1 = new System.Windows.Forms.Label();
-            this.txtSupplierId = new DevExpress.XtraEditors.TextEdit();
-            this.txt_depotsId = new Gs.DevApp.UserControl.UcLookCk();
+            this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
             this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
             this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
             this.txt_percentage = new DevExpress.XtraEditors.TextEdit();
@@ -136,11 +140,10 @@
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
             this.panelMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
@@ -160,11 +163,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDepotsId.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_percentage.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
@@ -192,12 +197,12 @@
             this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
             this.gvMx2itemNo.FieldName = "itemNo";
-            this.gvMx2itemNo.MinWidth = 50;
+            this.gvMx2itemNo.MinWidth = 100;
             this.gvMx2itemNo.Name = "gvMx2itemNo";
             this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
             this.gvMx2itemNo.Visible = true;
             this.gvMx2itemNo.VisibleIndex = 2;
-            this.gvMx2itemNo.Width = 94;
+            this.gvMx2itemNo.Width = 100;
             // 
             // gvMx2itemBarcode
             // 
@@ -205,12 +210,12 @@
             this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
             this.gvMx2itemBarcode.FieldName = "itemBarcode";
-            this.gvMx2itemBarcode.MinWidth = 50;
+            this.gvMx2itemBarcode.MinWidth = 300;
             this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
             this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx2itemBarcode.Visible = true;
             this.gvMx2itemBarcode.VisibleIndex = 1;
-            this.gvMx2itemBarcode.Width = 94;
+            this.gvMx2itemBarcode.Width = 300;
             // 
             // gvMx2guid
             // 
@@ -236,6 +241,8 @@
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
+            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1});
             this.gcMx2.Size = new System.Drawing.Size(1342, 383);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -251,12 +258,12 @@
             this.gridColumn18,
             this.gridColumn14,
             this.gvMx2oldqty,
-            this.gridColumn17});
+            this.gridColumn17,
+            this.gvBtnAlawys});
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
             this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
             this.gvMx2.OptionsView.ShowGroupPanel = false;
             // 
             // gridColumn16
@@ -273,21 +280,21 @@
             // 
             this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn18.FieldName = "itemName";
-            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.MinWidth = 150;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
             this.gridColumn18.VisibleIndex = 3;
-            this.gridColumn18.Width = 94;
+            this.gridColumn18.Width = 150;
             // 
             // gridColumn14
             // 
             this.gridColumn14.Caption = "瑙勬牸鍨嬪彿";
             this.gridColumn14.FieldName = "itemModel";
-            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.MinWidth = 150;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
             this.gridColumn14.VisibleIndex = 4;
-            this.gridColumn14.Width = 94;
+            this.gridColumn14.Width = 150;
             // 
             // gridColumn17
             // 
@@ -298,6 +305,27 @@
             this.gridColumn17.Visible = true;
             this.gridColumn17.VisibleIndex = 6;
             this.gridColumn17.Width = 180;
+            // 
+            // gvBtnAlawys
+            // 
+            this.gvBtnAlawys.Caption = "绉诲嚭";
+            this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gvBtnAlawys.MinWidth = 25;
+            this.gvBtnAlawys.Name = "gvBtnAlawys";
+            this.gvBtnAlawys.Visible = true;
+            this.gvBtnAlawys.VisibleIndex = 7;
+            this.gvBtnAlawys.Width = 94;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            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, 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);
             // 
             // tabMxPage1
             // 
@@ -313,9 +341,6 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 98);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit1,
-            this.repositoryItemCheckEdit1});
             this.gcMx1.Size = new System.Drawing.Size(1342, 285);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -335,10 +360,11 @@
             this.gvMx1okRkqty,
             this.gvMx1ebelnQty,
             this.gridColumn10,
-            this.gvMx1states,
             this.gridColumn5,
             this.gridColumn9,
-            this.gridColumn7});
+            this.gridColumn7,
+            this.gridColumn15,
+            this.gridColumn19});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -483,20 +509,6 @@
             this.gridColumn10.VisibleIndex = 8;
             this.gridColumn10.Width = 94;
             // 
-            // gvMx1states
-            // 
-            this.gvMx1states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1states.AppearanceCell.Options.UseFont = true;
-            this.gvMx1states.Caption = "鎵撳嵃鏉$爜寮犳暟";
-            this.gvMx1states.FieldName = "icount";
-            this.gvMx1states.MinWidth = 50;
-            this.gvMx1states.Name = "gvMx1states";
-            this.gvMx1states.OptionsColumn.ReadOnly = true;
-            this.gvMx1states.Tag = "query_a.states";
-            this.gvMx1states.Visible = true;
-            this.gvMx1states.VisibleIndex = 9;
-            this.gvMx1states.Width = 100;
-            // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "鐗╂枡鍗曚綅";
@@ -505,7 +517,7 @@
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.ReadOnly = true;
             this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 10;
+            this.gridColumn5.VisibleIndex = 9;
             this.gridColumn5.Width = 180;
             // 
             // gridColumn9
@@ -516,7 +528,7 @@
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 11;
+            this.gridColumn9.VisibleIndex = 10;
             this.gridColumn9.Width = 94;
             // 
             // gridColumn7
@@ -527,31 +539,36 @@
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.OptionsColumn.ReadOnly = true;
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 12;
+            this.gridColumn7.VisibleIndex = 11;
             this.gridColumn7.Width = 94;
             // 
-            // repositoryItemButtonEdit1
+            // gridColumn15
             // 
-            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.gridColumn15.Caption = "妫�楠岀姸鎬�";
+            this.gridColumn15.FieldName = "checkStates";
+            this.gridColumn15.MinWidth = 50;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 12;
+            this.gridColumn15.Width = 94;
             // 
-            // repositoryItemCheckEdit1
+            // gridColumn19
             // 
-            this.repositoryItemCheckEdit1.AutoHeight = false;
-            this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
+            this.gridColumn19.Caption = "妫�楠岀粨鏋�";
+            this.gridColumn19.FieldName = "checkRes";
+            this.gridColumn19.MinWidth = 50;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 13;
+            this.gridColumn19.Width = 94;
             // 
             // panelMx1
             // 
+            this.panelMx1.Controls.Add(this.txt_iCount_1);
+            this.panelMx1.Controls.Add(this.txt_psnQty_1);
             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);
-            this.panelMx1.Controls.Add(this.txt_psnQty_1);
             this.panelMx1.Controls.Add(this.labelControl12);
             this.panelMx1.Controls.Add(this.txtKdy);
             this.panelMx1.Controls.Add(this.labelControl13);
@@ -571,6 +588,34 @@
             this.panelMx1.Size = new System.Drawing.Size(1342, 98);
             this.panelMx1.TabIndex = 0;
             // 
+            // txt_iCount_1
+            // 
+            this.txt_iCount_1.Location = new System.Drawing.Point(656, 4);
+            this.txt_iCount_1.Name = "txt_iCount_1";
+            this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
+            this.txt_iCount_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
+            this.txt_iCount_1.Properties.MaskSettings.Set("mask", "\\d+");
+            this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
+            this.txt_iCount_1.Size = new System.Drawing.Size(94, 28);
+            this.txt_iCount_1.TabIndex = 264;
+            this.txt_iCount_1.Tag = "ReadOnly";
+            this.txt_iCount_1.ToolTip = "璇疯緭鍏ユ潯鐮佸紶鏁�";
+            // 
+            // txt_psnQty_1
+            // 
+            this.txt_psnQty_1.Location = new System.Drawing.Point(656, 34);
+            this.txt_psnQty_1.Name = "txt_psnQty_1";
+            this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
+            this.txt_psnQty_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
+            this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+");
+            this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
+            this.txt_psnQty_1.Size = new System.Drawing.Size(94, 28);
+            this.txt_psnQty_1.TabIndex = 263;
+            this.txt_psnQty_1.Tag = "ReadOnly";
+            this.txt_psnQty_1.ToolTip = "璇疯緭鍏ユ瘡寮犳潯鐮佺殑鏁伴噺";
+            // 
             // ucBtnPrint1
             // 
             this.ucBtnPrint1.guidKey = null;
@@ -589,39 +634,17 @@
             this.lbMxGuid.Text = "lbMxGuid";
             this.lbMxGuid.Visible = false;
             // 
-            // txt_iCount_1
-            // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(654, 34);
-            this.txt_iCount_1.Name = "txt_iCount_1";
-            this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_iCount_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
-            this.txt_iCount_1.Properties.MaskSettings.Set("mask", "\\d+");
-            this.txt_iCount_1.Size = new System.Drawing.Size(96, 28);
-            this.txt_iCount_1.TabIndex = 228;
-            // 
             // labelControl14
             // 
-            this.labelControl14.Location = new System.Drawing.Point(543, 39);
+            this.labelControl14.Location = new System.Drawing.Point(545, 9);
             this.labelControl14.Name = "labelControl14";
             this.labelControl14.Size = new System.Drawing.Size(105, 18);
             this.labelControl14.TabIndex = 227;
             this.labelControl14.Text = "鎵撳嵃鏉$爜寮犳暟锛�";
             // 
-            // txt_psnQty_1
-            // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(654, 4);
-            this.txt_psnQty_1.Name = "txt_psnQty_1";
-            this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_psnQty_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
-            this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+");
-            this.txt_psnQty_1.Size = new System.Drawing.Size(96, 28);
-            this.txt_psnQty_1.TabIndex = 226;
-            // 
             // labelControl12
             // 
-            this.labelControl12.Location = new System.Drawing.Point(543, 9);
+            this.labelControl12.Location = new System.Drawing.Point(545, 39);
             this.labelControl12.Name = "labelControl12";
             this.labelControl12.Size = new System.Drawing.Size(105, 18);
             this.labelControl12.TabIndex = 225;
@@ -747,7 +770,7 @@
             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.VisibleIndex = 1;
             this.gv_urgentFlag.Width = 50;
             // 
             // gv_fstatus
@@ -762,7 +785,7 @@
             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.VisibleIndex = 2;
             this.gv_fstatus.Width = 50;
             // 
             // gv_suppNo
@@ -776,7 +799,7 @@
             this.gv_suppNo.OptionsColumn.AllowEdit = false;
             this.gv_suppNo.Tag = "query_a.supp_no";
             this.gv_suppNo.Visible = true;
-            this.gv_suppNo.VisibleIndex = 8;
+            this.gv_suppNo.VisibleIndex = 9;
             this.gv_suppNo.Width = 94;
             // 
             // gv_depotsCode
@@ -790,7 +813,7 @@
             this.gv_depotsCode.OptionsColumn.AllowEdit = false;
             this.gv_depotsCode.Tag = "query_a.depots_code";
             this.gv_depotsCode.Visible = true;
-            this.gv_depotsCode.VisibleIndex = 10;
+            this.gv_depotsCode.VisibleIndex = 11;
             this.gv_depotsCode.Width = 94;
             // 
             // gv_insDate
@@ -804,7 +827,7 @@
             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.VisibleIndex = 7;
             this.gv_insDate.Width = 180;
             // 
             // gv_checkDate
@@ -818,7 +841,7 @@
             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.VisibleIndex = 8;
             this.gv_checkDate.Width = 180;
             // 
             // gv_remark
@@ -832,7 +855,7 @@
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.remark";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 12;
+            this.gv_remark.VisibleIndex = 15;
             this.gv_remark.Width = 94;
             // 
             // gv_createBy
@@ -846,7 +869,7 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 5;
+            this.gv_createBy.VisibleIndex = 6;
             this.gv_createBy.Width = 94;
             // 
             // gv_status
@@ -854,14 +877,14 @@
             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 = "status";
+            this.gv_status.FieldName = "statusChk";
             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.VisibleIndex = 3;
             this.gv_status.Width = 50;
             // 
             // gv_billNo
@@ -875,7 +898,7 @@
             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.VisibleIndex = 4;
             this.gv_billNo.Width = 120;
             // 
             // toolBarMenu1
@@ -915,6 +938,7 @@
             this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn13,
             this.gv_urgentFlag,
             this.gv_fstatus,
             this.gv_status,
@@ -927,6 +951,8 @@
             this.gridColumn2,
             this.gv_depotsCode,
             this.gridColumn3,
+            this.gridColumn12,
+            this.gridColumn11,
             this.gv_remark});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
@@ -935,16 +961,28 @@
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "鏀舵枡缁勭粐";
+            this.gridColumn13.FieldName = "receivingOrg";
+            this.gridColumn13.MinWidth = 250;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Tag = "org.fnamber";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 0;
+            this.gridColumn13.Width = 250;
+            // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鏉$爜鎵撳嵃姣旂巼";
-            this.gridColumn1.FieldName = "percentage";
-            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.FieldName = "barRatio";
+            this.gridColumn1.MaxWidth = 80;
+            this.gridColumn1.MinWidth = 80;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.OptionsColumn.AllowEdit = false;
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 4;
-            this.gridColumn1.Width = 94;
+            this.gridColumn1.VisibleIndex = 5;
+            this.gridColumn1.Width = 80;
             // 
             // gridColumn2
             // 
@@ -954,7 +992,7 @@
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.OptionsColumn.AllowEdit = false;
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 9;
+            this.gridColumn2.VisibleIndex = 10;
             this.gridColumn2.Width = 200;
             // 
             // gridColumn3
@@ -965,8 +1003,26 @@
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.OptionsColumn.AllowEdit = false;
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 11;
+            this.gridColumn3.VisibleIndex = 12;
             this.gridColumn3.Width = 94;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "鍏ュ簱鏃ユ湡";
+            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 13;
+            this.gridColumn12.Width = 94;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "妫�楠屾椂闂�";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 14;
+            this.gridColumn11.Width = 94;
             // 
             // xtraTabControl1
             // 
@@ -1023,17 +1079,17 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.txt_dptName);
+            this.panel1.Controls.Add(this.txt_gysNo);
             this.panel1.Controls.Add(this.txt_fstatus);
             this.panel1.Controls.Add(this.txt_urgentFlag);
             this.panel1.Controls.Add(this.labelControl5);
             this.panel1.Controls.Add(this.txt_paperBillNo);
-            this.panel1.Controls.Add(this.txtDepotsId);
+            this.panel1.Controls.Add(this.txt_depotsCode);
             this.panel1.Controls.Add(this.labelControl4);
             this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.txtSupplierId);
-            this.panel1.Controls.Add(this.txt_depotsId);
+            this.panel1.Controls.Add(this.txt_gysName);
             this.panel1.Controls.Add(this.labelControl1);
-            this.panel1.Controls.Add(this.txt_suppId);
             this.panel1.Controls.Add(this.labelControl2);
             this.panel1.Controls.Add(this.labelControl3);
             this.panel1.Controls.Add(this.txt_percentage);
@@ -1056,6 +1112,24 @@
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(1344, 155);
             this.panel1.TabIndex = 1;
+            // 
+            // txt_dptName
+            // 
+            this.txt_dptName.Location = new System.Drawing.Point(413, 48);
+            this.txt_dptName.Name = "txt_dptName";
+            this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_dptName.Properties.Appearance.Options.UseFont = true;
+            this.txt_dptName.Size = new System.Drawing.Size(215, 28);
+            this.txt_dptName.TabIndex = 468;
+            // 
+            // txt_gysNo
+            // 
+            this.txt_gysNo.Location = new System.Drawing.Point(111, 83);
+            this.txt_gysNo.Name = "txt_gysNo";
+            this.txt_gysNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_gysNo.Size = new System.Drawing.Size(215, 28);
+            this.txt_gysNo.TabIndex = 467;
             // 
             // txt_fstatus
             // 
@@ -1092,15 +1166,14 @@
             this.txt_paperBillNo.Size = new System.Drawing.Size(215, 28);
             this.txt_paperBillNo.TabIndex = 463;
             // 
-            // txtDepotsId
+            // txt_depotsCode
             // 
-            this.txtDepotsId.Enabled = false;
-            this.txtDepotsId.Location = new System.Drawing.Point(413, 83);
-            this.txtDepotsId.Name = "txtDepotsId";
-            this.txtDepotsId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtDepotsId.Properties.Appearance.Options.UseFont = true;
-            this.txtDepotsId.Size = new System.Drawing.Size(215, 28);
-            this.txtDepotsId.TabIndex = 462;
+            this.txt_depotsCode.Location = new System.Drawing.Point(413, 83);
+            this.txt_depotsCode.Name = "txt_depotsCode";
+            this.txt_depotsCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_depotsCode.Properties.Appearance.Options.UseFont = true;
+            this.txt_depotsCode.Size = new System.Drawing.Size(215, 28);
+            this.txt_depotsCode.TabIndex = 462;
             // 
             // labelControl4
             // 
@@ -1121,24 +1194,14 @@
             this.label1.TabIndex = 460;
             this.label1.Text = "渚涘簲鍟嗙紪鍙�";
             // 
-            // txtSupplierId
+            // txt_gysName
             // 
-            this.txtSupplierId.Enabled = false;
-            this.txtSupplierId.Location = new System.Drawing.Point(111, 83);
-            this.txtSupplierId.Name = "txtSupplierId";
-            this.txtSupplierId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txtSupplierId.Properties.Appearance.Options.UseFont = true;
-            this.txtSupplierId.Size = new System.Drawing.Size(215, 28);
-            this.txtSupplierId.TabIndex = 459;
-            // 
-            // txt_depotsId
-            // 
-            this.txt_depotsId.IsReadly = true;
-            this.txt_depotsId.Location = new System.Drawing.Point(413, 48);
-            this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
-            this.txt_depotsId.Name = "txt_depotsId";
-            this.txt_depotsId.Size = new System.Drawing.Size(215, 28);
-            this.txt_depotsId.TabIndex = 458;
+            this.txt_gysName.Location = new System.Drawing.Point(111, 48);
+            this.txt_gysName.Name = "txt_gysName";
+            this.txt_gysName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_gysName.Properties.Appearance.Options.UseFont = true;
+            this.txt_gysName.Size = new System.Drawing.Size(215, 28);
+            this.txt_gysName.TabIndex = 459;
             // 
             // labelControl1
             // 
@@ -1149,15 +1212,6 @@
             this.labelControl1.Size = new System.Drawing.Size(68, 21);
             this.labelControl1.TabIndex = 457;
             this.labelControl1.Text = "浠撳簱鍚嶇О";
-            // 
-            // txt_suppId
-            // 
-            this.txt_suppId.IsReadly = true;
-            this.txt_suppId.Location = new System.Drawing.Point(111, 48);
-            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
-            this.txt_suppId.Name = "txt_suppId";
-            this.txt_suppId.Size = new System.Drawing.Size(215, 28);
-            this.txt_suppId.TabIndex = 456;
             // 
             // labelControl2
             // 
@@ -1323,11 +1377,10 @@
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
             this.panelMx1.ResumeLayout(false);
             this.panelMx1.PerformLayout();
@@ -1349,11 +1402,13 @@
             this.tabMx.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtDepotsId.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_percentage.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
@@ -1413,13 +1468,11 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
-        private DevExpress.XtraEditors.TextEdit txtDepotsId;
+        private DevExpress.XtraEditors.TextEdit txt_depotsCode;
         private DevExpress.XtraEditors.LabelControl labelControl4;
         private System.Windows.Forms.Label label1;
-        private DevExpress.XtraEditors.TextEdit txtSupplierId;
-        private UserControl.UcLookCk txt_depotsId;
+        private DevExpress.XtraEditors.TextEdit txt_gysName;
         private DevExpress.XtraEditors.LabelControl labelControl1;
-        private UserControl.UcLookSupplier txt_suppId;
         private DevExpress.XtraEditors.LabelControl labelControl2;
         private DevExpress.XtraEditors.LabelControl labelControl5;
         private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
@@ -1430,15 +1483,12 @@
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
         private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
-        private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1states;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
@@ -1452,9 +1502,7 @@
         private DevExpress.XtraEditors.LabelControl labelControl10;
         private DevExpress.XtraEditors.TextEdit txtWlgg;
         private DevExpress.XtraEditors.LabelControl labelControl9;
-        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
         private DevExpress.XtraEditors.LabelControl labelControl14;
-        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
         private DevExpress.XtraEditors.LabelControl labelControl12;
         private DevExpress.XtraEditors.TextEdit txtKdy;
         private DevExpress.XtraEditors.LabelControl labelControl13;
@@ -1463,5 +1511,16 @@
         private DevExpress.XtraEditors.LabelControl lbMxGuid;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
         private UserControl.UcBtnPrint ucBtnPrint1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraEditors.TextEdit txt_gysNo;
+        private DevExpress.XtraEditors.TextEdit txt_dptName;
+        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
+        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3