From f23d33d0cf77a73d449cd7c38effda9e50c8fda4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 06 三月 2025 08:13:37 +0800
Subject: [PATCH] 版面

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs |  287 ++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 180 insertions(+), 107 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index ae89f61..0ecce60 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -44,7 +44,12 @@
             this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = 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();
@@ -67,11 +72,11 @@
             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();
@@ -123,7 +128,7 @@
             this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_percentage = new DevExpress.XtraEditors.TextEdit();
+            this.txt_barcodeProgress = new DevExpress.XtraEditors.TextEdit();
             this.lbGuid = new System.Windows.Forms.Label();
             this.lb_urgentFlag = new DevExpress.XtraEditors.LabelControl();
             this.lb_fstatus = new DevExpress.XtraEditors.LabelControl();
@@ -170,7 +175,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.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_barcodeProgress.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
@@ -182,8 +187,8 @@
             // 
             this.gvMx2oldqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
-            this.gvMx2oldqty.Caption = "鍘熷鏁伴噺 ";
-            this.gvMx2oldqty.FieldName = "oldqty";
+            this.gvMx2oldqty.Caption = "鏁伴噺";
+            this.gvMx2oldqty.FieldName = "quantity";
             this.gvMx2oldqty.MinWidth = 50;
             this.gvMx2oldqty.Name = "gvMx2oldqty";
             this.gvMx2oldqty.Tag = "query_a.OLDQTY";
@@ -202,7 +207,7 @@
             this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
             this.gvMx2itemNo.Visible = true;
             this.gvMx2itemNo.VisibleIndex = 2;
-            this.gvMx2itemNo.Width = 94;
+            this.gvMx2itemNo.Width = 100;
             // 
             // gvMx2itemBarcode
             // 
@@ -215,7 +220,7 @@
             this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx2itemBarcode.Visible = true;
             this.gvMx2itemBarcode.VisibleIndex = 1;
-            this.gvMx2itemBarcode.Width = 94;
+            this.gvMx2itemBarcode.Width = 300;
             // 
             // gvMx2guid
             // 
@@ -232,7 +237,7 @@
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1342, 383);
+            this.tabMxPage2.Size = new System.Drawing.Size(1342, 395);
             this.tabMxPage2.Text = "宸叉墦鏉$爜淇℃伅";
             // 
             // gcMx2
@@ -243,13 +248,16 @@
             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.Size = new System.Drawing.Size(1342, 395);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
             // 
             // gvMx2
             // 
+            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx2.ColumnPanelRowHeight = 50;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx2guid,
             this.gridColumn16,
@@ -258,7 +266,12 @@
             this.gridColumn18,
             this.gridColumn14,
             this.gvMx2oldqty,
+            this.gridColumn21,
+            this.gridColumn20,
             this.gridColumn17,
+            this.gridColumn22,
+            this.gridColumn23,
+            this.gridColumn24,
             this.gvBtnAlawys});
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
@@ -269,42 +282,93 @@
             // gridColumn16
             // 
             this.gridColumn16.Caption = "鏄惁鍏ュ簱";
-            this.gridColumn16.FieldName = "icount";
-            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.FieldName = "isRk";
+            this.gridColumn16.MaxWidth = 50;
+            this.gridColumn16.MinWidth = 50;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
             this.gridColumn16.VisibleIndex = 0;
-            this.gridColumn16.Width = 94;
+            this.gridColumn16.Width = 50;
             // 
             // gridColumn18
             // 
             this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn18.FieldName = "itemName";
-            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.MinWidth = 50;
             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 = 50;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
             this.gridColumn14.VisibleIndex = 4;
-            this.gridColumn14.Width = 94;
+            this.gridColumn14.Width = 150;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "鍗曚綅";
+            this.gridColumn21.FieldName = "dwName";
+            this.gridColumn21.MinWidth = 25;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 6;
+            this.gridColumn21.Width = 94;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "鎵撶爜浜�";
+            this.gridColumn20.FieldName = "createBy";
+            this.gridColumn20.MinWidth = 25;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 7;
+            this.gridColumn20.Width = 94;
             // 
             // gridColumn17
             // 
