lu
2025-02-20 9ed4db6da135e36f7a3b812cdd2a7ac9682420db
委外
已修改4个文件
1149 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs 73 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs 991 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs 73 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
@@ -38,12 +38,12 @@
            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
            gvList.Add(gridView1);
            Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(parentForm.GetType().FullName, gvList);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
           Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1,picCheckBox, parentForm, "statusChk", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            });
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "statusChk", "", (value) =>
           {
               Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
           });
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
@@ -104,6 +104,9 @@
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -115,7 +118,7 @@
            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
            this.txt_wwGys = new DevExpress.XtraEditors.TextEdit();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.txt_wwOrg = new DevExpress.XtraEditors.TextEdit();
            this.txt_wwOrgTxt = new DevExpress.XtraEditors.TextEdit();
            this.txt_aboutGuid = new Gs.DevApp.UserControl.UcLookWwgd();
            this.txt_bl017 = new DevExpress.XtraEditors.ComboBoxEdit();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
@@ -148,7 +151,7 @@
            this.tabMx.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wwGys.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wwOrg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wwOrgTxt.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bl017.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bl018.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
@@ -907,7 +910,7 @@
            // 
            this.gv_bl001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_bl001.AppearanceCell.Options.UseFont = true;
            this.gv_bl001.Caption = "生产工单 ";
            this.gv_bl001.Caption = "委外工单 ";
            this.gv_bl001.FieldName = "bl001";
            this.gv_bl001.MinWidth = 100;
            this.gv_bl001.Name = "gv_bl001";
@@ -925,7 +928,7 @@
            this.lb_blNo.Name = "lb_blNo";
            this.lb_blNo.Size = new System.Drawing.Size(68, 21);
            this.lb_blNo.TabIndex = 211;
            this.lb_blNo.Text = "超领单号";
            this.lb_blNo.Text = "申请单号";
            // 
            // txt_blNo
            // 
@@ -1009,21 +1012,54 @@
            this.gv_bl015,
            this.gv_bl004,
            this.gv_bl005,
            this.gv_bl016,
            this.gv_bl006,
            this.gv_bl007,
            this.gv_bl009,
            this.gv_bl010,
            this.gv_bl013,
            this.gv_bl016,
            this.gv_bl017,
            this.gv_wcUser,
            this.gv_wcTime});
            this.gv_wcTime,
            this.gridColumn10,
            this.gridColumn11,
            this.gridColumn12});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            //
            // gridColumn10
            //
            this.gridColumn10.Caption = "委外组织";
            this.gridColumn10.FieldName = "wwOrgTxt";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 18;
            this.gridColumn10.Width = 94;
            //
            // gridColumn11
            //
            this.gridColumn11.Caption = "发料组织";
            this.gridColumn11.FieldName = "orgIdTxt";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 19;
            this.gridColumn11.Width = 94;
            //
            // gridColumn12
            //
            this.gridColumn12.Caption = "委外工应商";
            this.gridColumn12.FieldName = "wwGys";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 20;
            this.gridColumn12.Width = 94;
            // 
            // xtraTabControl1
            // 
@@ -1084,7 +1120,7 @@
            this.panel1.Controls.Add(this.labelControl3);
            this.panel1.Controls.Add(this.txt_wwGys);
            this.panel1.Controls.Add(this.labelControl2);
            this.panel1.Controls.Add(this.txt_wwOrg);
            this.panel1.Controls.Add(this.txt_wwOrgTxt);
            this.panel1.Controls.Add(this.txt_aboutGuid);
            this.panel1.Controls.Add(this.txt_bl017);
            this.panel1.Controls.Add(this.labelControl1);
