From 0c5e836d9210c9cb6278ebac705f33823fe8535a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 14 一月 2025 16:49:05 +0800
Subject: [PATCH] 委外领料

---
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs |  890 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 459 insertions(+), 431 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs
index b4b00b1..8e4486c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs
@@ -29,29 +29,8 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemBarcode = 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.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1rkQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1workNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1createDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.lb_depotId = new DevExpress.XtraEditors.LabelControl();
             this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_boardItem = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -71,7 +50,6 @@
             this.lb_checkUser = new DevExpress.XtraEditors.LabelControl();
             this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
             this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
-            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();
@@ -84,7 +62,7 @@
             this.lb_status = new DevExpress.XtraEditors.LabelControl();
             this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_taskNo = new DevExpress.XtraEditors.LabelControl();
-            this.txt_taskNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_pbillNo = new DevExpress.XtraEditors.TextEdit();
             this.lb_itemOutNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
             this.gv_itemOutNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -99,17 +77,38 @@
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.panel1 = new System.Windows.Forms.Panel();
             this.txt_outPart = new Gs.DevApp.UserControl.UcLookDepartment();
-            this.depot_id = new Gs.DevApp.UserControl.UcLookCk();
             this.txt_status = new DevExpress.XtraEditors.CheckEdit();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.txt_depotId = new DevExpress.XtraEditors.TextEdit();
