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/Ck/Frm_MesCgthSqDj.Designer.cs |  578 ++++++++++++++++++++-------------------------------------
 1 files changed, 202 insertions(+), 376 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
index 4a89eee..fa5d94a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.Designer.cs
@@ -1,7 +1,7 @@
 /* Create By GS EasyCode */
 namespace Gs.DevApp.DevFrm
 {
-    partial class Frm_MesCgthSqDj 
+    partial class Frm_MesCgthSqDj
     {
         /// <summary>
         /// Required designer variable.
@@ -29,11 +29,6 @@
         /// </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();
             this.gvMx2itemOutId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -46,21 +41,14 @@
             this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_fmrmode = new DevExpress.XtraEditors.LabelControl();
             this.gv_fmrmode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_nflag = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_suppNo = new DevExpress.XtraEditors.LabelControl();
             this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_fType = new DevExpress.XtraEditors.LabelControl();
@@ -71,14 +59,12 @@
             this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
             this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_checkUser = new DevExpress.XtraEditors.LabelControl();
-            this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_reason = new DevExpress.XtraEditors.LabelControl();
             this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_remark = new DevExpress.XtraEditors.LabelControl();
             this.txt_remark = new DevExpress.XtraEditors.TextEdit();
             this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_itemOutNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
@@ -86,6 +72,7 @@
             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();
@@ -96,8 +83,8 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -110,21 +97,19 @@
             this.gvMx1ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
-            this.txt_check = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
             this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
             this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
             this.txt_reason = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
-            this.txt_depotId = new Gs.DevApp.UserControl.UcLookCk();
             this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_checkUserFname = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tabMxPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
@@ -137,14 +122,16 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.xtraTabPage3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_check.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserFname.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
@@ -154,7 +141,6 @@
             this.gvMx2itemOutId.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemOutId.Caption = "鍑哄簱ID ";
             this.gvMx2itemOutId.FieldName = "itemOutId";
-            this.gvMx2itemOutId.MinWidth = 50;
             this.gvMx2itemOutId.Name = "gvMx2itemOutId";
             this.gvMx2itemOutId.OptionsColumn.ReadOnly = true;
             this.gvMx2itemOutId.Tag = "query_a.item_out_id";
@@ -166,7 +152,6 @@
             this.gvMx2tlQty.AppearanceCell.Options.UseFont = true;
             this.gvMx2tlQty.Caption = "宸叉壂鏁伴噺 ";
             this.gvMx2tlQty.FieldName = "tlQty";
-            this.gvMx2tlQty.MinWidth = 50;
             this.gvMx2tlQty.Name = "gvMx2tlQty";
             this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
             this.gvMx2tlQty.Tag = "query_a.tl_qty";
@@ -180,7 +165,6 @@
             this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
             this.gvMx2pbillNo.Caption = "鍒拌揣鍗曞彿";
             this.gvMx2pbillNo.FieldName = "pbillNo";
-            this.gvMx2pbillNo.MinWidth = 50;
             this.gvMx2pbillNo.Name = "gvMx2pbillNo";
             this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
             this.gvMx2pbillNo.Tag = "query_a.pbill_no";
@@ -192,15 +176,16 @@
             // 
             this.gvMx2status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2status.AppearanceCell.Options.UseFont = true;
-            this.gvMx2status.Caption = "瀹岀粨鏍囪瘑";
+            this.gvMx2status.Caption = "瀹岀粨";
             this.gvMx2status.FieldName = "status";
+            this.gvMx2status.MaxWidth = 50;
             this.gvMx2status.MinWidth = 50;
             this.gvMx2status.Name = "gvMx2status";
             this.gvMx2status.OptionsColumn.ReadOnly = true;
             this.gvMx2status.Tag = "query_a.status";
             this.gvMx2status.Visible = true;
             this.gvMx2status.VisibleIndex = 0;
-            this.gvMx2status.Width = 94;
+            this.gvMx2status.Width = 50;
             // 
             // gvMx2lineK3id
             // 
@@ -208,7 +193,6 @@
             this.gvMx2lineK3id.AppearanceCell.Options.UseFont = true;
             this.gvMx2lineK3id.Caption = "閲囪喘鍗曡ID ";
             this.gvMx2lineK3id.FieldName = "lineK3id";
-            this.gvMx2lineK3id.MinWidth = 50;
             this.gvMx2lineK3id.Name = "gvMx2lineK3id";
             this.gvMx2lineK3id.OptionsColumn.ReadOnly = true;
             this.gvMx2lineK3id.Tag = "query_a.line_k3id";
@@ -222,7 +206,6 @@
             this.gvMx2ebelnK3id.AppearanceCell.Options.UseFont = true;
             this.gvMx2ebelnK3id.Caption = "閲囪喘鍗旾D ";
             this.gvMx2ebelnK3id.FieldName = "ebelnK3id";
-            this.gvMx2ebelnK3id.MinWidth = 50;
             this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
             this.gvMx2ebelnK3id.OptionsColumn.ReadOnly = true;
             this.gvMx2ebelnK3id.Tag = "query_a.ebeln_k3id";
@@ -236,7 +219,6 @@
             this.gvMx2workLine.AppearanceCell.Options.UseFont = true;
             this.gvMx2workLine.Caption = "琛屽彿 ";
             this.gvMx2workLine.FieldName = "workLine";
-            this.gvMx2workLine.MinWidth = 50;
             this.gvMx2workLine.Name = "gvMx2workLine";
             this.gvMx2workLine.OptionsColumn.ReadOnly = true;
             this.gvMx2workLine.Tag = "query_a.work_line";
@@ -250,7 +232,6 @@
             this.gvMx2depotCode.AppearanceCell.Options.UseFont = true;
             this.gvMx2depotCode.Caption = "浠撳簱缂栫爜";
             this.gvMx2depotCode.FieldName = "depotCode";
-            this.gvMx2depotCode.MinWidth = 50;
             this.gvMx2depotCode.Name = "gvMx2depotCode";
             this.gvMx2depotCode.OptionsColumn.ReadOnly = true;
             this.gvMx2depotCode.Tag = "query_a.depot_code";
@@ -264,7 +245,6 @@
             this.gvMx2remark.AppearanceCell.Options.UseFont = true;
             this.gvMx2remark.Caption = "澶囨敞淇℃伅 ";
             this.gvMx2remark.FieldName = "remark";
-            this.gvMx2remark.MinWidth = 50;
             this.gvMx2remark.Name = "gvMx2remark";
             this.gvMx2remark.OptionsColumn.ReadOnly = true;
             this.gvMx2remark.Tag = "query_a.remark";
@@ -282,7 +262,6 @@
             this.gvMx2quantity.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx2quantity.Caption = "鐢宠鏁伴噺 ";
             this.gvMx2quantity.FieldName = "quantity";
-            this.gvMx2quantity.MinWidth = 50;
             this.gvMx2quantity.Name = "gvMx2quantity";
             this.gvMx2quantity.Tag = "query_a.quantity";
             this.gvMx2quantity.Visible = true;
@@ -295,7 +274,6 @@
             this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
             this.gvMx2itemNo.FieldName = "itemNo";
-            this.gvMx2itemNo.MinWidth = 50;
             this.gvMx2itemNo.Name = "gvMx2itemNo";
             this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
             this.gvMx2itemNo.Tag = "query_a.item_no";
@@ -305,27 +283,25 @@
             // 
             // tabMxPage2
             // 
-            this.tabMxPage2.Controls.Add(this.gcMx2);
+            this.tabMxPage2.Controls.Add(this.gcMx1);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1124, 341);
-            this.tabMxPage2.Text = "閫�璐х墿鏂欑敵璇�";
+            this.tabMxPage2.Size = new System.Drawing.Size(1124, 388);
+            this.tabMxPage2.Text = "閫�璐х墿鏂欐槑缁�";
             // 
-            // gcMx2
+            // gcMx1
             // 
-            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            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(1124, 341);
-            this.gcMx2.TabIndex = 0;
-            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx2});
+            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.Location = new System.Drawing.Point(0, 0);
+            this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Name = "gcMx1";
+            this.gcMx1.Size = new System.Drawing.Size(1124, 388);
+            this.gcMx1.TabIndex = 0;
+            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx1});
             // 