@@ -1166,15 +1202,15 @@
            this.labelControl2.TabIndex = 290;
            this.labelControl2.Text = "委外组织";
            // 
            // txt_wwOrg
            // txt_wwOrgTxt
            // 
            this.txt_wwOrg.Location = new System.Drawing.Point(376, 47);
            this.txt_wwOrg.Name = "txt_wwOrg";
            this.txt_wwOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_wwOrg.Properties.Appearance.Options.UseFont = true;
            this.txt_wwOrg.Size = new System.Drawing.Size(177, 28);
            this.txt_wwOrg.TabIndex = 291;
            this.txt_wwOrg.Tag = "readonly";
            this.txt_wwOrgTxt.Location = new System.Drawing.Point(376, 47);
            this.txt_wwOrgTxt.Name = "txt_wwOrgTxt";
            this.txt_wwOrgTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_wwOrgTxt.Properties.Appearance.Options.UseFont = true;
            this.txt_wwOrgTxt.Size = new System.Drawing.Size(177, 28);
            this.txt_wwOrgTxt.TabIndex = 291;
            this.txt_wwOrgTxt.Tag = "readonly";
            // 
            // txt_aboutGuid
            // 
@@ -1289,7 +1325,7 @@
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wwGys.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wwOrg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wwOrgTxt.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bl017.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bl018.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
@@ -1398,6 +1434,9 @@
        private DevExpress.XtraEditors.LabelControl labelControl3;
        private DevExpress.XtraEditors.TextEdit txt_wwGys;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.TextEdit txt_wwOrg;
        private DevExpress.XtraEditors.TextEdit txt_wwOrgTxt;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
    }
}
DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.Designer.cs
@@ -27,29 +27,32 @@
        /// </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.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2lotNo = 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.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2remark = 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.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1workNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1createDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_depotId = new DevExpress.XtraEditors.LabelControl();
            this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_boardItem = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -60,8 +63,6 @@
            this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
            this.gv_workNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_receiver = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_outPart = new DevExpress.XtraEditors.LabelControl();
            this.gv_outPart = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_outDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
@@ -90,14 +91,32 @@
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.panel1 = new System.Windows.Forms.Panel();
            this.txt_outPart = new Gs.DevApp.UserControl.UcLookDepartment();
            this.depot_id = new Gs.DevApp.UserControl.UcLookCk();
            this.txt_orgIdTxt = new DevExpress.XtraEditors.TextEdit();
            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
            this.txt_ckName = new DevExpress.XtraEditors.TextEdit();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.txt_pbillNo = new DevExpress.XtraEditors.TextEdit();
            this.lb_bl015 = new DevExpress.XtraEditors.LabelControl();
            this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
            this.lb_bl014 = new DevExpress.XtraEditors.LabelControl();
            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
            this.lb_bl002 = new DevExpress.XtraEditors.LabelControl();
            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
            this.txt_wwGys = new DevExpress.XtraEditors.TextEdit();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.txt_wwOrgTxt = new DevExpress.XtraEditors.TextEdit();
            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.lbGuid = new System.Windows.Forms.Label();
@@ -126,87 +145,53 @@
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_orgIdTxt.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wwGys.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wwOrgTxt.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
            // 
            // gvMx2remark
            // tabMxPage2
            // 
            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;
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1124, 358);
            this.tabMxPage2.Text = "出库条码";
            // 
            // gvMx2depotSectionCode
            // gcMx2
            // 
            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;
            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, 358);
            this.gcMx2.TabIndex = 1;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
            // 
            // gvMx2depotCode
            // gvMx2
            // 
            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;
            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMx2itemBarcode,
            this.gvMx2itemNo,
            this.gvMx2lotNo,
            this.gvMx2quantity,
            this.gvMx2depotCode,
            this.gvMx2depotSectionCode,
            this.gridColumn2,
            this.gridColumn3,
            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
            // 