+            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1workNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             this.tabMxPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
@@ -117,7 +116,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -130,311 +129,36 @@
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).BeginInit();
+            ((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.SuspendLayout();
-            // 
-            // gvMx2remark
-            // 
-            this.gvMx2remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2remark.AppearanceCell.Options.UseFont = true;
-            this.gvMx2remark.Caption = "澶囨敞 ";
-            this.gvMx2remark.FieldName = "remark";
-            this.gvMx2remark.MinWidth = 50;
-            this.gvMx2remark.Name = "gvMx2remark";
-            this.gvMx2remark.Tag = "query_a.REMARK";
-            this.gvMx2remark.Visible = true;
-            this.gvMx2remark.VisibleIndex = 6;
-            this.gvMx2remark.Width = 94;
-            // 
-            // gvMx2depotSectionCode
-            // 
-            this.gvMx2depotSectionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2depotSectionCode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2depotSectionCode.Caption = "璐т綅缂栫爜 ";
-            this.gvMx2depotSectionCode.FieldName = "depotSectionCode";
-            this.gvMx2depotSectionCode.MinWidth = 50;
-            this.gvMx2depotSectionCode.Name = "gvMx2depotSectionCode";
-            this.gvMx2depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
-            this.gvMx2depotSectionCode.Visible = true;
-            this.gvMx2depotSectionCode.VisibleIndex = 5;
-            this.gvMx2depotSectionCode.Width = 94;
-            // 
-            // gvMx2depotCode
-            // 
-            this.gvMx2depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2depotCode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2depotCode.Caption = "浠撳簱缂栫爜 ";
-            this.gvMx2depotCode.FieldName = "depotCode";
-            this.gvMx2depotCode.MinWidth = 50;
-            this.gvMx2depotCode.Name = "gvMx2depotCode";
-            this.gvMx2depotCode.Tag = "query_a.DEPOT_CODE";
-            this.gvMx2depotCode.Visible = true;
-            this.gvMx2depotCode.VisibleIndex = 4;
-            this.gvMx2depotCode.Width = 94;
-            // 
-            // gvMx2quantity
-            // 
-            this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2quantity.AppearanceCell.Options.UseFont = 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;
-            this.gvMx2quantity.VisibleIndex = 3;
-            this.gvMx2quantity.Width = 94;
-            // 
-            // gvMx2lotNo
-            // 
-            this.gvMx2lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2lotNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2lotNo.Caption = "鐗╂枡鍚嶇О";
-            this.gvMx2lotNo.FieldName = "lotNo";
-            this.gvMx2lotNo.MinWidth = 50;
-            this.gvMx2lotNo.Name = "gvMx2lotNo";
-            this.gvMx2lotNo.Tag = "query_a.LOT_NO";
-            this.gvMx2lotNo.Visible = true;
-            this.gvMx2lotNo.VisibleIndex = 2;
-            this.gvMx2lotNo.Width = 94;
-            // 
-            // gvMx2itemNo
-            // 
-            this.gvMx2itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
-            this.gvMx2itemNo.FieldName = "itemNo";
-            this.gvMx2itemNo.MinWidth = 50;
-            this.gvMx2itemNo.Name = "gvMx2itemNo";
-            this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
-            this.gvMx2itemNo.Visible = true;
-            this.gvMx2itemNo.VisibleIndex = 1;
-            this.gvMx2itemNo.Width = 94;
-            // 
-            // gvMx2itemBarcode
-            // 
-            this.gvMx2itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
-            this.gvMx2itemBarcode.FieldName = "itemBarcode";
-            this.gvMx2itemBarcode.MinWidth = 50;
-            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
-            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
-            this.gvMx2itemBarcode.Visible = true;
-            this.gvMx2itemBarcode.VisibleIndex = 0;
-            this.gvMx2itemBarcode.Width = 94;
             // 
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1124, 417);
+            this.tabMxPage2.Size = new System.Drawing.Size(1124, 423);
             this.tabMxPage2.Text = "鍑哄簱鏉$爜";
-            // 
-            // gcMx2
-            // 
-            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, 417);
-            this.gcMx2.TabIndex = 0;
-            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx2});
-            // 
-            // gvMx2
-            // 
-            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx2itemBarcode,
-            this.gvMx2itemNo,
-            this.gvMx2lotNo,
-            this.gvMx2quantity,
-            this.gvMx2depotCode,
-            this.gvMx2depotSectionCode,
-            this.gvMx2remark});
-            this.gvMx2.GridControl = this.gcMx2;
-            this.gvMx2.Name = "gvMx2";
-            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
-            this.gvMx2.OptionsView.ShowGroupPanel = false;
-            // 
-            // gvMx1itemId
-            // 
-            this.gvMx1itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1itemId.Caption = "鐗╂枡ID ";
-            this.gvMx1itemId.FieldName = "itemId";
-            this.gvMx1itemId.MinWidth = 50;
-            this.gvMx1itemId.Name = "gvMx1itemId";
-            this.gvMx1itemId.Tag = "query_a.item_id";
-            this.gvMx1itemId.Visible = true;
-            this.gvMx1itemId.VisibleIndex = 9;
-            this.gvMx1itemId.Width = 94;
-            // 
-            // gvMx1tlQty
-            // 
-            this.gvMx1tlQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1tlQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1tlQty.Caption = "宸叉壂鏁伴噺 ";
-            this.gvMx1tlQty.FieldName = "tlQty";
-            this.gvMx1tlQty.MinWidth = 50;
-            this.gvMx1tlQty.Name = "gvMx1tlQty";
-            this.gvMx1tlQty.Tag = "query_a.tl_qty";
-            this.gvMx1tlQty.Visible = true;
-            this.gvMx1tlQty.VisibleIndex = 8;
-            this.gvMx1tlQty.Width = 94;
-            // 
-            // gvMx1rkQty
-            // 
-            this.gvMx1rkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1rkQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1rkQty.Caption = "宸插叆搴撴暟 ";
-            this.gvMx1rkQty.FieldName = "rkQty";
-            this.gvMx1rkQty.MinWidth = 50;
-            this.gvMx1rkQty.Name = "gvMx1rkQty";
-            this.gvMx1rkQty.Tag = "query_a.rk_qty";
-            this.gvMx1rkQty.Visible = true;
-            this.gvMx1rkQty.VisibleIndex = 7;
-            this.gvMx1rkQty.Width = 94;
-            // 
-            // gvMx1workNo
-            // 
-            this.gvMx1workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1workNo.Caption = "浠诲姟鍗曞彿";
-            this.gvMx1workNo.FieldName = "workNo";
-            this.gvMx1workNo.MinWidth = 50;
-            this.gvMx1workNo.Name = "gvMx1workNo";
-            this.gvMx1workNo.Tag = "query_a.work_no";
-            this.gvMx1workNo.Visible = true;
-            this.gvMx1workNo.VisibleIndex = 6;
-            this.gvMx1workNo.Width = 94;
-            // 
-            // gvMx1remark
-            // 
-            this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1remark.AppearanceCell.Options.UseFont = true;
-            this.gvMx1remark.Caption = "澶囨敞淇℃伅 ";
-            this.gvMx1remark.FieldName = "remark";
-            this.gvMx1remark.MinWidth = 50;
-            this.gvMx1remark.Name = "gvMx1remark";
-            this.gvMx1remark.Tag = "query_a.remark";
-            this.gvMx1remark.Visible = true;
-            this.gvMx1remark.VisibleIndex = 5;
-            this.gvMx1remark.Width = 94;
-            // 
-            // gvMx1createDate
-            // 
-            this.gvMx1createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1createDate.AppearanceCell.Options.UseFont = true;
-            this.gvMx1createDate.Caption = "鐗╂枡瑙勬牸";
-            this.gvMx1createDate.FieldName = "createDate";
-            this.gvMx1createDate.MinWidth = 50;
-            this.gvMx1createDate.Name = "gvMx1createDate";
-            this.gvMx1createDate.Tag = "query_a.create_date";
-            this.gvMx1createDate.Visible = true;
-            this.gvMx1createDate.VisibleIndex = 4;
-            this.gvMx1createDate.Width = 94;
-            // 
-            // gvMx1createBy
-            // 
-            this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
-            this.gvMx1createBy.Caption = "鐗╂枡鍚嶇О";
-            this.gvMx1createBy.FieldName = "createBy";
-            this.gvMx1createBy.MinWidth = 50;
-            this.gvMx1createBy.Name = "gvMx1createBy";
-            this.gvMx1createBy.Tag = "query_a.create_by";
-            this.gvMx1createBy.Visible = true;
-            this.gvMx1createBy.VisibleIndex = 3;
-            this.gvMx1createBy.Width = 94;
-            // 
-            // gvMx1quantity
-            // 
-            this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx1quantity.Caption = "鐢宠鏁伴噺 ";
-            this.gvMx1quantity.FieldName = "quantity";
-            this.gvMx1quantity.MinWidth = 50;
-            this.gvMx1quantity.Name = "gvMx1quantity";
-            this.gvMx1quantity.Tag = "query_a.quantity";
-            this.gvMx1quantity.Visible = true;
-            this.gvMx1quantity.VisibleIndex = 2;
-            this.gvMx1quantity.Width = 94;
-            // 
-            // gvMx1itemNo
-            // 
-            this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            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;
-            this.gvMx1itemNo.VisibleIndex = 1;
-            this.gvMx1itemNo.Width = 94;
-            // 
-            // gvMx1guid
-            // 
-            this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1guid.Caption = "guid ";
-            this.gvMx1guid.FieldName = "guid";
-            this.gvMx1guid.MinWidth = 50;
-            this.gvMx1guid.Name = "gvMx1guid";
-            this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Visible = true;
-            this.gvMx1guid.VisibleIndex = 0;
-            this.gvMx1guid.Width = 94;
             // 
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 417);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 423);
             this.tabMxPage1.Text = "鍑哄簱鏄庣粏";