-            this.gridColumn17.Caption = "鎵撳嵃鏃ユ湡";
+            this.gridColumn17.Caption = "鎵撶爜鏃ユ湡";
             this.gridColumn17.FieldName = "createDate";
-            this.gridColumn17.MinWidth = 180;
+            this.gridColumn17.MinWidth = 10;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 6;
+            this.gridColumn17.VisibleIndex = 8;
             this.gridColumn17.Width = 180;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "鍏ュ簱浜�";
+            this.gridColumn22.FieldName = "rkUser";
+            this.gridColumn22.MinWidth = 25;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 9;
+            this.gridColumn22.Width = 94;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡";
+            this.gridColumn23.FieldName = "rkDate";
+            this.gridColumn23.MinWidth = 25;
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 10;
+            this.gridColumn23.Width = 94;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.Caption = "鍏ュ簱浣�";
+            this.gridColumn24.FieldName = "rkPositon";
+            this.gridColumn24.MinWidth = 25;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 11;
+            this.gridColumn24.Width = 94;
             // 
             // gvBtnAlawys
             // 
@@ -313,7 +377,7 @@
             this.gvBtnAlawys.MinWidth = 25;
             this.gvBtnAlawys.Name = "gvBtnAlawys";
             this.gvBtnAlawys.Visible = true;
-            this.gvBtnAlawys.VisibleIndex = 7;
+            this.gvBtnAlawys.VisibleIndex = 12;
             this.gvBtnAlawys.Width = 94;
             // 
             // repositoryItemButtonEdit1
@@ -332,7 +396,7 @@
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Controls.Add(this.panelMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1342, 383);
+            this.tabMxPage1.Size = new System.Drawing.Size(1342, 395);
             this.tabMxPage1.Text = "鏉ユ枡淇℃伅鏄庣粏";
             // 
             // gcMx1
@@ -341,7 +405,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 98);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1342, 285);
+            this.gcMx1.Size = new System.Drawing.Size(1342, 297);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -414,7 +478,7 @@
             this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebeln.Caption = "ERP閲囪喘鍗曞彿";
             this.gvMx1ebeln.FieldName = "ebeln";
-            this.gvMx1ebeln.MinWidth = 120;
+            this.gvMx1ebeln.MinWidth = 50;
             this.gvMx1ebeln.Name = "gvMx1ebeln";
             this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
             this.gvMx1ebeln.Tag = "query_a.ebeln";
@@ -426,7 +490,7 @@
             // 
             this.gridColumn4.Caption = "鐗╂枡缂栧彿";
             this.gridColumn4.FieldName = "itemNo";
-            this.gridColumn4.MinWidth = 100;
+            this.gridColumn4.MinWidth = 50;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.OptionsColumn.ReadOnly = true;
             this.gridColumn4.Visible = true;
@@ -439,7 +503,7 @@
             this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
             this.gvMx1boardStyle.Caption = "鐗╂枡鍚嶇О";
             this.gvMx1boardStyle.FieldName = "itemName";
-            this.gvMx1boardStyle.MinWidth = 180;
+            this.gvMx1boardStyle.MinWidth = 50;
             this.gvMx1boardStyle.Name = "gvMx1boardStyle";
             this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
             this.gvMx1boardStyle.Tag = "query_a.board_style";
@@ -451,7 +515,7 @@
             // 
             this.gridColumn6.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn6.FieldName = "itemModel";
-            this.gridColumn6.MinWidth = 125;
+            this.gridColumn6.MinWidth = 50;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 4;
@@ -564,11 +628,11 @@
             // 
             // 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);
@@ -588,12 +652,36 @@
             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.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.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;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(541, 59);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(541, 61);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
-            this.ucBtnPrint1.rptParameter = null;
+            this.ucBtnPrint1.rptParameter = "rpt_daa";
             this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
             this.ucBtnPrint1.TabIndex = 232;
             // 
@@ -606,39 +694,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;
@@ -649,7 +715,9 @@
             this.txtKdy.Location = new System.Drawing.Point(430, 65);
             this.txtKdy.Name = "txtKdy";
             this.txtKdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txtKdy.Properties.Appearance.Options.UseFont = true;
