lu
2025-10-08 c574826b484ef643083d6726d1302847204a68d8
Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
已修改3个文件
460 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs 400 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
@@ -5,7 +5,9 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Data;
using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -21,6 +23,7 @@
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
            toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
            {
@@ -250,5 +253,61 @@
                                               + "}";
            this.toolBarMenu1.guidKey = null;
        }
        /// <summary>
        /// 导出
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnOutClick(object sender, EventArgs e)
        {
            using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
            {
                folderBrowserDialog.Description = "选择导出文件的保存路径";
                DialogResult dialogResult = folderBrowserDialog.ShowDialog();
                if (dialogResult == DialogResult.OK)
                {
                    string _folder = folderBrowserDialog.SelectedPath;
                    System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
                    _sbSqlWhere.Append(" and wl.FSubsidiary in");
                    _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
                    _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
                    var _params = new
                    {
                        inQueryWhere = _sbSqlWhere.ToString(),//主建
                        inFid = "",
                        inP1 = "",
                        inP2 = "",
                        inP3 = "",
                        inP4 = ""
                    };
                    var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOut_cktm", "", "", "", _params);
                    try
                    {
                        string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
                        ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                        if (_rtn.rtnCode > 0)
                        {
                            string _file = _rtn.rtnData.fileUrl.ToString();
                            string _folderName = _folder + "\\" + _file.Replace("down/", "");
                            string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
                            using (WebClient client = new WebClient())
                            {
                                client.DownloadFile(_url, _folderName);
                            }
                            ToolBox.MsgHelper.ShowInformation("导出成功!");
                        }
                        else
                        {
                            ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                        }
                    }
                    catch (Exception ex)
                    {
                        ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                    }
                }
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
@@ -29,18 +29,18 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -59,6 +59,7 @@
            this.gv_bl009 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_wcUser = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_wcTime = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -116,7 +117,7 @@
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -175,10 +176,10 @@
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4);
            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1281, 80);
            this.toolBarMenu1.Size = new System.Drawing.Size(1601, 98);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
@@ -186,10 +187,11 @@
            // xtraTabControl1
            // 
            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(1281, 602);
            this.xtraTabControl1.Size = new System.Drawing.Size(1601, 736);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
@@ -198,8 +200,9 @@
            // xtraTabPage1
            // 
            this.xtraTabPage1.Controls.Add(this.split1);
            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1279, 570);
            this.xtraTabPage1.Size = new System.Drawing.Size(1599, 698);
            this.xtraTabPage1.Text = "数据列表";
            // 
            // split1
@@ -208,6 +211,7 @@
            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
            this.split1.Horizontal = false;
            this.split1.Location = new System.Drawing.Point(0, 0);
            this.split1.Margin = new System.Windows.Forms.Padding(4);
            this.split1.Name = "split1";
            // 
            // split1.Panel1
@@ -220,17 +224,19 @@
            // 
            this.split1.Panel2.Text = "Panel2";
            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Size = new System.Drawing.Size(1279, 570);
            this.split1.Size = new System.Drawing.Size(1599, 698);
            this.split1.SplitterPosition = 0;
            this.split1.TabIndex = 0;
            // 
            // gcMain1
            // 
            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1279, 519);
            this.gcMain1.Size = new System.Drawing.Size(1599, 635);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -240,7 +246,7 @@
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.ColumnPanelRowHeight = 61;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_id,
            this.gv_bl018,