-            // 
-            // gcMx1
-            // 
-            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, 417);
-            this.gcMx1.TabIndex = 0;
-            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx1});
-            // 
-            // gvMx1
-            // 
-            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx1guid,
-            this.gvMx1workNo,
-            this.gvMx1itemNo,
-            this.gvMx1createBy,
-            this.gvMx1createDate,
-            this.gvMx1quantity,
-            this.gvMx1remark,
-            this.gvMx1rkQty,
-            this.gvMx1tlQty,
-            this.gvMx1itemId});
-            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;
             // 
             // lb_depotId
             // 
             this.lb_depotId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_depotId.Appearance.Options.UseFont = true;
-            this.lb_depotId.Location = new System.Drawing.Point(302, 51);
+            this.lb_depotId.Location = new System.Drawing.Point(271, 52);
             this.lb_depotId.Name = "lb_depotId";
-            this.lb_depotId.Size = new System.Drawing.Size(34, 21);
+            this.lb_depotId.Size = new System.Drawing.Size(68, 21);
             this.lb_depotId.TabIndex = 571;
-            this.lb_depotId.Text = "浠撳簱";
+            this.lb_depotId.Text = "鍙戣揣浠撳簱";
             // 
             // gv_pbillNo
             // 
@@ -455,7 +179,7 @@
             this.gv_boardItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_boardItem.AppearanceCell.Options.UseFont = true;
             this.gv_boardItem.Caption = "浜у搧缂栫爜";
-            this.gv_boardItem.FieldName = "boardItem";
+            this.gv_boardItem.FieldName = "itemNo";
             this.gv_boardItem.MinWidth = 50;
             this.gv_boardItem.Name = "gv_boardItem";
             this.gv_boardItem.OptionsColumn.AllowEdit = false;
@@ -468,19 +192,19 @@
             // 
             this.lb_outType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_outType.Appearance.Options.UseFont = true;
-            this.lb_outType.Location = new System.Drawing.Point(263, 89);
+            this.lb_outType.Location = new System.Drawing.Point(271, 85);
             this.lb_outType.Name = "lb_outType";
-            this.lb_outType.Size = new System.Drawing.Size(73, 21);
+            this.lb_outType.Size = new System.Drawing.Size(68, 21);
             this.lb_outType.TabIndex = 450;
-            this.lb_outType.Text = "鍑哄簱绫诲埆 ";
+            this.lb_outType.Text = "鍑哄簱绫诲埆";
             // 
             // txt_outType
             // 
-            this.txt_outType.Location = new System.Drawing.Point(342, 85);
+            this.txt_outType.Location = new System.Drawing.Point(342, 81);
             this.txt_outType.Name = "txt_outType";
             this.txt_outType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_outType.Properties.Appearance.Options.UseFont = true;
-            this.txt_outType.Size = new System.Drawing.Size(174, 28);
+            this.txt_outType.Size = new System.Drawing.Size(184, 28);
             this.txt_outType.TabIndex = 450;
             // 
             // gv_outType
@@ -494,7 +218,7 @@
             this.gv_outType.OptionsColumn.AllowEdit = false;
             this.gv_outType.Tag = "query_a.out_type";
             this.gv_outType.Visible = true;
-            this.gv_outType.VisibleIndex = 7;
+            this.gv_outType.VisibleIndex = 8;
             this.gv_outType.Width = 94;
             // 
             // lb_workNo
@@ -503,17 +227,17 @@
             this.lb_workNo.Appearance.Options.UseFont = true;
             this.lb_workNo.Location = new System.Drawing.Point(20, 52);
             this.lb_workNo.Name = "lb_workNo";
-            this.lb_workNo.Size = new System.Drawing.Size(73, 21);
+            this.lb_workNo.Size = new System.Drawing.Size(68, 21);
             this.lb_workNo.TabIndex = 387;