+            this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
             this.txtKdy.Properties.ReadOnly = true;
             this.txtKdy.Size = new System.Drawing.Size(96, 28);
             this.txtKdy.TabIndex = 224;
@@ -816,7 +884,7 @@
             this.gv_insDate.AppearanceCell.Options.UseFont = true;
             this.gv_insDate.Caption = "鏉ユ枡鏃ユ湡";
             this.gv_insDate.FieldName = "insDate";
-            this.gv_insDate.MinWidth = 180;
+            this.gv_insDate.MinWidth = 50;
             this.gv_insDate.Name = "gv_insDate";
             this.gv_insDate.OptionsColumn.AllowEdit = false;
             this.gv_insDate.Tag = "query_a.ins_date";
@@ -830,7 +898,7 @@
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "鎻愪氦鏃ユ湡";
             this.gv_checkDate.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 180;
+            this.gv_checkDate.MinWidth = 50;
             this.gv_checkDate.Name = "gv_checkDate";
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.check_date";
@@ -887,7 +955,7 @@
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
             this.gv_billNo.FieldName = "billNo";
-            this.gv_billNo.MinWidth = 120;
+            this.gv_billNo.MinWidth = 50;
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.bill_no";
@@ -959,7 +1027,7 @@
             // 
             this.gridColumn13.Caption = "鏀舵枡缁勭粐";
             this.gridColumn13.FieldName = "receivingOrg";
-            this.gridColumn13.MinWidth = 250;
+            this.gridColumn13.MinWidth = 50;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Tag = "org.fnamber";
             this.gridColumn13.Visible = true;
@@ -982,7 +1050,7 @@
             // 
             this.gridColumn2.Caption = "渚涘簲鍟嗗悕绉�";
             this.gridColumn2.FieldName = "suppName";
-            this.gridColumn2.MinWidth = 200;
+            this.gridColumn2.MinWidth = 50;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.OptionsColumn.AllowEdit = false;
             this.gridColumn2.Visible = true;
@@ -1061,10 +1129,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 155);
+            this.tabMx.Location = new System.Drawing.Point(0, 143);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1344, 415);
+            this.tabMx.Size = new System.Drawing.Size(1344, 427);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1086,7 +1154,7 @@
             this.panel1.Controls.Add(this.labelControl1);
             this.panel1.Controls.Add(this.labelControl2);
             this.panel1.Controls.Add(this.labelControl3);
-            this.panel1.Controls.Add(this.txt_percentage);
+            this.panel1.Controls.Add(this.txt_barcodeProgress);
             this.panel1.Controls.Add(this.lbGuid);
             this.panel1.Controls.Add(this.lb_urgentFlag);
             this.panel1.Controls.Add(this.lb_fstatus);
@@ -1104,25 +1172,25 @@
             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(1344, 155);
+            this.panel1.Size = new System.Drawing.Size(1344, 143);
             this.panel1.TabIndex = 1;
             // 
             // txt_dptName
             // 
-            this.txt_dptName.Location = new System.Drawing.Point(413, 48);
+            this.txt_dptName.Location = new System.Drawing.Point(419, 47);
             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.Size = new System.Drawing.Size(228, 28);
             this.txt_dptName.TabIndex = 468;
             // 
             // txt_gysNo
             // 
-            this.txt_gysNo.Location = new System.Drawing.Point(111, 83);
+            this.txt_gysNo.Location = new System.Drawing.Point(107, 79);
             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.Size = new System.Drawing.Size(234, 28);
             this.txt_gysNo.TabIndex = 467;
             // 
             // txt_fstatus
@@ -1145,7 +1213,7 @@
             // 
             this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl5.Appearance.Options.UseFont = true;
-            this.labelControl5.Location = new System.Drawing.Point(337, 19);
+            this.labelControl5.Location = new System.Drawing.Point(347, 19);
             this.labelControl5.Name = "labelControl5";
             this.labelControl5.Size = new System.Drawing.Size(68, 21);
             this.labelControl5.TabIndex = 464;
@@ -1153,27 +1221,27 @@
             // 
             // txt_paperBillNo
             // 