@@ -221,79 +206,152 @@
            this.gvMx2itemBarcode.VisibleIndex = 0;
            this.gvMx2itemBarcode.Width = 94;
            // 
            // tabMxPage2
            // gvMx2itemNo
            // 
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1124, 417);
            this.tabMxPage2.Text = "出库条码";
            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;
            // 
            // gcMx2
            // gvMx2lotNo
            // 
            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});
            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;
            // 
            // gvMx2
            // gvMx2quantity
            // 
            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;
            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;
            // 
            // gvMx1itemId
            // gvMx2depotCode
            // 
            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;
            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;
            // 
            // gvMx1tlQty
            // gvMx2depotSectionCode
            // 
            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;
            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;
            // 
            // gvMx1rkQty
            // gridColumn2
            // 
            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;
            this.gridColumn2.Caption = "建立者";
            this.gridColumn2.FieldName = "createBy";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 6;
            this.gridColumn2.Width = 94;
            //
            // gridColumn3
            //
            this.gridColumn3.Caption = "建立时间";
            this.gridColumn3.FieldName = "createDate";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 7;
            this.gridColumn3.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 = 8;
            this.gvMx2remark.Width = 94;
            //
            // tabMxPage1
            //
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 358);
            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, 358);
            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.gvMx1workNo,
            this.gvMx1itemNo,
            this.gvMx1itemId,
            this.gvMx1createBy,
            this.gvMx1createDate,
            this.gvMx1quantity,
            this.gvMx1tlQty,
            this.gvMx1remark,
            this.gridColumn4,
            this.gridColumn5});
            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;
            // 
            // gvMx1workNo
            // 
@@ -305,60 +363,8 @@
            this.gvMx1workNo.Name = "gvMx1workNo";
            this.gvMx1workNo.Tag = "query_a.work_no";
            this.gvMx1workNo.Visible = true;
            this.gvMx1workNo.VisibleIndex = 6;
            this.gvMx1workNo.VisibleIndex = 0;
            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
            // 
@@ -373,72 +379,119 @@
            this.gvMx1itemNo.VisibleIndex = 1;
            this.gvMx1itemNo.Width = 94;
            // 
            // gvMx1guid
            // gvMx1itemId
            // 
            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;
            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 = 2;
            this.gvMx1itemId.Width = 94;
            // 
            // tabMxPage1
            // gvMx1createBy
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 417);
            this.tabMxPage1.Text = "出库明细";
            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 = 3;
            this.gvMx1createBy.Width = 94;
            // 
            // gcMx1
            // gvMx1createDate
            // 
            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});
            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 = 4;
            this.gvMx1createDate.Width = 94;
            // 
            // gvMx1
            // gvMx1quantity
            // 
            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;
            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 = 5;
            this.gvMx1quantity.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 = 6;
            this.gvMx1tlQty.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 = 7;
            this.gvMx1remark.Width = 94;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "建立者";
            this.gridColumn4.FieldName = "createBy";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 8;
            this.gridColumn4.Width = 94;
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "建立时间";
            this.gridColumn5.FieldName = "createDate";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 9;
            this.gridColumn5.Width = 94;
            // 
            // 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(282, 85);
            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
            // 
            this.gv_pbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
            this.gv_pbillNo.Caption = "工单单号";
            this.gv_pbillNo.Caption = "委外工单号";
            this.gv_pbillNo.FieldName = "pbillNo";
            this.gv_pbillNo.MinWidth = 50;
            this.gv_pbillNo.Name = "gv_pbillNo";