-            // gvMx2
+            // gvMx1
             // 
-            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn12,
             this.gridColumn11,
             this.gvMx2status,
@@ -334,20 +310,18 @@
             this.gvMx2itemNo,
             this.gridColumn5,
             this.gridColumn6,
-            this.gridColumn7,
             this.gvMx2quantity,
             this.gvMx2tlQty,
             this.gvMx2depotCode,
             this.gvMx2remark,
             this.gvMx2ebelnK3id,
             this.gvMx2lineK3id,
-            this.gvMx2itemOutId,
-            this.gvMxDel});
-            this.gvMx2.GridControl = this.gcMx2;
-            this.gvMx2.Name = "gvMx2";
-            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
-            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx2.OptionsView.ShowGroupPanel = false;
+            this.gvMx2itemOutId});
+            this.gvMx1.GridControl = this.gcMx1;
+            this.gvMx1.Name = "gvMx1";
+            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx1.OptionsView.ShowGroupPanel = false;
             // 
             // gridColumn12
             // 
@@ -371,7 +345,6 @@
             // 
             this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn5.FieldName = "itemName";
-            this.gridColumn5.MinWidth = 25;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.ReadOnly = true;
             this.gridColumn5.Visible = true;
@@ -382,86 +355,17 @@
             // 
             this.gridColumn6.Caption = "瑙勬牸鍨嬪彿";
             this.gridColumn6.FieldName = "itemModel";
-            this.gridColumn6.MinWidth = 25;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.OptionsColumn.ReadOnly = true;
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 5;
             this.gridColumn6.Width = 94;
             // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "鍓╀綑鍙��鏁�";