-            this.txt_paperBillNo.Location = new System.Drawing.Point(413, 15);
+            this.txt_paperBillNo.Location = new System.Drawing.Point(419, 15);
             this.txt_paperBillNo.Name = "txt_paperBillNo";
             this.txt_paperBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_paperBillNo.Size = new System.Drawing.Size(215, 28);
+            this.txt_paperBillNo.Size = new System.Drawing.Size(228, 28);
             this.txt_paperBillNo.TabIndex = 463;
             // 
             // txt_depotsCode
             // 
-            this.txt_depotsCode.Location = new System.Drawing.Point(413, 83);
+            this.txt_depotsCode.Location = new System.Drawing.Point(419, 79);
             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.Size = new System.Drawing.Size(228, 28);
             this.txt_depotsCode.TabIndex = 462;
             // 
             // labelControl4
             // 
             this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl4.Appearance.Options.UseFont = true;
-            this.labelControl4.Location = new System.Drawing.Point(337, 87);
+            this.labelControl4.Location = new System.Drawing.Point(347, 83);
             this.labelControl4.Name = "labelControl4";
             this.labelControl4.Size = new System.Drawing.Size(68, 21);
             this.labelControl4.TabIndex = 461;
@@ -1182,7 +1250,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(8, 87);
+            this.label1.Location = new System.Drawing.Point(7, 83);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(95, 21);
             this.label1.TabIndex = 460;
@@ -1190,18 +1258,18 @@
             // 
             // txt_gysName
             // 
-            this.txt_gysName.Location = new System.Drawing.Point(111, 48);
+            this.txt_gysName.Location = new System.Drawing.Point(107, 47);
             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.Size = new System.Drawing.Size(234, 28);
             this.txt_gysName.TabIndex = 459;
             // 
             // labelControl1
             // 
             this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl1.Appearance.Options.UseFont = true;
-            this.labelControl1.Location = new System.Drawing.Point(337, 52);
+            this.labelControl1.Location = new System.Drawing.Point(347, 51);
             this.labelControl1.Name = "labelControl1";
             this.labelControl1.Size = new System.Drawing.Size(68, 21);
             this.labelControl1.TabIndex = 457;
@@ -1211,7 +1279,7 @@
             // 
             this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl2.Appearance.Options.UseFont = true;
-            this.labelControl2.Location = new System.Drawing.Point(16, 52);
+            this.labelControl2.Location = new System.Drawing.Point(17, 51);
             this.labelControl2.Name = "labelControl2";
             this.labelControl2.Size = new System.Drawing.Size(85, 21);
             this.labelControl2.TabIndex = 455;
@@ -1221,20 +1289,20 @@
             // 
             this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl3.Appearance.Options.UseFont = true;
-            this.labelControl3.Location = new System.Drawing.Point(884, 87);
+            this.labelControl3.Location = new System.Drawing.Point(653, 116);
             this.labelControl3.Name = "labelControl3";
             this.labelControl3.Size = new System.Drawing.Size(102, 21);
             this.labelControl3.TabIndex = 341;
             this.labelControl3.Text = "鏉$爜鎵撳嵃姣旂巼";
             // 
-            // txt_percentage
+            // txt_barcodeProgress
             // 
-            this.txt_percentage.Location = new System.Drawing.Point(993, 83);
-            this.txt_percentage.Name = "txt_percentage";
-            this.txt_percentage.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_percentage.Properties.Appearance.Options.UseFont = true;
-            this.txt_percentage.Size = new System.Drawing.Size(60, 28);
-            this.txt_percentage.TabIndex = 342;
+            this.txt_barcodeProgress.Location = new System.Drawing.Point(761, 112);
+            this.txt_barcodeProgress.Name = "txt_barcodeProgress";
+            this.txt_barcodeProgress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
+            this.txt_barcodeProgress.Size = new System.Drawing.Size(143, 28);
+            this.txt_barcodeProgress.TabIndex = 342;
             // 
             // lbGuid
             // 
@@ -1268,7 +1336,7 @@
             // 
             this.lb_insDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_insDate.Appearance.Options.UseFont = true;