-            this.lb_workNo.Text = "浠诲姟鍗曞彿 ";
+            this.lb_workNo.Text = "鎶曟枡鍗曞彿";
             // 
             // txt_workNo
             // 
-            this.txt_workNo.Location = new System.Drawing.Point(98, 48);
+            this.txt_workNo.Location = new System.Drawing.Point(89, 48);
             this.txt_workNo.Name = "txt_workNo";
             this.txt_workNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_workNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_workNo.Size = new System.Drawing.Size(150, 28);
+            this.txt_workNo.Size = new System.Drawing.Size(176, 28);
             this.txt_workNo.TabIndex = 387;
             // 
             // gv_workNo
@@ -541,18 +265,18 @@
             this.gv_receiver.OptionsColumn.AllowEdit = false;
             this.gv_receiver.Tag = "query_a.receiver";
             this.gv_receiver.Visible = true;
-            this.gv_receiver.VisibleIndex = 10;
+            this.gv_receiver.VisibleIndex = 11;
             this.gv_receiver.Width = 94;
             // 
             // lb_outPart
             // 
             this.lb_outPart.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_outPart.Appearance.Options.UseFont = true;
-            this.lb_outPart.Location = new System.Drawing.Point(263, 20);
+            this.lb_outPart.Location = new System.Drawing.Point(271, 20);
             this.lb_outPart.Name = "lb_outPart";
-            this.lb_outPart.Size = new System.Drawing.Size(73, 21);
+            this.lb_outPart.Size = new System.Drawing.Size(68, 21);
             this.lb_outPart.TabIndex = 319;
-            this.lb_outPart.Text = "棰嗘枡閮ㄩ棬 ";
+            this.lb_outPart.Text = "棰嗘枡閮ㄩ棬";
             // 
             // gv_outPart
             // 
@@ -565,7 +289,7 @@
             this.gv_outPart.OptionsColumn.AllowEdit = false;
             this.gv_outPart.Tag = "query_a.out_part";
             this.gv_outPart.Visible = true;
-            this.gv_outPart.VisibleIndex = 11;
+            this.gv_outPart.VisibleIndex = 12;
             this.gv_outPart.Width = 94;
             // 
             // gv_outDate
@@ -579,18 +303,18 @@
             this.gv_outDate.OptionsColumn.AllowEdit = false;
             this.gv_outDate.Tag = "query_a.out_date";
             this.gv_outDate.Visible = true;
-            this.gv_outDate.VisibleIndex = 6;
+            this.gv_outDate.VisibleIndex = 7;
             this.gv_outDate.Width = 120;
             // 
             // 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(773, 52);
+            this.lb_checkDate.Location = new System.Drawing.Point(778, 52);
             this.lb_checkDate.Name = "lb_checkDate";
-            this.lb_checkDate.Size = new System.Drawing.Size(73, 21);
+            this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
             this.lb_checkDate.TabIndex = 262;
-            this.lb_checkDate.Text = "瀹℃牳鏃ユ湡 ";
+            this.lb_checkDate.Text = "瀹℃牳鏃ユ湡";
             // 
             // txt_checkDate
             // 
@@ -612,18 +336,18 @@
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.check_date";
             this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 9;
+            this.gv_checkDate.VisibleIndex = 10;
             this.gv_checkDate.Width = 120;
             // 
             // 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(790, 20);
+            this.lb_checkUser.Location = new System.Drawing.Point(795, 20);
             this.lb_checkUser.Name = "lb_checkUser";
-            this.lb_checkUser.Size = new System.Drawing.Size(56, 21);
+            this.lb_checkUser.Size = new System.Drawing.Size(51, 21);
             this.lb_checkUser.TabIndex = 258;
-            this.lb_checkUser.Text = "瀹℃牳浜� ";
+            this.lb_checkUser.Text = "瀹℃牳浜�";
             // 
             // txt_checkUser
             // 
@@ -645,36 +369,22 @@
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.check_user";
             this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 8;
+            this.gv_checkUser.VisibleIndex = 9;
             this.gv_checkUser.Width = 94;
-            // 
-            // gv_reason
-            // 
-            this.gv_reason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            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 = 15;
-            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(522, 83);
+            this.lb_remark.Location = new System.Drawing.Point(527, 85);
             this.lb_remark.Name = "lb_remark";
-            this.lb_remark.Size = new System.Drawing.Size(73, 21);
+            this.lb_remark.Size = new System.Drawing.Size(68, 21);
             this.lb_remark.TabIndex = 243;
-            this.lb_remark.Text = "澶囨敞淇℃伅 ";
+            this.lb_remark.Text = "澶囨敞淇℃伅";
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(599, 79);
+            this.txt_remark.Location = new System.Drawing.Point(599, 81);
             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;
@@ -692,18 +402,18 @@
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.remark";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 14;
+            this.gv_remark.VisibleIndex = 15;
             this.gv_remark.Width = 94;
             // 
             // lb_createDate
             // 
             this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_createDate.Appearance.Options.UseFont = true;