-            this.gridColumn7.FieldName = "ktQty";
-            this.gridColumn7.MinWidth = 25;
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.OptionsColumn.ReadOnly = true;
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 6;
-            this.gridColumn7.Width = 94;
-            // 
-            // gvMxDel
-            // 
-            this.gvMxDel.Caption = "绉诲嚭";
-            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 25;
-            this.gvMxDel.Name = "gvMxDel";
-            this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 13;
-            this.gvMxDel.Width = 94;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
-            // 
-            // gv_depotId
-            // 
-            this.gv_depotId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_depotId.AppearanceCell.Options.UseFont = true;
-            this.gv_depotId.Caption = "depot_id ";
-            this.gv_depotId.FieldName = "depotId";
-            this.gv_depotId.MinWidth = 50;
-            this.gv_depotId.Name = "gv_depotId";
-            this.gv_depotId.OptionsColumn.AllowEdit = false;
-            this.gv_depotId.Tag = "query_a.depot_id";
-            this.gv_depotId.Width = 94;
-            // 
-            // gv_suppId
-            // 
-            this.gv_suppId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_suppId.AppearanceCell.Options.UseFont = true;
-            this.gv_suppId.Caption = "supp_id ";
-            this.gv_suppId.FieldName = "suppId";
-            this.gv_suppId.MinWidth = 50;
-            this.gv_suppId.Name = "gv_suppId";
-            this.gv_suppId.OptionsColumn.AllowEdit = false;
-            this.gv_suppId.Tag = "query_a.supp_id";
-            this.gv_suppId.Width = 94;
-            // 
-            // gv_guid
-            // 
-            this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_guid.AppearanceCell.Options.UseFont = true;
-            this.gv_guid.Caption = "GUID ";
-            this.gv_guid.FieldName = "guid";
-            this.gv_guid.MinWidth = 50;
-            this.gv_guid.Name = "gv_guid";
-            this.gv_guid.OptionsColumn.AllowEdit = false;
-            this.gv_guid.Tag = "query_a.GUID";
-            this.gv_guid.Width = 94;
-            // 
             // lb_fmrmode
             // 
             this.lb_fmrmode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fmrmode.Appearance.Options.UseFont = true;
-            this.lb_fmrmode.Location = new System.Drawing.Point(336, 55);
+            this.lb_fmrmode.Location = new System.Drawing.Point(336, 51);
             this.lb_fmrmode.Name = "lb_fmrmode";
             this.lb_fmrmode.Size = new System.Drawing.Size(73, 21);
             this.lb_fmrmode.TabIndex = 507;
@@ -473,33 +377,18 @@
             this.gv_fmrmode.AppearanceCell.Options.UseFont = true;
             this.gv_fmrmode.Caption = "閫�鏂欐柟寮� ";
             this.gv_fmrmode.FieldName = "fmrmode";
-            this.gv_fmrmode.MinWidth = 50;
             this.gv_fmrmode.Name = "gv_fmrmode";
             this.gv_fmrmode.OptionsColumn.AllowEdit = false;
             this.gv_fmrmode.Tag = "query_a.fmrmode";
             this.gv_fmrmode.Visible = true;
-            this.gv_fmrmode.VisibleIndex = 16;
+            this.gv_fmrmode.VisibleIndex = 14;
             this.gv_fmrmode.Width = 94;
-            // 
-            // gv_nflag
-            // 
-            this.gv_nflag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_nflag.AppearanceCell.Options.UseFont = true;
-            this.gv_nflag.Caption = "鎺ㄩ�佹爣璇�";
-            this.gv_nflag.FieldName = "nflag";
-            this.gv_nflag.MinWidth = 50;
-            this.gv_nflag.Name = "gv_nflag";
-            this.gv_nflag.OptionsColumn.AllowEdit = false;
-            this.gv_nflag.Tag = "query_a.nflag";
-            this.gv_nflag.Visible = true;
-            this.gv_nflag.VisibleIndex = 1;
-            this.gv_nflag.Width = 94;
             // 
             // lb_suppNo
             // 
             this.lb_suppNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_suppNo.Appearance.Options.UseFont = true;
-            this.lb_suppNo.Location = new System.Drawing.Point(39, 55);
+            this.lb_suppNo.Location = new System.Drawing.Point(39, 51);
             this.lb_suppNo.Name = "lb_suppNo";
             this.lb_suppNo.Size = new System.Drawing.Size(51, 21);
             this.lb_suppNo.TabIndex = 387;
@@ -510,8 +399,7 @@
             this.gv_suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_suppNo.AppearanceCell.Options.UseFont = true;
             this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鍙� ";
-            this.gv_suppNo.FieldName = "suppNo";
-            this.gv_suppNo.MinWidth = 50;
+            this.gv_suppNo.FieldName = "suppNo2";
             this.gv_suppNo.Name = "gv_suppNo";
             this.gv_suppNo.OptionsColumn.AllowEdit = false;
             this.gv_suppNo.Tag = "query_a.supp_no";
@@ -534,20 +422,21 @@
             this.gv_fType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fType.AppearanceCell.Options.UseFont = true;
             this.gv_fType.Caption = "濮斿鏍囪瘑";