@@ -453,7 +506,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;
@@ -466,15 +519,15 @@
            // 
            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(557, 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(629, 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;
@@ -499,19 +552,19 @@
            // 
            this.lb_workNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_workNo.Appearance.Options.UseFont = true;
            this.lb_workNo.Location = new System.Drawing.Point(20, 52);
            this.lb_workNo.Location = new System.Drawing.Point(557, 22);
            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(629, 18);
            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(174, 28);
            this.txt_workNo.TabIndex = 387;
            // 
            // gv_workNo
@@ -542,30 +595,6 @@
            this.gv_receiver.VisibleIndex = 10;
            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.Name = "lb_outPart";
            this.lb_outPart.Size = new System.Drawing.Size(73, 21);
            this.lb_outPart.TabIndex = 319;
            this.lb_outPart.Text = "领料部门 ";
            //
            // gv_outPart
            //
            this.gv_outPart.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_outPart.AppearanceCell.Options.UseFont = true;
            this.gv_outPart.Caption = "领料部门 ";
            this.gv_outPart.FieldName = "outPart";
            this.gv_outPart.MinWidth = 50;
            this.gv_outPart.Name = "gv_outPart";
            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.Width = 94;
            //
            // gv_outDate
            // 
            this.gv_outDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -584,7 +613,7 @@
            // 
            this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_checkDate.Appearance.Options.UseFont = true;
            this.lb_checkDate.Location = new System.Drawing.Point(773, 52);
            this.lb_checkDate.Location = new System.Drawing.Point(815, 117);
            this.lb_checkDate.Name = "lb_checkDate";
            this.lb_checkDate.Size = new System.Drawing.Size(73, 21);
            this.lb_checkDate.TabIndex = 262;
@@ -592,11 +621,11 @@
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(850, 48);
            this.txt_checkDate.Location = new System.Drawing.Point(892, 113);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(168, 28);
            this.txt_checkDate.Size = new System.Drawing.Size(171, 28);
            this.txt_checkDate.TabIndex = 262;
            // 
            // gv_checkDate
@@ -617,7 +646,7 @@
            // 
            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(832, 85);
            this.lb_checkUser.Name = "lb_checkUser";
            this.lb_checkUser.Size = new System.Drawing.Size(56, 21);
            this.lb_checkUser.TabIndex = 258;
@@ -625,11 +654,11 @@
            // 
            // txt_checkUser
            // 
            this.txt_checkUser.Location = new System.Drawing.Point(850, 16);
            this.txt_checkUser.Location = new System.Drawing.Point(892, 81);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
            this.txt_checkUser.Size = new System.Drawing.Size(168, 28);
            this.txt_checkUser.Size = new System.Drawing.Size(171, 28);
            this.txt_checkUser.TabIndex = 258;
            // 
            // gv_checkUser
@@ -657,14 +686,14 @@
            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.VisibleIndex = 14;
            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(20, 148);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(73, 21);
            this.lb_remark.TabIndex = 243;
@@ -672,11 +701,11 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(599, 79);
            this.txt_remark.Location = new System.Drawing.Point(99, 144);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(171, 28);
            this.txt_remark.Size = new System.Drawing.Size(704, 28);
            this.txt_remark.TabIndex = 243;
            // 
            // gv_remark
@@ -690,14 +719,14 @@
            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 = 13;
            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(815, 54);
            this.lb_createDate.Name = "lb_createDate";
            this.lb_createDate.Size = new System.Drawing.Size(73, 21);
            this.lb_createDate.TabIndex = 226;
@@ -705,7 +734,7 @@
            // 
            // txt_createDate
            // 
            this.txt_createDate.Location = new System.Drawing.Point(599, 48);
            this.txt_createDate.Location = new System.Drawing.Point(892, 50);
            this.txt_createDate.Name = "txt_createDate";
            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
@@ -723,14 +752,14 @@
            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 = 12;
            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(832, 22);
            this.lb_createBy.Name = "lb_createBy";
            this.lb_createBy.Size = new System.Drawing.Size(56, 21);
            this.lb_createBy.TabIndex = 222;
@@ -738,7 +767,7 @@
            // 
            // txt_createBy
            // 
            this.txt_createBy.Location = new System.Drawing.Point(599, 16);
            this.txt_createBy.Location = new System.Drawing.Point(892, 18);
            this.txt_createBy.Name = "txt_createBy";
            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
@@ -756,14 +785,14 @@
            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 = 11;
            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(849, 154);
            this.lb_status.Name = "lb_status";
            this.lb_status.Size = new System.Drawing.Size(39, 21);
            this.lb_status.TabIndex = 219;
@@ -790,26 +819,26 @@
            // 
            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(282, 22);
            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
            // 
            this.txt_taskNo.Location = new System.Drawing.Point(98, 82);
            this.txt_taskNo.Location = new System.Drawing.Point(358, 18);
            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.Size = new System.Drawing.Size(179, 28);
            this.txt_taskNo.TabIndex = 216;
            // 
            // lb_itemOutNo
            // 
            this.lb_itemOutNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_itemOutNo.Appearance.Options.UseFont = true;
            this.lb_itemOutNo.Location = new System.Drawing.Point(20, 20);
            this.lb_itemOutNo.Location = new System.Drawing.Point(20, 22);
            this.lb_itemOutNo.Name = "lb_itemOutNo";
            this.lb_itemOutNo.Size = new System.Drawing.Size(73, 21);
            this.lb_itemOutNo.TabIndex = 213;
@@ -817,11 +846,11 @@
            // 
            // txt_itemOutNo
            // 
            this.txt_itemOutNo.Location = new System.Drawing.Point(98, 16);
            this.txt_itemOutNo.Location = new System.Drawing.Point(99, 18);
            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(177, 28);
            this.txt_itemOutNo.TabIndex = 213;
            // 
            // gv_itemOutNo
@@ -884,11 +913,15 @@
            this.gv_checkUser,
            this.gv_checkDate,
            this.gv_receiver,
            this.gv_outPart,
            this.gv_createBy,
            this.gv_createDate,
            this.gv_remark,
            this.gv_reason});
            this.gv_reason,
            this.gridColumn6,
            this.gridColumn7,
            this.gridColumn8,
            this.gridColumn9,
            this.gridColumn10});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -899,11 +932,62 @@
            // gridColumn1
            // 
            this.gridColumn1.Caption = "产品名称";
            this.gridColumn1.FieldName = "itemName";
            this.gridColumn1.MinWidth = 120;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 5;
            this.gridColumn1.Width = 120;
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "委外组织";
            this.gridColumn6.FieldName = "wwOrgTxt";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 15;
            this.gridColumn6.Width = 94;
            //
            // gridColumn7
            //
            this.gridColumn7.Caption = "发料组织";
            this.gridColumn7.FieldName = "orgIdTxt";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 16;
            this.gridColumn7.Width = 94;
            //
            // gridColumn8
            //
            this.gridColumn8.Caption = "委外供应商";
            this.gridColumn8.FieldName = "wwGys";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 17;
            this.gridColumn8.Width = 94;
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "申请单号";
            this.gridColumn9.FieldName = "taskNo";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 18;
            this.gridColumn9.Width = 94;
            //
            // gridColumn10
            //
            this.gridColumn10.Caption = "产品型号";
            this.gridColumn10.FieldName = "itemModel";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 19;
            this.gridColumn10.Width = 94;
            // 
            // xtraTabControl1
            // 