-            this.lb_createDate.Location = new System.Drawing.Point(522, 52);
+            this.lb_createDate.Location = new System.Drawing.Point(527, 52);
             this.lb_createDate.Name = "lb_createDate";
-            this.lb_createDate.Size = new System.Drawing.Size(73, 21);
+            this.lb_createDate.Size = new System.Drawing.Size(68, 21);
             this.lb_createDate.TabIndex = 226;
-            this.lb_createDate.Text = "鍒涘缓鏃堕棿 ";
+            this.lb_createDate.Text = "鍒涘缓鏃堕棿";
             // 
             // txt_createDate
             // 
@@ -725,18 +435,18 @@
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.create_date";
             this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 13;
+            this.gv_createDate.VisibleIndex = 14;
             this.gv_createDate.Width = 94;
             // 
             // 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(539, 20);
+            this.lb_createBy.Location = new System.Drawing.Point(544, 20);
             this.lb_createBy.Name = "lb_createBy";
-            this.lb_createBy.Size = new System.Drawing.Size(56, 21);
+            this.lb_createBy.Size = new System.Drawing.Size(51, 21);
             this.lb_createBy.TabIndex = 222;
-            this.lb_createBy.Text = "鍒涘缓浜� ";
+            this.lb_createBy.Text = "鍒涘缓浜�";
             // 
             // txt_createBy
             // 
@@ -758,18 +468,18 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 12;
+            this.gv_createBy.VisibleIndex = 13;
             this.gv_createBy.Width = 94;
             // 
             // lb_status
             // 
             this.lb_status.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_status.Appearance.Options.UseFont = true;
-            this.lb_status.Location = new System.Drawing.Point(807, 86);
+            this.lb_status.Location = new System.Drawing.Point(812, 85);
             this.lb_status.Name = "lb_status";
-            this.lb_status.Size = new System.Drawing.Size(39, 21);
+            this.lb_status.Size = new System.Drawing.Size(34, 21);
             this.lb_status.TabIndex = 219;
-            this.lb_status.Text = "瀹℃牳 ";
+            this.lb_status.Text = "瀹℃牳";
             // 
             // gv_status
             // 
@@ -790,20 +500,20 @@
             // 
             this.lb_taskNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_taskNo.Appearance.Options.UseFont = true;
-            this.lb_taskNo.Location = new System.Drawing.Point(20, 86);
+            this.lb_taskNo.Location = new System.Drawing.Point(20, 85);
             this.lb_taskNo.Name = "lb_taskNo";
-            this.lb_taskNo.Size = new System.Drawing.Size(73, 21);
+            this.lb_taskNo.Size = new System.Drawing.Size(68, 21);
             this.lb_taskNo.TabIndex = 216;
-            this.lb_taskNo.Text = "鐢熶骇璁㈠崟 ";
+            this.lb_taskNo.Text = "鐢熶骇璁㈠崟";
             // 
-            // txt_taskNo
+            // txt_pbillNo
             // 
-            this.txt_taskNo.Location = new System.Drawing.Point(98, 82);
-            this.txt_taskNo.Name = "txt_taskNo";
-            this.txt_taskNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_taskNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_taskNo.Size = new System.Drawing.Size(150, 28);
-            this.txt_taskNo.TabIndex = 216;
+            this.txt_pbillNo.Location = new System.Drawing.Point(89, 81);
+            this.txt_pbillNo.Name = "txt_pbillNo";
+            this.txt_pbillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_pbillNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_pbillNo.Size = new System.Drawing.Size(176, 28);
+            this.txt_pbillNo.TabIndex = 216;
             // 
             // lb_itemOutNo
             // 
@@ -811,17 +521,17 @@
             this.lb_itemOutNo.Appearance.Options.UseFont = true;
             this.lb_itemOutNo.Location = new System.Drawing.Point(20, 20);
             this.lb_itemOutNo.Name = "lb_itemOutNo";
-            this.lb_itemOutNo.Size = new System.Drawing.Size(73, 21);
+            this.lb_itemOutNo.Size = new System.Drawing.Size(68, 21);
             this.lb_itemOutNo.TabIndex = 213;
-            this.lb_itemOutNo.Text = "鍑哄簱鍗曞彿 ";
+            this.lb_itemOutNo.Text = "鍑哄簱鍗曞彿";
             // 
             // txt_itemOutNo
             // 
-            this.txt_itemOutNo.Location = new System.Drawing.Point(98, 16);
+            this.txt_itemOutNo.Location = new System.Drawing.Point(89, 16);
             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(150, 28);
+            this.txt_itemOutNo.Size = new System.Drawing.Size(176, 28);
             this.txt_itemOutNo.TabIndex = 213;
             // 
             // gv_itemOutNo
@@ -879,6 +589,7 @@
             this.gv_pbillNo,
             this.gv_boardItem,
             this.gridColumn1,
+            this.gridColumn2,
             this.gv_outDate,
             this.gv_outType,
             this.gv_checkUser,
@@ -887,8 +598,7 @@
             this.gv_outPart,
             this.gv_createBy,
             this.gv_createDate,