-            this.lb_insDate.Location = new System.Drawing.Point(644, 87);
+            this.lb_insDate.Location = new System.Drawing.Point(653, 83);
             this.lb_insDate.Name = "lb_insDate";
             this.lb_insDate.Size = new System.Drawing.Size(68, 21);
             this.lb_insDate.TabIndex = 258;
@@ -1276,18 +1344,18 @@
             // 
             // txt_insDate
             // 
-            this.txt_insDate.Location = new System.Drawing.Point(724, 83);
+            this.txt_insDate.Location = new System.Drawing.Point(724, 79);
             this.txt_insDate.Name = "txt_insDate";
             this.txt_insDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_insDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_insDate.Size = new System.Drawing.Size(150, 28);
+            this.txt_insDate.Size = new System.Drawing.Size(180, 28);
             this.txt_insDate.TabIndex = 258;
             // 
             // lb_checkDate
             // 
             this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_checkDate.Appearance.Options.UseFont = true;
-            this.lb_checkDate.Location = new System.Drawing.Point(644, 52);
+            this.lb_checkDate.Location = new System.Drawing.Point(653, 51);
             this.lb_checkDate.Name = "lb_checkDate";
             this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
             this.lb_checkDate.TabIndex = 252;
@@ -1295,37 +1363,37 @@
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(724, 48);
+            this.txt_checkDate.Location = new System.Drawing.Point(724, 47);
             this.txt_checkDate.Name = "txt_checkDate";
             this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(150, 28);
+            this.txt_checkDate.Size = new System.Drawing.Size(180, 28);
             this.txt_checkDate.TabIndex = 252;
             // 
             // lb_remark
             // 
             this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_remark.Appearance.Options.UseFont = true;
-            this.lb_remark.Location = new System.Drawing.Point(62, 120);
+            this.lb_remark.Location = new System.Drawing.Point(68, 116);
             this.lb_remark.Name = "lb_remark";
-            this.lb_remark.Size = new System.Drawing.Size(39, 21);
+            this.lb_remark.Size = new System.Drawing.Size(34, 21);
             this.lb_remark.TabIndex = 235;
-            this.lb_remark.Text = "澶囨敞 ";
+            this.lb_remark.Text = "澶囨敞";
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(111, 116);
+            this.txt_remark.Location = new System.Drawing.Point(107, 112);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(215, 28);
+            this.txt_remark.Size = new System.Drawing.Size(540, 28);
             this.txt_remark.TabIndex = 235;
             // 
             // lb_createBy
             // 
             this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_createBy.Appearance.Options.UseFont = true;
-            this.lb_createBy.Location = new System.Drawing.Point(644, 19);
+            this.lb_createBy.Location = new System.Drawing.Point(653, 19);
             this.lb_createBy.Name = "lb_createBy";
             this.lb_createBy.Size = new System.Drawing.Size(68, 21);
             this.lb_createBy.TabIndex = 217;
@@ -1337,14 +1405,14 @@
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(150, 28);
+            this.txt_createBy.Size = new System.Drawing.Size(180, 28);
             this.txt_createBy.TabIndex = 217;
             // 
             // lb_billNo
             // 
             this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_billNo.Appearance.Options.UseFont = true;
-            this.lb_billNo.Location = new System.Drawing.Point(33, 19);
+            this.lb_billNo.Location = new System.Drawing.Point(34, 19);
             this.lb_billNo.Name = "lb_billNo";
             this.lb_billNo.Size = new System.Drawing.Size(68, 21);
             this.lb_billNo.TabIndex = 211;
@@ -1352,11 +1420,11 @@
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(111, 15);
+            this.txt_billNo.Location = new System.Drawing.Point(107, 15);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(215, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(234, 28);
             this.txt_billNo.TabIndex = 211;
             // 
             // Frm_ArrivalBarcode
@@ -1403,7 +1471,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.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_barcodeProgress.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
@@ -1457,7 +1525,7 @@
         private DevExpress.XtraEditors.LabelControl lb_billNo;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
         private DevExpress.XtraEditors.LabelControl labelControl3;
-        private DevExpress.XtraEditors.TextEdit txt_percentage;
+        private DevExpress.XtraEditors.TextEdit txt_barcodeProgress;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
@@ -1496,9 +1564,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;
@@ -1516,5 +1582,12 @@
         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;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3