@@ -255,8 +261,9 @@
            this.gv_wcUser,
            this.gv_wcTime,
            this.gridColumn10});
            this.gridView1.DetailHeight = 428;
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.IndicatorWidth = 62;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -267,176 +274,187 @@
            this.gv_id.AppearanceCell.Options.UseFont = true;
            this.gv_id.Caption = "主键GUID";
            this.gv_id.FieldName = "guid";
            this.gv_id.MinWidth = 50;
            this.gv_id.MinWidth = 62;
            this.gv_id.Name = "gv_id";
            this.gv_id.OptionsColumn.AllowEdit = false;
            this.gv_id.Tag = "query_a.id";
            this.gv_id.Width = 94;
            this.gv_id.Width = 117;
            // 
            // gv_bl018
            // 
            this.gv_bl018.AppearanceCell.Options.UseFont = true;
            this.gv_bl018.Caption = "审核状态 ";
            this.gv_bl018.FieldName = "bl018";
            this.gv_bl018.MaxWidth = 50;
            this.gv_bl018.MinWidth = 50;
            this.gv_bl018.MaxWidth = 62;
            this.gv_bl018.MinWidth = 62;
            this.gv_bl018.Name = "gv_bl018";
            this.gv_bl018.OptionsColumn.AllowEdit = false;
            this.gv_bl018.Tag = "query_a.bl018";
            this.gv_bl018.UnboundDataType = typeof(bool);
            this.gv_bl018.Visible = true;
            this.gv_bl018.VisibleIndex = 0;
            this.gv_bl018.Width = 50;
            this.gv_bl018.Width = 62;
            // 
            // gv_bl019
            // 
            this.gv_bl019.AppearanceCell.Options.UseFont = true;
            this.gv_bl019.Caption = "完结标识 ";
            this.gv_bl019.FieldName = "txtColor";
            this.gv_bl019.MaxWidth = 50;
            this.gv_bl019.MinWidth = 50;
            this.gv_bl019.MaxWidth = 62;
            this.gv_bl019.MinWidth = 62;
            this.gv_bl019.Name = "gv_bl019";
            this.gv_bl019.OptionsColumn.AllowEdit = false;
            this.gv_bl019.Tag = "query_a.bl019";
            this.gv_bl019.UnboundDataType = typeof(bool);
            this.gv_bl019.Visible = true;
            this.gv_bl019.VisibleIndex = 1;
            this.gv_bl019.Width = 50;
            this.gv_bl019.Width = 62;
            // 
            // gv_blNo
            // 
            this.gv_blNo.AppearanceCell.Options.UseFont = true;
            this.gv_blNo.Caption = "补料单号 ";
            this.gv_blNo.FieldName = "blNo";
            this.gv_blNo.MinWidth = 100;
            this.gv_blNo.MinWidth = 125;
            this.gv_blNo.Name = "gv_blNo";
            this.gv_blNo.OptionsColumn.AllowEdit = false;
            this.gv_blNo.Tag = "query_a.bl_no";
            this.gv_blNo.Visible = true;
            this.gv_blNo.VisibleIndex = 2;
            this.gv_blNo.Width = 100;
            this.gv_blNo.Width = 125;
            // 
            // gv_bl004
            // 
            this.gv_bl004.AppearanceCell.Options.UseFont = true;
            this.gv_bl004.Caption = "申请人 ";
            this.gv_bl004.FieldName = "bl004";
            this.gv_bl004.MinWidth = 50;
            this.gv_bl004.MinWidth = 62;
            this.gv_bl004.Name = "gv_bl004";
            this.gv_bl004.OptionsColumn.AllowEdit = false;
            this.gv_bl004.Tag = "query_a.bl004";
            this.gv_bl004.Visible = true;
            this.gv_bl004.VisibleIndex = 3;
            this.gv_bl004.Width = 94;
            this.gv_bl004.Width = 117;
            // 
            // gv_bl005
            // 
            this.gv_bl005.AppearanceCell.Options.UseFont = true;
            this.gv_bl005.Caption = "申请日期 ";
            this.gv_bl005.FieldName = "bl005";
            this.gv_bl005.MinWidth = 50;
            this.gv_bl005.MinWidth = 62;
            this.gv_bl005.Name = "gv_bl005";
            this.gv_bl005.OptionsColumn.AllowEdit = false;
            this.gv_bl005.Tag = "query_a.bl005";
            this.gv_bl005.Visible = true;
            this.gv_bl005.VisibleIndex = 4;
            this.gv_bl005.Width = 94;
            this.gv_bl005.Width = 117;
            // 
            // gv_bl016
            // 
            this.gv_bl016.AppearanceCell.Options.UseFont = true;
            this.gv_bl016.Caption = "审核人 ";
            this.gv_bl016.FieldName = "bl016";
            this.gv_bl016.MinWidth = 50;
            this.gv_bl016.MinWidth = 62;
            this.gv_bl016.Name = "gv_bl016";
            this.gv_bl016.OptionsColumn.AllowEdit = false;
            this.gv_bl016.Tag = "query_a.bl016";
            this.gv_bl016.Visible = true;
            this.gv_bl016.VisibleIndex = 8;
            this.gv_bl016.Width = 94;
            this.gv_bl016.Width = 117;
            // 
            // gv_bl006
            // 
            this.gv_bl006.AppearanceCell.Options.UseFont = true;
            this.gv_bl006.Caption = "审核日期 ";
            this.gv_bl006.FieldName = "bl006";
            this.gv_bl006.MinWidth = 50;
            this.gv_bl006.MinWidth = 62;
            this.gv_bl006.Name = "gv_bl006";
            this.gv_bl006.OptionsColumn.AllowEdit = false;
            this.gv_bl006.Tag = "query_a.bl006";
            this.gv_bl006.Visible = true;
            this.gv_bl006.VisibleIndex = 5;
            this.gv_bl006.Width = 94;
            this.gv_bl006.Width = 117;
            // 
            // gv_bl007
            // 
            this.gv_bl007.AppearanceCell.Options.UseFont = true;
            this.gv_bl007.Caption = "单据备注 ";
            this.gv_bl007.FieldName = "bl007";
            this.gv_bl007.MinWidth = 50;
            this.gv_bl007.MinWidth = 62;
            this.gv_bl007.Name = "gv_bl007";
            this.gv_bl007.OptionsColumn.AllowEdit = false;
            this.gv_bl007.Tag = "query_a.bl007";
            this.gv_bl007.Visible = true;
            this.gv_bl007.VisibleIndex = 6;
            this.gv_bl007.Width = 94;
            this.gv_bl007.Width = 117;
            // 
            // gv_bl009
            // 
            this.gv_bl009.AppearanceCell.Options.UseFont = true;
            this.gv_bl009.Caption = "业务类型 ";
            this.gv_bl009.FieldName = "bl009";
            this.gv_bl009.MinWidth = 50;
            this.gv_bl009.MinWidth = 62;
            this.gv_bl009.Name = "gv_bl009";
            this.gv_bl009.OptionsColumn.AllowEdit = false;
            this.gv_bl009.Tag = "query_a.bl009";
            this.gv_bl009.Visible = true;
            this.gv_bl009.VisibleIndex = 7;
            this.gv_bl009.Width = 94;
            this.gv_bl009.Width = 117;
            // 
            // gv_wcUser
            // 
            this.gv_wcUser.AppearanceCell.Options.UseFont = true;
            this.gv_wcUser.Caption = "完成人 ";
            this.gv_wcUser.FieldName = "wcUser";
            this.gv_wcUser.MinWidth = 50;
            this.gv_wcUser.MinWidth = 62;
            this.gv_wcUser.Name = "gv_wcUser";
            this.gv_wcUser.OptionsColumn.AllowEdit = false;
            this.gv_wcUser.Tag = "query_a.wc_user";
            this.gv_wcUser.Visible = true;
            this.gv_wcUser.VisibleIndex = 9;
            this.gv_wcUser.Width = 94;
            this.gv_wcUser.Width = 117;
            // 
            // gv_wcTime
            // 
            this.gv_wcTime.AppearanceCell.Options.UseFont = true;
            this.gv_wcTime.Caption = "完成时间 ";
            this.gv_wcTime.FieldName = "wcTime";
            this.gv_wcTime.MinWidth = 50;
            this.gv_wcTime.MinWidth = 62;
            this.gv_wcTime.Name = "gv_wcTime";
            this.gv_wcTime.OptionsColumn.AllowEdit = false;
            this.gv_wcTime.Tag = "query_a.wc_time";
            this.gv_wcTime.Visible = true;
            this.gv_wcTime.VisibleIndex = 10;
            this.gv_wcTime.Width = 94;
            this.gv_wcTime.Width = 117;
            //
            // gridColumn10
            //
            this.gridColumn10.Caption = "货主组织";
            this.gridColumn10.FieldName = "stockownerName";
            this.gridColumn10.MinWidth = 31;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 11;
            this.gridColumn10.Width = 117;
            // 
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 519);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Location = new System.Drawing.Point(0, 635);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1279, 39);
            this.pageBar1.Size = new System.Drawing.Size(1599, 48);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
            // xtraTabPage2
            // 
            this.xtraTabPage2.Controls.Add(this.splitMx1);
            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(1279, 570);
            this.xtraTabPage2.Size = new System.Drawing.Size(1599, 698);
            this.xtraTabPage2.Text = "数据详细";
            // 
            // splitMx1