-            this.gv_fType.FieldName = "fType";
+            this.gv_fType.FieldName = "isOut";
+            this.gv_fType.MaxWidth = 50;
             this.gv_fType.MinWidth = 50;
             this.gv_fType.Name = "gv_fType";
             this.gv_fType.OptionsColumn.AllowEdit = false;
             this.gv_fType.Tag = "query_a.f_type";
             this.gv_fType.Visible = true;
             this.gv_fType.VisibleIndex = 2;
-            this.gv_fType.Width = 94;
+            this.gv_fType.Width = 50;
             // 
             // lb_depotCode
             // 
             this.lb_depotCode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_depotCode.Appearance.Options.UseFont = true;
-            this.lb_depotCode.Location = new System.Drawing.Point(22, 93);
+            this.lb_depotCode.Location = new System.Drawing.Point(22, 84);
             this.lb_depotCode.Name = "lb_depotCode";
             this.lb_depotCode.Size = new System.Drawing.Size(68, 21);
             this.lb_depotCode.TabIndex = 267;
@@ -559,7 +448,6 @@
             this.gv_depotCode.AppearanceCell.Options.UseFont = true;
             this.gv_depotCode.Caption = "閫�鏂欎粨搴�";
             this.gv_depotCode.FieldName = "depotCode";
-            this.gv_depotCode.MinWidth = 50;
             this.gv_depotCode.Name = "gv_depotCode";
             this.gv_depotCode.OptionsColumn.AllowEdit = false;
             this.gv_depotCode.Tag = "query_a.depot_code";
@@ -571,7 +459,7 @@
             // 
             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(552, 93);
+            this.lb_checkDate.Location = new System.Drawing.Point(548, 84);
             this.lb_checkDate.Name = "lb_checkDate";
             this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
             this.lb_checkDate.TabIndex = 252;
@@ -579,12 +467,11 @@
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Enabled = false;
-            this.txt_checkDate.Location = new System.Drawing.Point(627, 89);
+            this.txt_checkDate.Location = new System.Drawing.Point(623, 80);
             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(158, 28);
             this.txt_checkDate.TabIndex = 252;
             // 
             // gv_checkDate
@@ -593,43 +480,28 @@
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 ";
             this.gv_checkDate.FieldName = "checkDate";
-            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";
             this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 13;
-            this.gv_checkDate.Width = 94;
+            this.gv_checkDate.VisibleIndex = 12;
+            this.gv_checkDate.Width = 180;
             // 
             // lb_checkUser
             // 
             this.lb_checkUser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_checkUser.Appearance.Options.UseFont = true;
-            this.lb_checkUser.Location = new System.Drawing.Point(586, 19);
+            this.lb_checkUser.Location = new System.Drawing.Point(582, 19);
             this.lb_checkUser.Name = "lb_checkUser";
             this.lb_checkUser.Size = new System.Drawing.Size(34, 21);
             this.lb_checkUser.TabIndex = 247;
             this.lb_checkUser.Text = "瀹℃牳";
             // 
-            // gv_checkUser
-            // 
-            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkUser.AppearanceCell.Options.UseFont = true;
-            this.gv_checkUser.Caption = "瀹℃牳浜虹紪鐮�";
-            this.gv_checkUser.FieldName = "checkUser";
-            this.gv_checkUser.MinWidth = 50;
-            this.gv_checkUser.Name = "gv_checkUser";
-            this.gv_checkUser.OptionsColumn.AllowEdit = false;
-            this.gv_checkUser.Tag = "query_a.check_user";
-            this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 14;
-            this.gv_checkUser.Width = 94;
-            // 
             // lb_reason
             // 
             this.lb_reason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_reason.Appearance.Options.UseFont = true;
-            this.lb_reason.Location = new System.Drawing.Point(336, 93);
+            this.lb_reason.Location = new System.Drawing.Point(336, 84);
             this.lb_reason.Name = "lb_reason";
             this.lb_reason.Size = new System.Drawing.Size(73, 21);
             this.lb_reason.TabIndex = 240;
@@ -641,19 +513,18 @@
             this.gv_reason.AppearanceCell.Options.UseFont = true;
             this.gv_reason.Caption = "閫�鏂欏師鍥�";
             this.gv_reason.FieldName = "reason";
-            this.gv_reason.MinWidth = 50;
             this.gv_reason.Name = "gv_reason";
             this.gv_reason.OptionsColumn.AllowEdit = false;
             this.gv_reason.Tag = "query_a.reason";
             this.gv_reason.Visible = true;
-            this.gv_reason.VisibleIndex = 8;
+            this.gv_reason.VisibleIndex = 13;
             this.gv_reason.Width = 94;
             // 
             // 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(22, 130);
+            this.lb_remark.Location = new System.Drawing.Point(22, 118);
             this.lb_remark.Name = "lb_remark";
             this.lb_remark.Size = new System.Drawing.Size(68, 21);
             this.lb_remark.TabIndex = 235;