@@ -948,10 +1032,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, 180);
            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, 390);
            this.tabMx.TabIndex = 2;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
@@ -960,8 +1044,21 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.txt_outPart);
            this.panel1.Controls.Add(this.depot_id);
            this.panel1.Controls.Add(this.txt_orgIdTxt);
            this.panel1.Controls.Add(this.labelControl4);
            this.panel1.Controls.Add(this.txt_ckName);
            this.panel1.Controls.Add(this.labelControl1);
            this.panel1.Controls.Add(this.txt_pbillNo);
            this.panel1.Controls.Add(this.lb_bl015);
            this.panel1.Controls.Add(this.txt_itemModel);
            this.panel1.Controls.Add(this.lb_bl014);
            this.panel1.Controls.Add(this.txt_itemName);
            this.panel1.Controls.Add(this.lb_bl002);
            this.panel1.Controls.Add(this.txt_itemNo);
            this.panel1.Controls.Add(this.labelControl3);
            this.panel1.Controls.Add(this.txt_wwGys);
            this.panel1.Controls.Add(this.labelControl2);
            this.panel1.Controls.Add(this.txt_wwOrgTxt);
            this.panel1.Controls.Add(this.txt_status);
            this.panel1.Controls.Add(this.labelControl11);
            this.panel1.Controls.Add(this.lbGuid);