@@ -444,6 +462,7 @@
            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitMx1.Horizontal = false;
            this.splitMx1.Location = new System.Drawing.Point(0, 0);
            this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
            this.splitMx1.Name = "splitMx1";
            // 
            // splitMx1.Panel1
@@ -456,8 +475,8 @@
            this.splitMx1.Panel2.Controls.Add(this.tabMx);
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1279, 570);
            this.splitMx1.SplitterPosition = 113;
            this.splitMx1.Size = new System.Drawing.Size(1599, 698);
            this.splitMx1.SplitterPosition = 138;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
@@ -476,77 +495,85 @@
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem16});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(663, 385, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1279, 113);
            this.layoutMx1.Size = new System.Drawing.Size(1599, 138);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
            // lbGuid
            // 
            this.lbGuid.Location = new System.Drawing.Point(825, 108);
            this.lbGuid.Location = new System.Drawing.Point(1031, 132);
            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(268, 28);
            this.lbGuid.Size = new System.Drawing.Size(335, 34);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Text = "lbGuid";
            this.lbGuid.Visible = false;
            // 
            // txt_bl007
            // 
            this.txt_bl007.Location = new System.Drawing.Point(84, 43);
            this.txt_bl007.Location = new System.Drawing.Point(96, 51);
            this.txt_bl007.Margin = new System.Windows.Forms.Padding(4);
            this.txt_bl007.Name = "txt_bl007";
            this.txt_bl007.Properties.Appearance.Options.UseFont = true;
            this.txt_bl007.Size = new System.Drawing.Size(238, 24);
            this.txt_bl007.Size = new System.Drawing.Size(306, 28);
            this.txt_bl007.StyleController = this.layoutMx1;
            this.txt_bl007.TabIndex = 228;
            // 
            // txt_blNo
            // 
            this.txt_blNo.Location = new System.Drawing.Point(84, 12);
            this.txt_blNo.Location = new System.Drawing.Point(96, 12);
            this.txt_blNo.Margin = new System.Windows.Forms.Padding(4);
            this.txt_blNo.Name = "txt_blNo";
            this.txt_blNo.Properties.Appearance.Options.UseFont = true;
            this.txt_blNo.Properties.Tag = "readOnly";
            this.txt_blNo.Size = new System.Drawing.Size(238, 24);
            this.txt_blNo.Size = new System.Drawing.Size(306, 28);
            this.txt_blNo.StyleController = this.layoutMx1;
            this.txt_blNo.TabIndex = 211;
            this.txt_blNo.Tag = "readonly";
            // 
            // txt_bl006
            // 
            this.txt_bl006.Location = new System.Drawing.Point(1028, 43);
            this.txt_bl006.Location = new System.Drawing.Point(1280, 51);
            this.txt_bl006.Margin = new System.Windows.Forms.Padding(4);
            this.txt_bl006.Name = "txt_bl006";
            this.txt_bl006.Properties.Appearance.Options.UseFont = true;
            this.txt_bl006.Size = new System.Drawing.Size(239, 24);
            this.txt_bl006.Size = new System.Drawing.Size(307, 28);
            this.txt_bl006.StyleController = this.layoutMx1;
            this.txt_bl006.TabIndex = 226;
            this.txt_bl006.Tag = "readonly";
            // 
            // txt_bl016
            // 
            this.txt_bl016.Location = new System.Drawing.Point(1028, 12);
            this.txt_bl016.Location = new System.Drawing.Point(1280, 12);
            this.txt_bl016.Margin = new System.Windows.Forms.Padding(4);
            this.txt_bl016.Name = "txt_bl016";
            this.txt_bl016.Properties.Appearance.Options.UseFont = true;
            this.txt_bl016.Size = new System.Drawing.Size(239, 24);
            this.txt_bl016.Size = new System.Drawing.Size(307, 28);
            this.txt_bl016.StyleController = this.layoutMx1;
            this.txt_bl016.TabIndex = 267;
            this.txt_bl016.Tag = "readonly";
            // 
            // txt_bl018
            // 
            this.txt_bl018.Location = new System.Drawing.Point(956, 74);
            this.txt_bl018.Location = new System.Drawing.Point(1196, 90);
            this.txt_bl018.Margin = new System.Windows.Forms.Padding(4);
            this.txt_bl018.Name = "txt_bl018";
            this.txt_bl018.Properties.Caption = "审核状态";
            this.txt_bl018.Size = new System.Drawing.Size(311, 24);
            this.txt_bl018.Size = new System.Drawing.Size(391, 27);
            this.txt_bl018.StyleController = this.layoutMx1;
            this.txt_bl018.TabIndex = 295;
            // 
            // txt_bl017
            // 
            this.txt_bl017.Enabled = false;
            this.txt_bl017.Location = new System.Drawing.Point(398, 12);
            this.txt_bl017.Location = new System.Drawing.Point(490, 12);
            this.txt_bl017.Margin = new System.Windows.Forms.Padding(4);
            this.txt_bl017.Name = "txt_bl017";
            this.txt_bl017.Size = new System.Drawing.Size(239, 24);
            this.txt_bl017.Size = new System.Drawing.Size(307, 28);
            this.txt_bl017.StyleController = this.layoutMx1;
            this.txt_bl017.TabIndex = 296;
            this.txt_bl017.Tag = "readonly";