@@ -661,7 +532,7 @@
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(94, 126);
+            this.txt_remark.Location = new System.Drawing.Point(94, 114);
             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;
@@ -674,12 +545,11 @@
             this.gv_remark.AppearanceCell.Options.UseFont = true;
             this.gv_remark.Caption = "澶囨敞淇℃伅 ";
             this.gv_remark.FieldName = "remark";
-            this.gv_remark.MinWidth = 50;
             this.gv_remark.Name = "gv_remark";
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.remark";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 9;
+            this.gv_remark.VisibleIndex = 8;
             this.gv_remark.Width = 94;
             // 
             // gv_createDate
@@ -688,27 +558,12 @@
             this.gv_createDate.AppearanceCell.Options.UseFont = true;
             this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
             this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 50;
             this.gv_createDate.Name = "gv_createDate";
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.create_date";
             this.gv_createDate.Visible = true;
             this.gv_createDate.VisibleIndex = 10;
-            this.gv_createDate.Width = 94;
-            // 
-            // gv_createBy
-            // 
-            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_createBy.AppearanceCell.Options.UseFont = true;
-            this.gv_createBy.Caption = "鍒涘缓浜虹紪鐮�";
-            this.gv_createBy.FieldName = "createBy";
-            this.gv_createBy.MinWidth = 50;
-            this.gv_createBy.Name = "gv_createBy";
-            this.gv_createBy.OptionsColumn.AllowEdit = false;
-            this.gv_createBy.Tag = "query_a.create_by";
-            this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 11;
-            this.gv_createBy.Width = 94;
+            this.gv_createDate.Width = 180;
             // 
             // gv_status
             // 
@@ -722,7 +577,7 @@
             this.gv_status.OptionsColumn.AllowEdit = false;
             this.gv_status.Tag = "query_a.status";
             this.gv_status.Visible = true;
-            this.gv_status.VisibleIndex = 0;
+            this.gv_status.VisibleIndex = 1;
             this.gv_status.Width = 50;
             // 
             // lb_itemOutNo
@@ -737,12 +592,11 @@
             // 
             // txt_itemOutNo
             // 
-            this.txt_itemOutNo.Enabled = false;
             this.txt_itemOutNo.Location = new System.Drawing.Point(94, 15);
             this.txt_itemOutNo.Name = "txt_itemOutNo";
             this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemOutNo.Size = new System.Drawing.Size(221, 28);
+            this.txt_itemOutNo.Size = new System.Drawing.Size(239, 28);
             this.txt_itemOutNo.TabIndex = 210;
             // 
             // gv_itemOutNo
@@ -751,13 +605,12 @@
             this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
             this.gv_itemOutNo.Caption = "鍑哄簱鍗曞彿 ";
             this.gv_itemOutNo.FieldName = "itemOutNo";
-            this.gv_itemOutNo.MinWidth = 50;
             this.gv_itemOutNo.Name = "gv_itemOutNo";
             this.gv_itemOutNo.OptionsColumn.AllowEdit = false;
             this.gv_itemOutNo.Tag = "query_a.item_out_no";
             this.gv_itemOutNo.Visible = true;
             this.gv_itemOutNo.VisibleIndex = 3;
-            this.gv_itemOutNo.Width = 94;
+            this.gv_itemOutNo.Width = 100;
             // 
             // toolBarMenu1
             // 
@@ -794,26 +647,21 @@
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn13,
             this.gv_status,
-            this.gv_nflag,
             this.gv_fType,
             this.gv_itemOutNo,
             this.gv_suppNo,
             this.gridColumn1,
             this.gv_depotCode,
             this.gridColumn2,
-            this.gv_reason,
             this.gv_remark,
-            this.gv_createDate,
-            this.gv_createBy,
             this.gridColumn3,
-            this.gv_checkDate,
-            this.gv_checkUser,
+            this.gv_createDate,
             this.gridColumn4,
-            this.gv_fmrmode,
-            this.gv_guid,
-            this.gv_suppId,
-            this.gv_depotId});
+            this.gv_checkDate,
+            this.gv_reason,
+            this.gv_fmrmode});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -821,11 +669,20 @@
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "閫�鏂欑粍缁�";
+            this.gridColumn13.FieldName = "receivingOrg";
+            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 = "SuppName";
-            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.FieldName = "suppName";
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 5;
@@ -835,7 +692,6 @@
             // 
             this.gridColumn2.Caption = "浠撳簱鍚嶇О";
             this.gridColumn2.FieldName = "depotName";
-            this.gridColumn2.MinWidth = 25;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 7;
@@ -843,22 +699,20 @@
             // 
             // gridColumn3
             // 
-            this.gridColumn3.Caption = "鍒涘缓浜哄鍚�";
-            this.gridColumn3.FieldName = "createByFname";
-            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Caption = "鍒涘缓浜�";
+            this.gridColumn3.FieldName = "createBy";
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 12;
+            this.gridColumn3.VisibleIndex = 9;
             this.gridColumn3.Width = 94;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "瀹℃牳浜�";