-            this.gv_remark,
-            this.gv_reason});
+            this.gv_remark});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -899,6 +609,7 @@
             // gridColumn1
             // 
             this.gridColumn1.Caption = "浜у搧鍚嶇О";
+            this.gridColumn1.FieldName = "itemName";
             this.gridColumn1.MinWidth = 120;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
@@ -948,10 +659,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 121);
+            this.tabMx.Location = new System.Drawing.Point(0, 115);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 449);
+            this.tabMx.Size = new System.Drawing.Size(1126, 455);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -960,8 +671,8 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.txt_depotId);
             this.panel1.Controls.Add(this.txt_outPart);
-            this.panel1.Controls.Add(this.depot_id);
             this.panel1.Controls.Add(this.txt_status);
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.lbGuid);
@@ -983,36 +694,27 @@
             this.panel1.Controls.Add(this.txt_createBy);
             this.panel1.Controls.Add(this.lb_status);
             this.panel1.Controls.Add(this.lb_taskNo);
-            this.panel1.Controls.Add(this.txt_taskNo);
+            this.panel1.Controls.Add(this.txt_pbillNo);
             this.panel1.Controls.Add(this.lb_itemOutNo);
             this.panel1.Controls.Add(this.txt_itemOutNo);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             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, 121);
+            this.panel1.Size = new System.Drawing.Size(1126, 115);
             this.panel1.TabIndex = 1;
             // 
             // txt_outPart
             // 
             this.txt_outPart.IsReadly = false;
-            this.txt_outPart.Location = new System.Drawing.Point(342, 19);
+            this.txt_outPart.Location = new System.Drawing.Point(342, 16);
             this.txt_outPart.Name = "txt_outPart";
-            this.txt_outPart.Size = new System.Drawing.Size(174, 28);
+            this.txt_outPart.Size = new System.Drawing.Size(184, 28);
             this.txt_outPart.TabIndex = 574;
-            // 
-            // depot_id
-            // 
-            this.depot_id.IsReadly = false;
-            this.depot_id.Location = new System.Drawing.Point(342, 51);
-            this.depot_id.Margin = new System.Windows.Forms.Padding(0);
-            this.depot_id.Name = "depot_id";
-            this.depot_id.Size = new System.Drawing.Size(174, 28);
-            this.depot_id.TabIndex = 573;
             // 
             // txt_status
             // 
-            this.txt_status.Location = new System.Drawing.Point(850, 84);
+            this.txt_status.Location = new System.Drawing.Point(850, 83);
             this.txt_status.Name = "txt_status";
             this.txt_status.Properties.Caption = "";
             this.txt_status.Size = new System.Drawing.Size(44, 24);