@@ -554,27 +581,30 @@
            // btnSelect
            // 
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(12, 74);
            this.btnSelect.Location = new System.Drawing.Point(12, 90);
            this.btnSelect.Margin = new System.Windows.Forms.Padding(4);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(116, 27);
            this.btnSelect.Size = new System.Drawing.Size(146, 34);
            this.btnSelect.StyleController = this.layoutMx1;
            this.btnSelect.TabIndex = 444;
            this.btnSelect.Text = "选择物料 ";
            // 
            // textEdit1
            // 
            this.textEdit1.Location = new System.Drawing.Point(713, 12);
            this.textEdit1.Location = new System.Drawing.Point(885, 12);
            this.textEdit1.Margin = new System.Windows.Forms.Padding(4);
            this.textEdit1.Name = "textEdit1";
            this.textEdit1.Size = new System.Drawing.Size(239, 24);
            this.textEdit1.Size = new System.Drawing.Size(307, 28);
            this.textEdit1.StyleController = this.layoutMx1;
            this.textEdit1.TabIndex = 445;
            this.textEdit1.Tag = "readonly";
            // 
            // textEdit2
            // 
            this.textEdit2.Location = new System.Drawing.Point(713, 43);
            this.textEdit2.Location = new System.Drawing.Point(885, 51);
            this.textEdit2.Margin = new System.Windows.Forms.Padding(4);
            this.textEdit2.Name = "textEdit2";
            this.textEdit2.Size = new System.Drawing.Size(239, 24);
            this.textEdit2.Size = new System.Drawing.Size(307, 28);
            this.textEdit2.StyleController = this.layoutMx1;
            this.textEdit2.TabIndex = 446;
            this.textEdit2.Tag = "readonly";