-            this.gridColumn4.FieldName = "checkUserFname";
-            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.FieldName = "checkUser";
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 15;
+            this.gridColumn4.VisibleIndex = 11;
             this.gridColumn4.Width = 94;
             // 
             // xtraTabControl1
@@ -904,10 +758,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 197);
+            this.tabMx.Location = new System.Drawing.Point(0, 150);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage2;
-            this.tabMx.Size = new System.Drawing.Size(1126, 373);
+            this.tabMx.Size = new System.Drawing.Size(1126, 420);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage2,
@@ -915,25 +769,25 @@
             // 
             // xtraTabPage3
             // 
-            this.xtraTabPage3.Controls.Add(this.gcMx1);
+            this.xtraTabPage3.Controls.Add(this.gcMx2);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 341);
-            this.xtraTabPage3.Text = "閫�璐х墿鏂欐壂鐮�";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 388);
+            this.xtraTabPage3.Text = "閫�璐х墿鏂欐壂鐮佹槑缁�";
             // 
-            // gcMx1
+            // gcMx2
             // 
-            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.Location = new System.Drawing.Point(0, 0);
-            this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1124, 341);
-            this.gcMx1.TabIndex = 1;
-            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx1});
+            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.Location = new System.Drawing.Point(0, 0);
+            this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Name = "gcMx2";
+            this.gcMx2.Size = new System.Drawing.Size(1124, 388);
+            this.gcMx2.TabIndex = 1;
+            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx2});
             // 
-            // gvMx1
+            // gvMx2
             // 
-            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx1guid,
             this.gvMx1itemBarcode,
             this.gvMx1itemNo,
@@ -945,12 +799,11 @@
             this.gvMx1depotSectionCode,
             this.gvMx1ebelnK3id,
             this.gvMx1lineK3id});
-            this.gvMx1.GridControl = this.gcMx1;
-            this.gvMx1.Name = "gvMx1";
-            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
-            this.gvMx1.OptionsView.ShowGroupPanel = false;
+            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.ShowGroupPanel = false;
             // 
             // gvMx1guid
             // 
@@ -969,7 +822,6 @@
             this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜 ";
             this.gvMx1itemBarcode.FieldName = "itemBarcode";
-            this.gvMx1itemBarcode.MinWidth = 50;
             this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
             this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx1itemBarcode.Visible = true;
@@ -982,7 +834,6 @@
             this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemNo.Caption = "鐗╂枡缂栫爜";
             this.gvMx1itemNo.FieldName = "itemNo";
-            this.gvMx1itemNo.MinWidth = 50;
             this.gvMx1itemNo.Name = "gvMx1itemNo";
             this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
             this.gvMx1itemNo.Visible = true;
@@ -993,7 +844,6 @@
             // 
             this.gridColumn8.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn8.FieldName = "itemName";
-            this.gridColumn8.MinWidth = 25;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 2;
@@ -1003,7 +853,6 @@
             // 
             this.gridColumn9.Caption = "瑙勬牸鍨嬪彿";
             this.gridColumn9.FieldName = "itemModel";
-            this.gridColumn9.MinWidth = 25;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 3;
@@ -1025,8 +874,8 @@
             // gridColumn10
             // 
             this.gridColumn10.Caption = "鍗曚綅";
-            this.gridColumn10.FieldName = "fnumber";
-            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.FieldName = "kcUnit";
+            this.gridColumn10.MinWidth = 50;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 5;
@@ -1038,7 +887,6 @@
             this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1depotCode.Caption = "浠撳簱缂栫爜 ";
             this.gvMx1depotCode.FieldName = "depotCode";
-            this.gvMx1depotCode.MinWidth = 50;
             this.gvMx1depotCode.Name = "gvMx1depotCode";
             this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
             this.gvMx1depotCode.Visible = true;
@@ -1051,7 +899,6 @@
             this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
             this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜 ";
             this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
-            this.gvMx1depotSectionCode.MinWidth = 50;
             this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
             this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
             this.gvMx1depotSectionCode.Visible = true;
@@ -1064,7 +911,6 @@
             this.gvMx1ebelnK3id.AppearanceCell.Options.UseFont = true;
             this.gvMx1ebelnK3id.Caption = "閲囪喘璁㈠崟ID ";
             this.gvMx1ebelnK3id.FieldName = "ebelnK3id";
-            this.gvMx1ebelnK3id.MinWidth = 50;
             this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id";
             this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID";
             this.gvMx1ebelnK3id.Visible = true;
@@ -1077,7 +923,6 @@
             this.gvMx1lineK3id.AppearanceCell.Options.UseFont = true;
             this.gvMx1lineK3id.Caption = "閲囪喘璁㈠崟琛孖D ";
             this.gvMx1lineK3id.FieldName = "lineK3id";
-            this.gvMx1lineK3id.MinWidth = 50;
             this.gvMx1lineK3id.Name = "gvMx1lineK3id";
             this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID";
             this.gvMx1lineK3id.Visible = true;