@@ -1048,6 +750,328 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "浜у搧瑙勬牸";
+            this.gridColumn2.FieldName = "itemModel";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 6;
+            this.gridColumn2.Width = 94;
+            // 
+            // txt_depotId
+            // 
+            this.txt_depotId.Location = new System.Drawing.Point(342, 48);
+            this.txt_depotId.Name = "txt_depotId";
+            this.txt_depotId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_depotId.Properties.Appearance.Options.UseFont = true;
+            this.txt_depotId.Size = new System.Drawing.Size(184, 28);
+            this.txt_depotId.TabIndex = 575;
+            // 
+            // gcMx1
+            // 
+            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, 423);
+            this.gcMx1.TabIndex = 1;
+            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx1});
+            // 
+            // gvMx1
+            // 
+            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx1guid,
+            this.gvMx1itemNo,
+            this.gvMx1createBy,
+            this.gvMx1createDate,
+            this.gvMx1tlQty,
+            this.gvMx1workNo,
+            this.gvMx1remark,
+            this.gvMx1itemId,
+            this.gridColumn3,
+            this.gridColumn4});
+            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.ShowGroupPanel = false;
+            // 
+            // gvMx1guid
+            // 
+            this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
+            this.gvMx1guid.Caption = "guid ";
+            this.gvMx1guid.FieldName = "guid";
+            this.gvMx1guid.MinWidth = 50;
+            this.gvMx1guid.Name = "gvMx1guid";
+            this.gvMx1guid.Tag = "query_a.guid";
+            this.gvMx1guid.Width = 94;
+            // 
+            // gvMx1itemNo
+            // 
+            this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            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;
+            this.gvMx1itemNo.VisibleIndex = 0;
+            this.gvMx1itemNo.Width = 94;
+            // 
+            // gvMx1createBy
+            // 
+            this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
+            this.gvMx1createBy.Caption = "鐗╂枡鍚嶇О";
+            this.gvMx1createBy.FieldName = "itemName";
+            this.gvMx1createBy.MinWidth = 50;
+            this.gvMx1createBy.Name = "gvMx1createBy";
+            this.gvMx1createBy.Tag = "query_a.create_by";
+            this.gvMx1createBy.Visible = true;
+            this.gvMx1createBy.VisibleIndex = 1;
+            this.gvMx1createBy.Width = 94;
+            // 
+            // gvMx1createDate
+            // 
+            this.gvMx1createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1createDate.AppearanceCell.Options.UseFont = true;
+            this.gvMx1createDate.Caption = "鐗╂枡瑙勬牸";
+            this.gvMx1createDate.FieldName = "itemModel";
+            this.gvMx1createDate.MinWidth = 50;
+            this.gvMx1createDate.Name = "gvMx1createDate";
+            this.gvMx1createDate.Tag = "query_a.create_date";
+            this.gvMx1createDate.Visible = true;
+            this.gvMx1createDate.VisibleIndex = 2;
+            this.gvMx1createDate.Width = 94;
+            // 
+            // gvMx1tlQty
+            // 
+            this.gvMx1tlQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1tlQty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1tlQty.Caption = "宸叉壂鏁伴噺 ";
+            this.gvMx1tlQty.FieldName = "tlQty";
+            this.gvMx1tlQty.MinWidth = 50;
+            this.gvMx1tlQty.Name = "gvMx1tlQty";
+            this.gvMx1tlQty.Tag = "query_a.tl_qty";
+            this.gvMx1tlQty.Visible = true;
+            this.gvMx1tlQty.VisibleIndex = 3;
+            this.gvMx1tlQty.Width = 94;
+            // 
+            // gvMx1workNo
+            // 
+            this.gvMx1workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx1workNo.Caption = "宸ュ崟鍗曞彿";
+            this.gvMx1workNo.FieldName = "workNo";
+            this.gvMx1workNo.MinWidth = 50;
+            this.gvMx1workNo.Name = "gvMx1workNo";
+            this.gvMx1workNo.Tag = "query_a.work_no";
+            this.gvMx1workNo.Visible = true;
+            this.gvMx1workNo.VisibleIndex = 4;
+            this.gvMx1workNo.Width = 94;
+            // 
+            // gvMx1remark
+            // 
+            this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1remark.AppearanceCell.Options.UseFont = true;
+            this.gvMx1remark.Caption = "澶囨敞淇℃伅 ";
+            this.gvMx1remark.FieldName = "remark";
+            this.gvMx1remark.MinWidth = 50;
+            this.gvMx1remark.Name = "gvMx1remark";
+            this.gvMx1remark.Tag = "query_a.remark";
+            this.gvMx1remark.Visible = true;
+            this.gvMx1remark.VisibleIndex = 5;
+            this.gvMx1remark.Width = 94;
+            // 
+            // gvMx1itemId
+            // 
+            this.gvMx1itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
+            this.gvMx1itemId.Caption = "鐗╂枡ID ";
+            this.gvMx1itemId.FieldName = "itemId";
+            this.gvMx1itemId.MinWidth = 50;
+            this.gvMx1itemId.Name = "gvMx1itemId";
+            this.gvMx1itemId.Tag = "query_a.item_id";
+            this.gvMx1itemId.Visible = true;
+            this.gvMx1itemId.VisibleIndex = 6;
+            this.gvMx1itemId.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "寤虹珛鑰�";
+            this.gridColumn3.FieldName = "createBy";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 8;
+            this.gridColumn3.Width = 94;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "寤虹珛鏃堕棿";
+            this.gridColumn4.FieldName = "createDate";
+            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 7;
+            this.gridColumn4.Width = 94;
+            // 
+            // gcMx2
+            // 
+            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, 423);
+            this.gcMx2.TabIndex = 1;
+            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx2});
+            // 
+            // gvMx2
+            // 
+            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx2itemBarcode,
+            this.gvMx2itemNo,
+            this.gvMx2lotNo,
+            this.gridColumn5,
+            this.gvMx2quantity,
+            this.gvMx2depotCode,
+            this.gvMx2depotSectionCode,
+            this.gridColumn6,
+            this.gridColumn7,
+            this.gvMx2remark});
+            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;
+            // 
+            // gvMx2itemBarcode
+            // 
+            this.gvMx2itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
+            this.gvMx2itemBarcode.FieldName = "itemBarcode";
+            this.gvMx2itemBarcode.MinWidth = 50;
+            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
+            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
+            this.gvMx2itemBarcode.Visible = true;
+            this.gvMx2itemBarcode.VisibleIndex = 0;
+            this.gvMx2itemBarcode.Width = 94;
+            // 
+            // gvMx2itemNo
+            // 
+            this.gvMx2itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
+            this.gvMx2itemNo.FieldName = "itemNo";
+            this.gvMx2itemNo.MinWidth = 50;
+            this.gvMx2itemNo.Name = "gvMx2itemNo";
+            this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
+            this.gvMx2itemNo.Visible = true;
+            this.gvMx2itemNo.VisibleIndex = 1;
+            this.gvMx2itemNo.Width = 94;
+            // 
+            // gvMx2lotNo
+            // 
+            this.gvMx2lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2lotNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx2lotNo.Caption = "鐗╂枡鍚嶇О";
+            this.gvMx2lotNo.FieldName = "itemName";
+            this.gvMx2lotNo.MinWidth = 50;
+            this.gvMx2lotNo.Name = "gvMx2lotNo";
+            this.gvMx2lotNo.Tag = "query_a.LOT_NO";
+            this.gvMx2lotNo.Visible = true;
+            this.gvMx2lotNo.VisibleIndex = 2;
+            this.gvMx2lotNo.Width = 94;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn5.FieldName = "itemModel";
+            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 3;
+            this.gridColumn5.Width = 94;
+            // 
+            // gvMx2quantity
+            // 
+            this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2quantity.AppearanceCell.Options.UseFont = 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;
+            this.gvMx2quantity.VisibleIndex = 4;
+            this.gvMx2quantity.Width = 94;
+            // 
+            // gvMx2depotCode
+            // 
+            this.gvMx2depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2depotCode.AppearanceCell.Options.UseFont = true;
+            this.gvMx2depotCode.Caption = "浠撳簱缂栫爜 ";
+            this.gvMx2depotCode.FieldName = "depotCode";
+            this.gvMx2depotCode.MinWidth = 50;
+            this.gvMx2depotCode.Name = "gvMx2depotCode";
+            this.gvMx2depotCode.Tag = "query_a.DEPOT_CODE";
+            this.gvMx2depotCode.Visible = true;
+            this.gvMx2depotCode.VisibleIndex = 5;
+            this.gvMx2depotCode.Width = 94;
+            // 
+            // gvMx2depotSectionCode
+            // 
+            this.gvMx2depotSectionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2depotSectionCode.AppearanceCell.Options.UseFont = true;
+            this.gvMx2depotSectionCode.Caption = "璐т綅缂栫爜 ";
+            this.gvMx2depotSectionCode.FieldName = "depotSectionCode";
+            this.gvMx2depotSectionCode.MinWidth = 50;
+            this.gvMx2depotSectionCode.Name = "gvMx2depotSectionCode";
+            this.gvMx2depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
+            this.gvMx2depotSectionCode.Visible = true;
+            this.gvMx2depotSectionCode.VisibleIndex = 6;
+            this.gvMx2depotSectionCode.Width = 94;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "寤虹珛鑰�";
+            this.gridColumn6.FieldName = "createBy";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 7;
+            this.gridColumn6.Width = 94;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "寤虹珛鏃堕棿";
+            this.gridColumn7.FieldName = "createDate";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 8;
+            this.gridColumn7.Width = 94;
+            // 
+            // gvMx2remark
+            // 
+            this.gvMx2remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2remark.AppearanceCell.Options.UseFont = true;
+            this.gvMx2remark.Caption = "澶囨敞 ";
+            this.gvMx2remark.FieldName = "remark";
+            this.gvMx2remark.MinWidth = 50;
+            this.gvMx2remark.Name = "gvMx2remark";
+            this.gvMx2remark.Tag = "query_a.REMARK";
+            this.gvMx2remark.Visible = true;
+            this.gvMx2remark.VisibleIndex = 9;
+            this.gvMx2remark.Width = 94;
+            // 
             // Frm_WwLlDj
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1059,11 +1083,7 @@
             this.Name = "Frm_WwLlDj";
             this.Text = "棰嗘枡鍗�";
             this.tabMxPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             this.tabMxPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