@@ -607,30 +637,30 @@
            this.layoutControlItem5});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition9.Width = 100D;
            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition10.Width = 100D;
            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition11.Width = 100D;
            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition12.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition9,
            columnDefinition10,
            columnDefinition11,
            columnDefinition12});
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3});
            this.Root.Size = new System.Drawing.Size(1279, 113);
            rowDefinition7,
            rowDefinition8,
            rowDefinition9});
            this.Root.Size = new System.Drawing.Size(1599, 138);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -638,29 +668,29 @@
            this.layoutControlItem1.Control = this.txt_blNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(314, 31);
            this.layoutControlItem1.Size = new System.Drawing.Size(394, 39);
            this.layoutControlItem1.Text = "申请单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_bl017;
            this.layoutControlItem8.Location = new System.Drawing.Point(314, 0);
            this.layoutControlItem8.Location = new System.Drawing.Point(394, 0);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(315, 31);
            this.layoutControlItem8.Size = new System.Drawing.Size(395, 39);
            this.layoutControlItem8.Text = "单据类型";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.btnSelect;
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem13.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem13.MinSize = new System.Drawing.Size(95, 31);
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 78);
            this.layoutControlItem13.MaxSize = new System.Drawing.Size(150, 38);
            this.layoutControlItem13.MinSize = new System.Drawing.Size(119, 38);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem13.Size = new System.Drawing.Size(314, 31);
            this.layoutControlItem13.Size = new System.Drawing.Size(394, 40);
            this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem13.Text = "选择物料";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
@@ -669,21 +699,21 @@
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_bl007;
            this.layoutControlItem14.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem14.Location = new System.Drawing.Point(0, 39);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem14.Size = new System.Drawing.Size(314, 31);
            this.layoutControlItem14.Size = new System.Drawing.Size(394, 39);
            this.layoutControlItem14.Text = "单据备注";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_bl018;
            this.layoutControlItem15.Location = new System.Drawing.Point(944, 62);
            this.layoutControlItem15.Location = new System.Drawing.Point(1184, 78);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem15.Size = new System.Drawing.Size(315, 31);
            this.layoutControlItem15.Size = new System.Drawing.Size(395, 40);
            this.layoutControlItem15.Text = "审核状态";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem15.TextVisible = false;