@@ -970,7 +1067,6 @@
            this.panel1.Controls.Add(this.txt_outType);
            this.panel1.Controls.Add(this.lb_workNo);
            this.panel1.Controls.Add(this.txt_workNo);
            this.panel1.Controls.Add(this.lb_outPart);
            this.panel1.Controls.Add(this.lb_checkDate);
            this.panel1.Controls.Add(this.txt_checkDate);
            this.panel1.Controls.Add(this.lb_checkUser);
@@ -990,29 +1086,161 @@
            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, 180);
            this.panel1.TabIndex = 1;
            // 
            // txt_outPart
            // txt_orgIdTxt
            // 
            this.txt_outPart.IsReadly = false;
            this.txt_outPart.Location = new System.Drawing.Point(342, 19);
            this.txt_outPart.Name = "txt_outPart";
            this.txt_outPart.Size = new System.Drawing.Size(174, 28);
            this.txt_outPart.TabIndex = 574;
            this.txt_orgIdTxt.Location = new System.Drawing.Point(99, 81);
            this.txt_orgIdTxt.Name = "txt_orgIdTxt";
            this.txt_orgIdTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_orgIdTxt.Properties.Appearance.Options.UseFont = true;
            this.txt_orgIdTxt.Size = new System.Drawing.Size(177, 28);
            this.txt_orgIdTxt.TabIndex = 589;
            this.txt_orgIdTxt.Tag = "readonly";
            // 
            // depot_id
            // labelControl4
            // 
            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;
            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl4.Appearance.Options.UseFont = true;
            this.labelControl4.Location = new System.Drawing.Point(25, 85);
            this.labelControl4.Name = "labelControl4";
            this.labelControl4.Size = new System.Drawing.Size(68, 21);
            this.labelControl4.TabIndex = 588;
            this.labelControl4.Text = "发料组织";
            //
            // txt_ckName
            //
            this.txt_ckName.Location = new System.Drawing.Point(358, 81);
            this.txt_ckName.Name = "txt_ckName";
            this.txt_ckName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_ckName.Properties.Appearance.Options.UseFont = true;
            this.txt_ckName.Size = new System.Drawing.Size(179, 28);
            this.txt_ckName.TabIndex = 587;
            this.txt_ckName.Tag = "readonly";
            //
            // labelControl1
            //
            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl1.Appearance.Options.UseFont = true;
            this.labelControl1.Location = new System.Drawing.Point(8, 54);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(85, 21);
            this.labelControl1.TabIndex = 585;
            this.labelControl1.Text = "委外工单号";
            //
            // txt_pbillNo
            //
            this.txt_pbillNo.Location = new System.Drawing.Point(99, 50);
            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(177, 28);
            this.txt_pbillNo.TabIndex = 586;
            //
            // lb_bl015
            //
            this.lb_bl015.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_bl015.Appearance.Options.UseFont = true;
            this.lb_bl015.Location = new System.Drawing.Point(557, 117);
            this.lb_bl015.Name = "lb_bl015";
            this.lb_bl015.Size = new System.Drawing.Size(68, 21);
            this.lb_bl015.TabIndex = 583;
            this.lb_bl015.Text = "产品型号";
            //
            // txt_itemModel
            //
            this.txt_itemModel.Location = new System.Drawing.Point(629, 113);
            this.txt_itemModel.Name = "txt_itemModel";
            this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
            this.txt_itemModel.Size = new System.Drawing.Size(174, 28);
            this.txt_itemModel.TabIndex = 584;
            this.txt_itemModel.Tag = "readonly";
            //
            // lb_bl014
            //
            this.lb_bl014.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_bl014.Appearance.Options.UseFont = true;
            this.lb_bl014.Location = new System.Drawing.Point(282, 117);
            this.lb_bl014.Name = "lb_bl014";
            this.lb_bl014.Size = new System.Drawing.Size(68, 21);
            this.lb_bl014.TabIndex = 581;
            this.lb_bl014.Text = "产品名称";
            //
            // txt_itemName
            //
            this.txt_itemName.Location = new System.Drawing.Point(358, 113);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
            this.txt_itemName.Size = new System.Drawing.Size(179, 28);
            this.txt_itemName.TabIndex = 582;
            this.txt_itemName.Tag = "readonly";
            //
            // lb_bl002
            //
            this.lb_bl002.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_bl002.Appearance.Options.UseFont = true;
            this.lb_bl002.Location = new System.Drawing.Point(25, 117);
            this.lb_bl002.Name = "lb_bl002";
            this.lb_bl002.Size = new System.Drawing.Size(68, 21);
            this.lb_bl002.TabIndex = 579;
            this.lb_bl002.Text = "产品编号";
            //
            // txt_itemNo
            //
            this.txt_itemNo.Location = new System.Drawing.Point(99, 113);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
            this.txt_itemNo.Size = new System.Drawing.Size(177, 28);
            this.txt_itemNo.TabIndex = 580;
            this.txt_itemNo.Tag = "readonly";
            //
            // labelControl3
            //
            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl3.Appearance.Options.UseFont = true;
            this.labelControl3.Location = new System.Drawing.Point(540, 54);
            this.labelControl3.Name = "labelControl3";
            this.labelControl3.Size = new System.Drawing.Size(85, 21);
            this.labelControl3.TabIndex = 577;
            this.labelControl3.Text = "委外供应商";
            //
            // txt_wwGys
            //
            this.txt_wwGys.Location = new System.Drawing.Point(629, 50);
            this.txt_wwGys.Name = "txt_wwGys";
            this.txt_wwGys.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_wwGys.Properties.Appearance.Options.UseFont = true;
            this.txt_wwGys.Size = new System.Drawing.Size(174, 28);
            this.txt_wwGys.TabIndex = 578;
            this.txt_wwGys.Tag = "readonly";
            //
            // labelControl2
            //
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(282, 54);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(68, 21);
            this.labelControl2.TabIndex = 575;
            this.labelControl2.Text = "委外组织";
            //
            // txt_wwOrgTxt
            //
            this.txt_wwOrgTxt.Location = new System.Drawing.Point(358, 50);
            this.txt_wwOrgTxt.Name = "txt_wwOrgTxt";
            this.txt_wwOrgTxt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_wwOrgTxt.Properties.Appearance.Options.UseFont = true;
            this.txt_wwOrgTxt.Size = new System.Drawing.Size(179, 28);
            this.txt_wwOrgTxt.TabIndex = 576;
            this.txt_wwOrgTxt.Tag = "readonly";
            // 
            // txt_status
            // 
            this.txt_status.Location = new System.Drawing.Point(850, 84);
            this.txt_status.Location = new System.Drawing.Point(892, 152);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "";
            this.txt_status.Size = new System.Drawing.Size(44, 24);