@@ -1087,15 +932,14 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.btnSelect);
-            this.panel1.Controls.Add(this.txt_check);
+            this.panel1.Controls.Add(this.txt_suppName);
+            this.panel1.Controls.Add(this.txt_depotName);
+            this.panel1.Controls.Add(this.txt_status);
             this.panel1.Controls.Add(this.txt_fType);
             this.panel1.Controls.Add(this.txt_fmrmode);
             this.panel1.Controls.Add(this.txt_reason);
-            this.panel1.Controls.Add(this.txt_suppId);
-            this.panel1.Controls.Add(this.txt_depotId);
             this.panel1.Controls.Add(this.labelControl3);
-            this.panel1.Controls.Add(this.txt_checkUserFname);
+            this.panel1.Controls.Add(this.txt_checkUser);
             this.panel1.Controls.Add(this.lbGuid);
             this.panel1.Controls.Add(this.lb_fmrmode);
             this.panel1.Controls.Add(this.lb_suppNo);
@@ -1113,26 +957,35 @@
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1126, 197);
+            this.panel1.Size = new System.Drawing.Size(1126, 150);
             this.panel1.TabIndex = 1;
             // 
-            // btnSelect
+            // txt_suppName
             // 
-            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
-            this.btnSelect.Location = new System.Drawing.Point(22, 160);
-            this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(128, 29);
-            this.btnSelect.TabIndex = 522;
-            this.btnSelect.Text = "鍘婚�夋嫨鏉ユ枡鏄庣粏";
+            this.txt_suppName.Location = new System.Drawing.Point(94, 80);
+            this.txt_suppName.Name = "txt_suppName";
+            this.txt_suppName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_suppName.Properties.Appearance.Options.UseFont = true;
+            this.txt_suppName.Size = new System.Drawing.Size(239, 28);
+            this.txt_suppName.TabIndex = 524;
             // 
-            // txt_check
+            // txt_depotName
             // 
-            this.txt_check.Enabled = false;
-            this.txt_check.Location = new System.Drawing.Point(627, 17);
-            this.txt_check.Name = "txt_check";
-            this.txt_check.Properties.Caption = "";
-            this.txt_check.Size = new System.Drawing.Size(94, 24);
-            this.txt_check.TabIndex = 521;
+            this.txt_depotName.Location = new System.Drawing.Point(94, 47);
+            this.txt_depotName.Name = "txt_depotName";
+            this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_depotName.Properties.Appearance.Options.UseFont = true;
+            this.txt_depotName.Size = new System.Drawing.Size(239, 28);
+            this.txt_depotName.TabIndex = 523;
+            // 
+            // txt_status
+            // 
+            this.txt_status.Enabled = false;
+            this.txt_status.Location = new System.Drawing.Point(623, 17);
+            this.txt_status.Name = "txt_status";
+            this.txt_status.Properties.Caption = "";
+            this.txt_status.Size = new System.Drawing.Size(94, 24);
+            this.txt_status.TabIndex = 521;
             // 
             // txt_fType
             // 
@@ -1144,7 +997,7 @@
             // 
             // txt_fmrmode
             // 
-            this.txt_fmrmode.Location = new System.Drawing.Point(415, 53);
+            this.txt_fmrmode.Location = new System.Drawing.Point(415, 49);
             this.txt_fmrmode.Name = "txt_fmrmode";
             this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1156,7 +1009,7 @@
             // 
             // txt_reason
             // 
-            this.txt_reason.Location = new System.Drawing.Point(415, 91);
+            this.txt_reason.Location = new System.Drawing.Point(415, 82);
             this.txt_reason.Name = "txt_reason";
             this.txt_reason.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1169,43 +1022,24 @@
             this.txt_reason.Size = new System.Drawing.Size(125, 24);
             this.txt_reason.TabIndex = 518;
             // 
-            // txt_suppId
-            // 
-            this.txt_suppId.IsReadly = true;
-            this.txt_suppId.Location = new System.Drawing.Point(94, 50);
-            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
-            this.txt_suppId.Name = "txt_suppId";
-            this.txt_suppId.Size = new System.Drawing.Size(221, 28);
-            this.txt_suppId.TabIndex = 517;
-            // 
-            // txt_depotId
-            // 
-            this.txt_depotId.IsReadly = true;
-            this.txt_depotId.Location = new System.Drawing.Point(94, 88);
-            this.txt_depotId.Margin = new System.Windows.Forms.Padding(0);
-            this.txt_depotId.Name = "txt_depotId";
-            this.txt_depotId.Size = new System.Drawing.Size(221, 28);
-            this.txt_depotId.TabIndex = 516;
-            // 
             // labelControl3
             // 
             this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl3.Appearance.Options.UseFont = true;
-            this.labelControl3.Location = new System.Drawing.Point(569, 55);
+            this.labelControl3.Location = new System.Drawing.Point(565, 51);
             this.labelControl3.Name = "labelControl3";
             this.labelControl3.Size = new System.Drawing.Size(51, 21);
             this.labelControl3.TabIndex = 512;
             this.labelControl3.Text = "瀹℃牳浜�";
             // 
-            // txt_checkUserFname
+            // txt_checkUser
             // 