@@ -691,52 +721,53 @@
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_bl006;
            this.layoutControlItem3.Location = new System.Drawing.Point(944, 31);
            this.layoutControlItem3.Location = new System.Drawing.Point(1184, 39);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(315, 31);
            this.layoutControlItem3.Size = new System.Drawing.Size(395, 39);
            this.layoutControlItem3.Text = "审核日期";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_bl016;
            this.layoutControlItem4.Location = new System.Drawing.Point(944, 0);
            this.layoutControlItem4.Location = new System.Drawing.Point(1184, 0);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem4.Size = new System.Drawing.Size(315, 31);
            this.layoutControlItem4.Size = new System.Drawing.Size(395, 39);
            this.layoutControlItem4.Text = "审核人员";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.textEdit1;
            this.layoutControlItem2.Location = new System.Drawing.Point(629, 0);
            this.layoutControlItem2.Location = new System.Drawing.Point(789, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem2.Size = new System.Drawing.Size(315, 31);
            this.layoutControlItem2.Size = new System.Drawing.Size(395, 39);
            this.layoutControlItem2.Text = "制单人员";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.textEdit2;
            this.layoutControlItem5.Location = new System.Drawing.Point(629, 31);
            this.layoutControlItem5.Location = new System.Drawing.Point(789, 39);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(315, 31);
            this.layoutControlItem5.Size = new System.Drawing.Size(395, 39);
            this.layoutControlItem5.Text = "制单时间";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
            // 
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Margin = new System.Windows.Forms.Padding(4);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1279, 445);
            this.tabMx.Size = new System.Drawing.Size(1599, 545);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -744,20 +775,23 @@
            // tabMxPage1
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1277, 413);
            this.tabMxPage1.Size = new System.Drawing.Size(1597, 507);
            this.tabMxPage1.Text = "申请明细";
            // 
            // gcMx1
            // 
            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemSearchLookUpEdit1,
            this.repositoryItemButtonEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1277, 413);
            this.gcMx1.Size = new System.Drawing.Size(1597, 507);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -779,7 +813,9 @@
            this.gvMx1bld014,
            this.dabGuid,
            this.gvMxDel,
            this.gridColumn9});
            this.gridColumn9,
            this.gridColumn11});
            this.gvMx1.DetailHeight = 428;
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -791,85 +827,85 @@
            this.gvMx1id.AppearanceCell.Options.UseFont = true;
            this.gvMx1id.Caption = "ID ";
            this.gvMx1id.FieldName = "guid";
            this.gvMx1id.MinWidth = 50;
            this.gvMx1id.MinWidth = 62;
            this.gvMx1id.Name = "gvMx1id";
            this.gvMx1id.OptionsColumn.ReadOnly = true;
            this.gvMx1id.Tag = "query_a.id";
            this.gvMx1id.Width = 94;
            this.gvMx1id.Width = 117;
            // 
            // gvMx1mid
            // 
            this.gvMx1mid.AppearanceCell.Options.UseFont = true;
            this.gvMx1mid.Caption = "MID ";
            this.gvMx1mid.FieldName = "mid";
            this.gvMx1mid.MinWidth = 50;
            this.gvMx1mid.MinWidth = 62;
            this.gvMx1mid.Name = "gvMx1mid";
            this.gvMx1mid.OptionsColumn.ReadOnly = true;
            this.gvMx1mid.Tag = "query_a.mid";
            this.gvMx1mid.Width = 94;
            this.gvMx1mid.Width = 117;
            // 
            // gvMx1bld001
            // 
            this.gvMx1bld001.AppearanceCell.Options.UseFont = true;
            this.gvMx1bld001.Caption = "工单号 ";
            this.gvMx1bld001.FieldName = "bld001";
            this.gvMx1bld001.MinWidth = 50;
            this.gvMx1bld001.MinWidth = 62;
            this.gvMx1bld001.Name = "gvMx1bld001";
            this.gvMx1bld001.OptionsColumn.ReadOnly = true;
            this.gvMx1bld001.Tag = "query_a.bld001";
            this.gvMx1bld001.Visible = true;
            this.gvMx1bld001.VisibleIndex = 0;
            this.gvMx1bld001.Width = 94;
            this.gvMx1bld001.Width = 117;
            // 
            // gvMx1bld002
            // 
            this.gvMx1bld002.AppearanceCell.Options.UseFont = true;
            this.gvMx1bld002.Caption = "物料编号 ";
            this.gvMx1bld002.FieldName = "bld002";
            this.gvMx1bld002.MinWidth = 100;
            this.gvMx1bld002.MinWidth = 125;
            this.gvMx1bld002.Name = "gvMx1bld002";
            this.gvMx1bld002.OptionsColumn.ReadOnly = true;
            this.gvMx1bld002.Tag = "query_a.bld002";
            this.gvMx1bld002.Visible = true;
            this.gvMx1bld002.VisibleIndex = 1;
            this.gvMx1bld002.Width = 100;
            this.gvMx1bld002.Width = 125;
            // 
            // gvMx1bld003
            // 
            this.gvMx1bld003.AppearanceCell.Options.UseFont = true;
            this.gvMx1bld003.Caption = "物料名称 ";
            this.gvMx1bld003.FieldName = "bld003";
            this.gvMx1bld003.MinWidth = 120;
            this.gvMx1bld003.MinWidth = 150;
            this.gvMx1bld003.Name = "gvMx1bld003";
            this.gvMx1bld003.OptionsColumn.ReadOnly = true;
            this.gvMx1bld003.Tag = "query_a.bld003";
            this.gvMx1bld003.Visible = true;
            this.gvMx1bld003.VisibleIndex = 2;
            this.gvMx1bld003.Width = 120;
            this.gvMx1bld003.Width = 150;
            // 
            // gvMx1bld004
            // 
            this.gvMx1bld004.AppearanceCell.Options.UseFont = true;
            this.gvMx1bld004.Caption = "规格型号 ";
            this.gvMx1bld004.FieldName = "bld004";
            this.gvMx1bld004.MinWidth = 120;
            this.gvMx1bld004.MinWidth = 150;
            this.gvMx1bld004.Name = "gvMx1bld004";
            this.gvMx1bld004.OptionsColumn.ReadOnly = true;
            this.gvMx1bld004.Tag = "query_a.bld004";
            this.gvMx1bld004.Visible = true;
            this.gvMx1bld004.VisibleIndex = 3;
            this.gvMx1bld004.Width = 120;
            this.gvMx1bld004.Width = 150;
            // 
            // gvMx1bld006
            // 
            this.gvMx1bld006.AppearanceCell.Options.UseFont = true;
            this.gvMx1bld006.Caption = "计划数量 ";
            this.gvMx1bld006.FieldName = "bld006";
            this.gvMx1bld006.MinWidth = 80;
            this.gvMx1bld006.MinWidth = 100;
            this.gvMx1bld006.Name = "gvMx1bld006";
            this.gvMx1bld006.OptionsColumn.ReadOnly = true;
            this.gvMx1bld006.Tag = "query_a.bld006";
            this.gvMx1bld006.Width = 94;
            this.gvMx1bld006.Width = 117;
            // 
            // gvMx1bld007
            // 