@@ -1020,7 +1248,7 @@
            // 
            // labelControl11
            // 
            this.labelControl11.Location = new System.Drawing.Point(919, 86);
            this.labelControl11.Location = new System.Drawing.Point(961, 154);
            this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl11.Name = "labelControl11";
            this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -1031,7 +1259,7 @@
            // lbGuid
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(970, 86);
            this.lbGuid.Location = new System.Drawing.Point(1055, 199);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
@@ -1048,16 +1276,15 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // Frm_MesItemBlDJ
            // WwBlclDj
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1128, 682);
            this.Controls.Add(this.picCheckBox);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_MesItemBlDJ";
            this.Text = "委外补料";
            this.Name = "WwBlclDj";
            this.Size = new System.Drawing.Size(1128, 682);
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
@@ -1083,6 +1310,14 @@
            this.tabMx.ResumeLayout(false);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_orgIdTxt.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wwGys.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_wwOrgTxt.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);
@@ -1100,29 +1335,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;
@@ -1135,9 +1349,6 @@
        private DevExpress.XtraEditors.TextEdit txt_workNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_workNo;
        private DevExpress.XtraGrid.Columns.GridColumn gv_receiver;
        private DevExpress.XtraEditors.LabelControl lb_outPart;
        private DevExpress.XtraGrid.Columns.GridColumn gv_outPart;
        private DevExpress.XtraGrid.Columns.GridColumn gv_outDate;
        private DevExpress.XtraEditors.LabelControl lb_checkDate;