@@ -1071,7 +1091,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -1085,6 +1105,11 @@
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).EndInit();
+            ((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.ResumeLayout(false);
 
         }
@@ -1100,29 +1125,8 @@
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.LabelControl labelControl11;
         private DevExpress.XtraTab.XtraTabControl tabMx;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotSectionCode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotCode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2lotNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
         private DevExpress.XtraTab.XtraTabPage tabMxPage2;
-        private DevExpress.XtraGrid.GridControl gcMx2;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1tlQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1rkQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1workNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
-        private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
         private DevExpress.XtraEditors.LabelControl lb_depotId;
         private DevExpress.XtraGrid.Columns.GridColumn gv_pbillNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_boardItem;
@@ -1147,7 +1151,6 @@
         private DevExpress.XtraEditors.LabelControl lb_checkUser;
         private DevExpress.XtraEditors.TextEdit txt_checkUser;
         private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_reason;
 
         private DevExpress.XtraEditors.LabelControl lb_remark;
         private DevExpress.XtraEditors.TextEdit txt_remark;
@@ -1165,15 +1168,40 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_status;
 
         private DevExpress.XtraEditors.LabelControl lb_taskNo;
-        private DevExpress.XtraEditors.TextEdit txt_taskNo;
+        private DevExpress.XtraEditors.TextEdit txt_pbillNo;
 
         private DevExpress.XtraEditors.LabelControl lb_itemOutNo;
         private DevExpress.XtraEditors.TextEdit txt_itemOutNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_itemOutNo;
         private DevExpress.XtraEditors.CheckEdit txt_status;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private UserControl.UcLookCk depot_id;
         private UserControl.UcLookDepartment txt_outPart;
         private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraEditors.TextEdit txt_depotId;
+        private DevExpress.XtraGrid.GridControl gcMx1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1tlQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1workNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.GridControl gcMx2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2lotNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotSectionCode;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3