@@ -880,38 +916,38 @@
            this.gvMx1bld007.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx1bld007.Caption = "申请数量 ";
            this.gvMx1bld007.FieldName = "bld007";
            this.gvMx1bld007.MinWidth = 80;
            this.gvMx1bld007.MinWidth = 100;
            this.gvMx1bld007.Name = "gvMx1bld007";
            this.gvMx1bld007.Tag = "yz_quantity_0_edit";
            this.gvMx1bld007.Visible = true;
            this.gvMx1bld007.VisibleIndex = 4;
            this.gvMx1bld007.Width = 94;
            this.gvMx1bld007.Width = 117;
            // 
            // gvMx1bld008
            // 
            this.gvMx1bld008.AppearanceCell.Options.UseFont = true;
            this.gvMx1bld008.Caption = "已领数量 ";
            this.gvMx1bld008.FieldName = "bld008";
            this.gvMx1bld008.MinWidth = 80;
            this.gvMx1bld008.MinWidth = 100;
            this.gvMx1bld008.Name = "gvMx1bld008";
            this.gvMx1bld008.OptionsColumn.ReadOnly = true;
            this.gvMx1bld008.Tag = "query_a.bld008";
            this.gvMx1bld008.Visible = true;
            this.gvMx1bld008.VisibleIndex = 5;
            this.gvMx1bld008.Width = 94;
            this.gvMx1bld008.Width = 117;
            // 
            // gvMx1bld009
            // 
            this.gvMx1bld009.AppearanceCell.Options.UseFont = true;
            this.gvMx1bld009.Caption = "单位 ";
            this.gvMx1bld009.FieldName = "bld009";
            this.gvMx1bld009.MinWidth = 50;
            this.gvMx1bld009.MinWidth = 62;
            this.gvMx1bld009.Name = "gvMx1bld009";
            this.gvMx1bld009.OptionsColumn.ReadOnly = true;
            this.gvMx1bld009.Tag = "query_a.bld009";
            this.gvMx1bld009.Visible = true;
            this.gvMx1bld009.VisibleIndex = 6;
            this.gvMx1bld009.Width = 94;
            this.gvMx1bld009.Width = 117;
            // 
            // gvMx1bld010
            // 