@@ -1172,8 +1383,50 @@
        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.GridControl gcMx1;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1workNo;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createDate;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1tlQty;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        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 gvMx2quantity;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotCode;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2depotSectionCode;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraEditors.LabelControl labelControl3;
        private DevExpress.XtraEditors.TextEdit txt_wwGys;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.TextEdit txt_wwOrgTxt;
        private DevExpress.XtraEditors.LabelControl lb_bl015;
        private DevExpress.XtraEditors.TextEdit txt_itemModel;
        private DevExpress.XtraEditors.LabelControl lb_bl014;
        private DevExpress.XtraEditors.TextEdit txt_itemName;
        private DevExpress.XtraEditors.LabelControl lb_bl002;
        private DevExpress.XtraEditors.TextEdit txt_itemNo;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private DevExpress.XtraEditors.TextEdit txt_pbillNo;
        private DevExpress.XtraEditors.TextEdit txt_ckName;
        private DevExpress.XtraEditors.TextEdit txt_orgIdTxt;
        private DevExpress.XtraEditors.LabelControl labelControl4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
    }
}
DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs
@@ -1,16 +1,11 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -19,7 +14,7 @@
    public partial class WwBlclDj : DevExpress.XtraEditors.XtraUserControl
    {
        string _webServiceName = "MesItemBlDJManager/";
        string _webServiceName = "WWBlDJManager/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        public string strType = "";
@@ -37,8 +32,15 @@
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnLayoutClick += ToolBarMenu1_btnLayoutClick;
            Form parentForm = this.FindForm();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, parentForm, "statusChk", "", (value) =>
            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
            gvList.Add(gridView1);
            Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(parentForm.GetType().FullName, gvList);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "statusChk", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            });
@@ -51,7 +53,6 @@
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            depot_id.getSuppler("");
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
@@ -60,7 +61,28 @@
            getPageList(1);
        }
        /// <summary>
        /// 日志
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_itemOutNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
        private void ToolBarMenu1_btnLayoutClick(object sender, EventArgs e)
        {
            Form parentForm = this.FindForm();
            string _formNamespace = parentForm.GetType().FullName;
            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
            gvList.Add(gridView1);
            Gs.DevApp.UserControl.showLayOut DevFrm = new showLayOut(_formNamespace, gvList);
            DevFrm.ShowDialog();
        }
        /// <summary>
        /// 分页事件
        /// </summary>
@@ -136,14 +158,15 @@
                getModel(lbGuid.Text.Trim());
            else
            {
                _filterList.Clear();
                if (gridView1.ActiveFilter.Count > 0)
                {
                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    gridView1.ActiveFilter.Clear();
                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                }
                getPageList(1);
                //_filterList.Clear();
                //if (gridView1.ActiveFilter.Count > 0)
                //{
                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                //    gridView1.ActiveFilter.Clear();
                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                //}
                //getPageList(1);
                getPageList(this.pageBar1.CurrentPage);
            }
        }
@@ -155,6 +178,7 @@
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            _sbSqlWhere += " and a.out_type='" + strType + "'";
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_out_no", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -170,6 +194,7 @@
                    {
                        gcMain.DataSource = dt;
                        gcMain.ForceInitialize();
                        gridView1.BestFitColumns();
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -226,6 +251,7 @@
                        gcMx1.BindingContext = new BindingContext();
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                    }
                    else
                    {
@@ -242,6 +268,7 @@
                        gcMx2.BindingContext = new BindingContext();
                        gcMx2.DataSource = dt1;
                        gcMx2.ForceInitialize();
                        gvMx2.BestFitColumns();
                    }
                    else
                    {
@@ -296,12 +323,16 @@
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0)
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
                    else
                        getPageList(this.pageBar1.CurrentPage);
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    Form parentForm = this.FindForm();
                    UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, parentForm, _inFieldValue.ToString());
                }
            }
            catch (Exception ex)