-            this.txt_checkUserFname.Enabled = false;
-            this.txt_checkUserFname.Location = new System.Drawing.Point(627, 51);
-            this.txt_checkUserFname.Name = "txt_checkUserFname";
-            this.txt_checkUserFname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_checkUserFname.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUserFname.Size = new System.Drawing.Size(150, 28);
-            this.txt_checkUserFname.TabIndex = 513;
+            this.txt_checkUser.Location = new System.Drawing.Point(623, 47);
+            this.txt_checkUser.Name = "txt_checkUser";
+            this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
+            this.txt_checkUser.Size = new System.Drawing.Size(158, 28);
+            this.txt_checkUser.TabIndex = 513;
             // 
             // lbGuid
             // 
@@ -1235,11 +1069,10 @@
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_MesCgthSqDj";
-            this.Text = "閲囪喘閫�璐х敵璇�";
+            this.Text = "閲囪喘閫�璐у崟";
             this.tabMxPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
@@ -1252,21 +1085,23 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.xtraTabPage3.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_check.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserFname.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
         }
         #endregion
-      private UserControl.UcToolBarMenu toolBarMenu1;
+        private UserControl.UcToolBarMenu toolBarMenu1;
         private DevExpress.XtraGrid.GridControl gcMain;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
@@ -1275,72 +1110,65 @@
         private UserControls.Data.UcPageBar pageBar1;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Label lbGuid;
-  private DevExpress.XtraTab.XtraTabControl tabMx;
- 
-       //BQCreateConrolObejct
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemOutId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2tlQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2pbillNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2status;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2lineK3id;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2ebelnK3id;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2workLine;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotCode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
- private DevExpress.XtraTab.XtraTabPage tabMxPage2;
- private DevExpress.XtraGrid.GridControl gcMx2;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
- private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
- private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+        private DevExpress.XtraTab.XtraTabControl tabMx;
 
-private DevExpress.XtraEditors.LabelControl lb_fmrmode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fmrmode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_nflag;
+        //BQCreateConrolObejct
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemOutId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2tlQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2pbillNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2status;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2lineK3id;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2ebelnK3id;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2workLine;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
+        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+        private DevExpress.XtraGrid.GridControl gcMx1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
 
-private DevExpress.XtraEditors.LabelControl lb_suppNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
+        private DevExpress.XtraEditors.LabelControl lb_fmrmode;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_fmrmode;
 
-private DevExpress.XtraEditors.LabelControl lb_fType;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
+        private DevExpress.XtraEditors.LabelControl lb_suppNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
 
-private DevExpress.XtraEditors.LabelControl lb_depotCode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
+        private DevExpress.XtraEditors.LabelControl lb_fType;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
 
-private DevExpress.XtraEditors.LabelControl lb_checkDate;
-private DevExpress.XtraEditors.TextEdit txt_checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
+        private DevExpress.XtraEditors.LabelControl lb_depotCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
 
-private DevExpress.XtraEditors.LabelControl lb_checkUser;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
+        private DevExpress.XtraEditors.LabelControl lb_checkDate;
+        private DevExpress.XtraEditors.TextEdit txt_checkDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
 
-private DevExpress.XtraEditors.LabelControl lb_reason;
- private DevExpress.XtraGrid.Columns.GridColumn gv_reason;
+        private DevExpress.XtraEditors.LabelControl lb_checkUser;
 
-private DevExpress.XtraEditors.LabelControl lb_remark;
-private DevExpress.XtraEditors.TextEdit txt_remark;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_status;
+        private DevExpress.XtraEditors.LabelControl lb_reason;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_reason;
 
-private DevExpress.XtraEditors.LabelControl lb_itemOutNo;
-private DevExpress.XtraEditors.TextEdit txt_itemOutNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemOutNo;
+        private DevExpress.XtraEditors.LabelControl lb_remark;
+        private DevExpress.XtraEditors.TextEdit txt_remark;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_status;
+
+        private DevExpress.XtraEditors.LabelControl lb_itemOutNo;
+        private DevExpress.XtraEditors.TextEdit txt_itemOutNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_itemOutNo;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraEditors.LabelControl labelControl3;
-        private DevExpress.XtraEditors.TextEdit txt_checkUserFname;
+        private DevExpress.XtraEditors.TextEdit txt_checkUser;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
-        private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+        private DevExpress.XtraGrid.GridControl gcMx2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
@@ -1352,17 +1180,15 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
-        private UserControl.UcLookCk txt_depotId;
-        private UserControl.UcLookSupplier txt_suppId;
         private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode;
         private DevExpress.XtraEditors.ComboBoxEdit txt_reason;
         private DevExpress.XtraEditors.CheckEdit txt_fType;
-        private DevExpress.XtraEditors.CheckEdit txt_check;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraEditors.SimpleButton btnSelect;
+        private DevExpress.XtraEditors.CheckEdit txt_status;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
         private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraEditors.TextEdit txt_suppName;
+        private DevExpress.XtraEditors.TextEdit txt_depotName;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3