@@ -922,48 +958,48 @@
            this.gvMx1bld010.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx1bld010.Caption = "备注 ";
            this.gvMx1bld010.FieldName = "bld010";
            this.gvMx1bld010.MinWidth = 150;
            this.gvMx1bld010.MinWidth = 187;
            this.gvMx1bld010.Name = "gvMx1bld010";
            this.gvMx1bld010.Tag = "edit";
            this.gvMx1bld010.Visible = true;
            this.gvMx1bld010.VisibleIndex = 7;
            this.gvMx1bld010.Width = 150;
            this.gvMx1bld010.Width = 187;
            // 
            // gvMx1bld014
            // 
            this.gvMx1bld014.AppearanceCell.Options.UseFont = true;
            this.gvMx1bld014.Caption = "ERP投料单行id ";
            this.gvMx1bld014.FieldName = "bld014";
            this.gvMx1bld014.MinWidth = 50;
            this.gvMx1bld014.MinWidth = 62;
            this.gvMx1bld014.Name = "gvMx1bld014";
            this.gvMx1bld014.Tag = "query_a.bld014";
            this.gvMx1bld014.Width = 94;
            this.gvMx1bld014.Width = 117;
            // 
            // dabGuid
            // 
            this.dabGuid.Caption = "gridColumn1";
            this.dabGuid.FieldName = "dabGuid";
            this.dabGuid.MinWidth = 25;
            this.dabGuid.MinWidth = 31;
            this.dabGuid.Name = "dabGuid";
            this.dabGuid.Width = 94;
            this.dabGuid.Width = 117;
            // 
            // gvMxDel
            // 
            this.gvMxDel.Caption = "移出";
            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gvMxDel.MinWidth = 25;
            this.gvMxDel.MinWidth = 31;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 8;
            this.gvMxDel.Width = 94;
            this.gvMxDel.Width = 117;
            // 
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -972,9 +1008,9 @@
            // 
            this.gridColumn9.Caption = "物料ID";
            this.gridColumn9.FieldName = "bld012";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.MinWidth = 31;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Width = 94;
            this.gridColumn9.Width = 117;
            // 
            // repositoryItemSearchLookUpEdit1
            // 
@@ -998,6 +1034,7 @@
            this.gridColumn7,
            this.gridColumn6,
            this.gridColumn8});
            this.gridView2.DetailHeight = 428;
            this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
            this.gridView2.Name = "gridView2";
            this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
@@ -1007,92 +1044,110 @@
            // 
            this.gridColumn1.Caption = "dabGuid";
            this.gridColumn1.FieldName = "dabGuid";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Width = 94;
            // 
            // gridColumn2
            // 
            this.gridColumn2.Caption = "物料ID";
            this.gridColumn2.FieldName = "itemId";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Width = 94;
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "物料编码";
            this.gridColumn3.FieldName = "itemNo";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 0;
            this.gridColumn3.Width = 94;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "物料名称";
            this.gridColumn4.FieldName = "itemName";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 1;
            this.gridColumn4.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 = 2;
            this.gridColumn5.Width = 94;
            // 
            // gridColumn7
            // 
            this.gridColumn7.Caption = "需领用量";
            this.gridColumn7.FieldName = "dab006";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 3;
            this.gridColumn7.Width = 94;
            // 
            // gridColumn6
            // 
            this.gridColumn6.Caption = "已领用量";
            this.gridColumn6.FieldName = "dab007";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 94;
            // 
            // gridColumn8
            // 
            this.gridColumn8.Caption = "单位";
            this.gridColumn8.FieldName = "dwName";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 4;
            this.gridColumn8.Width = 94;
            // 
            // picCheckBox
            // 
            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
            this.picCheckBox.Location = new System.Drawing.Point(988, 55);
            this.picCheckBox.Location = new System.Drawing.Point(1235, 67);
            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
            this.picCheckBox.Name = "picCheckBox";
            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
            this.picCheckBox.Size = new System.Drawing.Size(125, 61);
            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
            this.picCheckBox.TabIndex = 7;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // gridColumn10
            // gridColumn11
            // 
            this.gridColumn10.Caption = "货主组织";
            this.gridColumn10.FieldName = "stockownerName";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 11;
            this.gridColumn10.Width = 94;
            this.gridColumn11.Caption = "需领数量";
            this.gridColumn11.FieldName = "xlsl";
            this.gridColumn11.MinWidth = 30;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 9;
            this.gridColumn11.Width = 112;
            // 
            // WwBlcl
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.Controls.Add(this.picCheckBox);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Margin = new System.Windows.Forms.Padding(4);
            this.Name = "WwBlcl";
            this.Size = new System.Drawing.Size(1281, 682);
            this.Size = new System.Drawing.Size(1601, 834);
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
            this.xtraTabPage1.ResumeLayout(false);
@@ -1220,5 +1275,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
    }
}
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
@@ -71,6 +71,7 @@
                            _row["bld003"] = dym.itemName;//物料名称
                            _row["bld004"] = dym.itemModel;//规格型号
                            _row["dabGuid"] = dym.dabGuid;
                            _row["xlsl"] = dym.dab006;
                            _row["bld008"] = dym.dab007;//已领用量
                            _row["bld009"] = dym.dwName;//单位
                            _row["bld001"] = dym.bld001;//工单号