lu
2025-02-20 5c66ff724a6ab1bef5fe7877821ec91997151484
委外
已添加1个文件
已修改10个文件
602 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs 105 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs 192 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.Designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.resx 129 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Resources/time.svg 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -399,11 +399,12 @@
            dataTable.Rows.Add("XSCK(销售出库)");
            dataTable.Rows.Add("XSTH(销售退货)");
            dataTable.Rows.Add("WWPC(委外排产)");
            dataTable.Rows.Add("WWLL(委外领料)");
            dataTable.Rows.Add("WWTLSQ(委外退料申请)");
            dataTable.Rows.Add("WWTL(委外退料)");
            dataTable.Rows.Add("WWCLSQ(生产超领申请)");
            dataTable.Rows.Add("WWCLSQ(委外超领申请)");
            dataTable.Rows.Add("WWCL(委外超领)");
            dataTable.Rows.Add("WWBLSQ(生产补料申请)");
            dataTable.Rows.Add("WWBLSQ(委外补料申请)");
            dataTable.Rows.Add("WWBL(委外补料)");
            dataTable.Rows.Add("SJJYSQ(首检申请)");
            dataTable.Rows.Add("SJJY(首检检验)");
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -29,11 +29,11 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2createDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -98,7 +98,7 @@
            this.txt_daa016 = new DevExpress.XtraEditors.TextEdit();
            this.gv_daa016 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_daa015 = new DevExpress.XtraEditors.LabelControl();
            this.txt_daa015 = new DevExpress.XtraEditors.TextEdit();
            this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
            this.gv_daa015 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.lb_daa013 = new DevExpress.XtraEditors.LabelControl();
            this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
@@ -146,6 +146,10 @@
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -191,7 +195,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa017.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa016.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).BeginInit();
@@ -413,10 +417,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -872,8 +876,8 @@
            this.gv_daa027.AppearanceCell.Options.UseFont = true;
            this.gv_daa027.AppearanceHeader.Options.UseTextOptions = true;
            this.gv_daa027.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gv_daa027.Caption = "备料标识";
            this.gv_daa027.FieldName = "daa027";
            this.gv_daa027.Caption = "备料完成";
            this.gv_daa027.FieldName = "daa027Chk";
            this.gv_daa027.MaxWidth = 50;
            this.gv_daa027.MinWidth = 50;
            this.gv_daa027.Name = "gv_daa027";
@@ -1009,22 +1013,22 @@
            this.lb_daa015.TabIndex = 267;
            this.lb_daa015.Text = "生产线别";
            // 
            // txt_daa015
            // txt_lineName
            // 
            this.txt_daa015.Location = new System.Drawing.Point(343, 111);
            this.txt_daa015.Name = "txt_daa015";
            this.txt_daa015.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_daa015.Properties.Appearance.Options.UseFont = true;
            this.txt_daa015.Size = new System.Drawing.Size(159, 28);
            this.txt_daa015.TabIndex = 267;
            this.txt_daa015.Tag = "readonly";
            this.txt_lineName.Location = new System.Drawing.Point(343, 111);
            this.txt_lineName.Name = "txt_lineName";
            this.txt_lineName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_lineName.Properties.Appearance.Options.UseFont = true;
            this.txt_lineName.Size = new System.Drawing.Size(159, 28);
            this.txt_lineName.TabIndex = 267;
            this.txt_lineName.Tag = "readonly";
            // 
            // gv_daa015
            // 
            this.gv_daa015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_daa015.AppearanceCell.Options.UseFont = true;
            this.gv_daa015.Caption = "生产线别";
            this.gv_daa015.FieldName = "daa015";
            this.gv_daa015.FieldName = "lineName";
            this.gv_daa015.MinWidth = 50;
            this.gv_daa015.Name = "gv_daa015";
            this.gv_daa015.OptionsColumn.AllowEdit = false;
@@ -1417,7 +1421,11 @@
            this.gv_mesStartProd,
            this.gv_mesEndProd,
            this.gridColumn21,
            this.gridColumn22});
            this.gridColumn22,
            this.gridColumn23,
            this.gridColumn24,
            this.gridColumn25,
            this.gridColumn26});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -1535,6 +1543,7 @@
            // gridColumn3
            // 
            this.gridColumn3.Caption = "物料编码";
            this.gridColumn3.FieldName = "itemNo";
            this.gridColumn3.MinWidth = 50;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
@@ -1564,7 +1573,7 @@
            // gridColumn2
            // 
            this.gridColumn2.Caption = "实际线别";
            this.gridColumn2.FieldName = "sjXt";
            this.gridColumn2.FieldName = "sjlineName";
            this.gridColumn2.MinWidth = 50;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
@@ -1590,6 +1599,46 @@
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 33;
            this.gridColumn22.Width = 94;
            //
            // gridColumn23
            //
            this.gridColumn23.Caption = "GUID";
            this.gridColumn23.FieldName = "guid";
            this.gridColumn23.MinWidth = 25;
            this.gridColumn23.Name = "gridColumn23";
            this.gridColumn23.Visible = true;
            this.gridColumn23.VisibleIndex = 34;
            this.gridColumn23.Width = 94;
            //
            // gridColumn24
            //
            this.gridColumn24.Caption = "排产编号";
            this.gridColumn24.FieldName = "pcHNo";
            this.gridColumn24.MinWidth = 25;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 35;
            this.gridColumn24.Width = 94;
            //
            // gridColumn25
            //
            this.gridColumn25.Caption = "任务单号";
            this.gridColumn25.FieldName = "daa021";
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 36;
            this.gridColumn25.Width = 94;
            //
            // gridColumn26
            //
            this.gridColumn26.Caption = "首件检验结果";
            this.gridColumn26.FieldName = "daa026";
            this.gridColumn26.MinWidth = 25;
            this.gridColumn26.Name = "gridColumn26";
            this.gridColumn26.Visible = true;
            this.gridColumn26.VisibleIndex = 37;
            this.gridColumn26.Width = 94;
            // 
            // xtraTabControl1
            // 
@@ -1682,7 +1731,7 @@
            this.panel1.Controls.Add(this.lb_daa016);
            this.panel1.Controls.Add(this.txt_daa016);
            this.panel1.Controls.Add(this.lb_daa015);
            this.panel1.Controls.Add(this.txt_daa015);
            this.panel1.Controls.Add(this.txt_lineName);
            this.panel1.Controls.Add(this.lb_daa013);
            this.panel1.Controls.Add(this.txt_dptName);
            this.panel1.Controls.Add(this.lb_daa011);
@@ -2009,7 +2058,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa017.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa016.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).EndInit();
@@ -2114,7 +2163,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gv_daa016;
        private DevExpress.XtraEditors.LabelControl lb_daa015;
        private DevExpress.XtraEditors.TextEdit txt_daa015;
        private DevExpress.XtraEditors.TextEdit txt_lineName;
        private DevExpress.XtraGrid.Columns.GridColumn gv_daa015;
        private DevExpress.XtraEditors.LabelControl lb_daa013;
@@ -2207,5 +2256,9 @@
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
    }
}
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,3 +1,4 @@
using DevExpress.RichEdit.Export;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -28,6 +29,7 @@
            this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
            this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnLayoutClick += ToolBarMenu1_btnLayoutClick;
            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
            gvList.Add(gridView1);
            Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
@@ -46,7 +48,7 @@
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            txt_sjXt.getSuppler("");
            this.ucBtnPrint1.btnDesignClick += (s, e) =>
            {
                ucBtnPrint1.rptParameter = "rpt_daa{}";
@@ -62,7 +64,16 @@
            Task.Delay(100);
            getPageList(1);
        }
        private void ToolBarMenu1_btnLayoutClick(object sender, EventArgs e)
        {
            string _formNamespace = this.GetType().FullName;
            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
            gvList.Add(gridView1);
            gvList.Add(gvMx1);
            gvList.Add(gvMx2);
            Gs.DevApp.UserControl.showLayOut DevFrm = new showLayOut(_formNamespace, gvList);
            DevFrm.ShowDialog();
        }
        /// <summary>
        /// åˆ†é¡µäº‹ä»¶
        /// </summary>
@@ -223,7 +234,10 @@
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
                    toolBarMenu1.currentAction = "";
                }
            }
            catch (Exception ex)
@@ -300,12 +314,14 @@
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
                    string cjId = dy.daa013;
                    string xjxt = dy.sjXt;
                    txt_sjXt.getSuppler(cjId, xjxt);
                    lbGuid.Text = strGuid;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
                    gvList.Add(gvMx2);
                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
                    // txt_sjXt.getSuppler(txt_daa013.Text);
                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
                    foreach (var a in _job["rtnData"]["list"])
@@ -411,12 +427,18 @@
                    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
                    }
                    else {
                        //注意,这里和其它页面有点不一样
                        int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                        getPageList(this.pageBar1.CurrentPage);
                        gridView1.FocusedRowHandle = rowHandle;
                    }
                }
            }
            catch (Exception ex)
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
@@ -62,6 +62,7 @@
            this.dabGuid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_wcTime = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_wcUser = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_bl019 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -109,6 +110,12 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.panel1 = new System.Windows.Forms.Panel();
            this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
            this.txt_orgId = new Gs.DevApp.UserControl.UcLookOrg();
            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_aboutGuid = new Gs.DevApp.UserControl.UcLookWwgd();
            this.txt_bl017 = new DevExpress.XtraEditors.ComboBoxEdit();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
@@ -140,6 +147,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            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_bl017.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bl018.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
@@ -164,9 +173,8 @@
            this.gvMx1bld012.AppearanceCell.Options.UseForeColor = true;
            this.gvMx1bld012.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gvMx1bld012.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx1bld012.Caption = "物料id ";
            this.gvMx1bld012.Caption = "选择物料";
            this.gvMx1bld012.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
            this.gvMx1bld012.FieldName = "bld012";
            this.gvMx1bld012.MinWidth = 50;
            this.gvMx1bld012.Name = "gvMx1bld012";
            this.gvMx1bld012.Tag = "edit";
@@ -418,7 +426,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 378);
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 395);
            this.tabMxPage1.Text = "申请明细";
            // 
            // gcMx1
@@ -430,7 +438,7 @@
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemSearchLookUpEdit1,
            this.repositoryItemButtonEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1124, 378);
            this.gcMx1.Size = new System.Drawing.Size(1124, 395);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -452,7 +460,8 @@
            this.gvMx1bld010,
            this.gvMx1bld014,
            this.dabGuid,
            this.gvMxDel});
            this.gvMxDel,
            this.gridColumn9});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -488,6 +497,14 @@
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "物料ID";
            this.gridColumn9.FieldName = "bld012";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Width = 94;
            // 
            // gv_wcTime
            // 
@@ -577,15 +594,15 @@
            // 
            this.lb_bl016.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_bl016.Appearance.Options.UseFont = true;
            this.lb_bl016.Location = new System.Drawing.Point(790, 20);
            this.lb_bl016.Location = new System.Drawing.Point(803, 20);
            this.lb_bl016.Name = "lb_bl016";
            this.lb_bl016.Size = new System.Drawing.Size(56, 21);
            this.lb_bl016.Size = new System.Drawing.Size(51, 21);
            this.lb_bl016.TabIndex = 267;
            this.lb_bl016.Text = "审核人 ";
            // 
            // txt_bl016
            // 
            this.txt_bl016.Location = new System.Drawing.Point(852, 16);
            this.txt_bl016.Location = new System.Drawing.Point(858, 16);
            this.txt_bl016.Name = "txt_bl016";
            this.txt_bl016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_bl016.Properties.Appearance.Options.UseFont = true;
@@ -611,19 +628,19 @@
            // 
            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(773, 54);
            this.lb_bl015.Location = new System.Drawing.Point(786, 82);
            this.lb_bl015.Name = "lb_bl015";
            this.lb_bl015.Size = new System.Drawing.Size(73, 21);
            this.lb_bl015.Size = new System.Drawing.Size(68, 21);
            this.lb_bl015.TabIndex = 262;
            this.lb_bl015.Text = "产品型号 ";
            // 
            // txt_bl015
            // 
            this.txt_bl015.Location = new System.Drawing.Point(852, 50);
            this.txt_bl015.Location = new System.Drawing.Point(858, 79);
            this.txt_bl015.Name = "txt_bl015";
            this.txt_bl015.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_bl015.Properties.Appearance.Options.UseFont = true;
            this.txt_bl015.Size = new System.Drawing.Size(229, 28);
            this.txt_bl015.Size = new System.Drawing.Size(174, 28);
            this.txt_bl015.TabIndex = 262;
            this.txt_bl015.Tag = "readonly";
            // 
@@ -645,19 +662,19 @@
            // 
            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(531, 54);
            this.lb_bl014.Location = new System.Drawing.Point(559, 82);
            this.lb_bl014.Name = "lb_bl014";
            this.lb_bl014.Size = new System.Drawing.Size(73, 21);
            this.lb_bl014.Size = new System.Drawing.Size(68, 21);
            this.lb_bl014.TabIndex = 258;
            this.lb_bl014.Text = "产品名称 ";
            // 
            // txt_bl014
            // 
            this.txt_bl014.Location = new System.Drawing.Point(606, 50);
            this.txt_bl014.Location = new System.Drawing.Point(630, 78);
            this.txt_bl014.Name = "txt_bl014";
            this.txt_bl014.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_bl014.Properties.Appearance.Options.UseFont = true;
            this.txt_bl014.Size = new System.Drawing.Size(160, 28);
            this.txt_bl014.Size = new System.Drawing.Size(150, 28);
            this.txt_bl014.TabIndex = 258;
            this.txt_bl014.Tag = "readonly";
            // 
@@ -679,19 +696,19 @@
            // 
            this.lb_bl013.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_bl013.Appearance.Options.UseFont = true;
            this.lb_bl013.Location = new System.Drawing.Point(281, 20);
            this.lb_bl013.Location = new System.Drawing.Point(303, 20);
            this.lb_bl013.Name = "lb_bl013";
            this.lb_bl013.Size = new System.Drawing.Size(73, 21);
            this.lb_bl013.Size = new System.Drawing.Size(68, 21);
            this.lb_bl013.TabIndex = 252;
            this.lb_bl013.Text = "任务单号 ";
            // 
            // txt_bl013
            // 
            this.txt_bl013.Location = new System.Drawing.Point(360, 16);
            this.txt_bl013.Location = new System.Drawing.Point(376, 16);
            this.txt_bl013.Name = "txt_bl013";
            this.txt_bl013.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_bl013.Properties.Appearance.Options.UseFont = true;
            this.txt_bl013.Size = new System.Drawing.Size(150, 28);
            this.txt_bl013.Size = new System.Drawing.Size(177, 28);
            this.txt_bl013.TabIndex = 252;
            this.txt_bl013.Tag = "readonly";
            // 
@@ -713,9 +730,9 @@
            // 
            this.lb_bl010.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_bl010.Appearance.Options.UseFont = true;
            this.lb_bl010.Location = new System.Drawing.Point(46, 90);
            this.lb_bl010.Location = new System.Drawing.Point(46, 114);
            this.lb_bl010.Name = "lb_bl010";
            this.lb_bl010.Size = new System.Drawing.Size(56, 21);
            this.lb_bl010.Size = new System.Drawing.Size(51, 21);
            this.lb_bl010.TabIndex = 240;
            this.lb_bl010.Text = "发料仓 ";
            // 
@@ -751,19 +768,19 @@
            // 
            this.lb_bl007.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_bl007.Appearance.Options.UseFont = true;
            this.lb_bl007.Location = new System.Drawing.Point(29, 125);
            this.lb_bl007.Location = new System.Drawing.Point(303, 115);
            this.lb_bl007.Name = "lb_bl007";
            this.lb_bl007.Size = new System.Drawing.Size(73, 21);
            this.lb_bl007.Size = new System.Drawing.Size(68, 21);
            this.lb_bl007.TabIndex = 228;
            this.lb_bl007.Text = "补料原因 ";
            // 
            // txt_bl007
            // 
            this.txt_bl007.Location = new System.Drawing.Point(112, 121);
            this.txt_bl007.Location = new System.Drawing.Point(376, 111);
            this.txt_bl007.Name = "txt_bl007";
            this.txt_bl007.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_bl007.Properties.Appearance.Options.UseFont = true;
            this.txt_bl007.Size = new System.Drawing.Size(398, 28);
            this.txt_bl007.Size = new System.Drawing.Size(404, 28);
            this.txt_bl007.TabIndex = 228;
            // 
            // gv_bl007
@@ -784,19 +801,19 @@
            // 
            this.lb_bl006.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_bl006.Appearance.Options.UseFont = true;
            this.lb_bl006.Location = new System.Drawing.Point(531, 20);
            this.lb_bl006.Location = new System.Drawing.Point(559, 20);
            this.lb_bl006.Name = "lb_bl006";
            this.lb_bl006.Size = new System.Drawing.Size(73, 21);
            this.lb_bl006.Size = new System.Drawing.Size(68, 21);
            this.lb_bl006.TabIndex = 226;
            this.lb_bl006.Text = "审核日期 ";
            // 
            // txt_bl006
            // 
            this.txt_bl006.Location = new System.Drawing.Point(606, 16);
            this.txt_bl006.Location = new System.Drawing.Point(630, 16);
            this.txt_bl006.Name = "txt_bl006";
            this.txt_bl006.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_bl006.Properties.Appearance.Options.UseFont = true;
            this.txt_bl006.Size = new System.Drawing.Size(160, 28);
            this.txt_bl006.Size = new System.Drawing.Size(150, 28);
            this.txt_bl006.TabIndex = 226;
            this.txt_bl006.Tag = "readonly";
            // 
@@ -846,19 +863,19 @@
            // 
            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(281, 54);
            this.lb_bl002.Location = new System.Drawing.Point(303, 82);
            this.lb_bl002.Name = "lb_bl002";
            this.lb_bl002.Size = new System.Drawing.Size(73, 21);
            this.lb_bl002.Size = new System.Drawing.Size(68, 21);
            this.lb_bl002.TabIndex = 216;
            this.lb_bl002.Text = "产品编号 ";
            // 
            // txt_bl002
            // 
            this.txt_bl002.Location = new System.Drawing.Point(360, 50);
            this.txt_bl002.Location = new System.Drawing.Point(376, 78);
            this.txt_bl002.Name = "txt_bl002";
            this.txt_bl002.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_bl002.Properties.Appearance.Options.UseFont = true;
            this.txt_bl002.Size = new System.Drawing.Size(150, 28);
            this.txt_bl002.Size = new System.Drawing.Size(177, 28);
            this.txt_bl002.TabIndex = 216;
            this.txt_bl002.Tag = "readonly";
            // 
@@ -880,9 +897,9 @@
            // 
            this.lb_bl001.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_bl001.Appearance.Options.UseFont = true;
            this.lb_bl001.Location = new System.Drawing.Point(29, 54);
            this.lb_bl001.Location = new System.Drawing.Point(29, 51);
            this.lb_bl001.Name = "lb_bl001";
            this.lb_bl001.Size = new System.Drawing.Size(73, 21);
            this.lb_bl001.Size = new System.Drawing.Size(68, 21);
            this.lb_bl001.TabIndex = 213;
            this.lb_bl001.Text = "委外工单 ";
            // 
@@ -906,18 +923,18 @@
            this.lb_blNo.Appearance.Options.UseFont = true;
            this.lb_blNo.Location = new System.Drawing.Point(29, 20);
            this.lb_blNo.Name = "lb_blNo";
            this.lb_blNo.Size = new System.Drawing.Size(73, 21);
            this.lb_blNo.Size = new System.Drawing.Size(68, 21);
            this.lb_blNo.TabIndex = 211;
            this.lb_blNo.Text = "超领单号 ";
            // 
            // txt_blNo
            // 
            this.txt_blNo.Location = new System.Drawing.Point(112, 16);
            this.txt_blNo.Location = new System.Drawing.Point(103, 16);
            this.txt_blNo.Name = "txt_blNo";
            this.txt_blNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_blNo.Properties.Appearance.Options.UseFont = true;
            this.txt_blNo.Properties.Tag = "readOnly";
            this.txt_blNo.Size = new System.Drawing.Size(150, 28);
            this.txt_blNo.Size = new System.Drawing.Size(194, 28);
            this.txt_blNo.TabIndex = 211;
            this.txt_blNo.Tag = "readonly";
            // 
@@ -1051,10 +1068,10 @@
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 160);
            this.tabMx.Location = new System.Drawing.Point(0, 143);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1126, 410);
            this.tabMx.Size = new System.Drawing.Size(1126, 427);
            this.tabMx.TabIndex = 2;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -1062,6 +1079,12 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.labelControl4);
            this.panel1.Controls.Add(this.txt_orgId);
            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_aboutGuid);
            this.panel1.Controls.Add(this.txt_bl017);
            this.panel1.Controls.Add(this.labelControl1);
@@ -1092,35 +1115,93 @@
            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, 160);
            this.panel1.Size = new System.Drawing.Size(1126, 143);
            this.panel1.TabIndex = 1;
            //
            // labelControl4
            //
            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl4.Appearance.Options.UseFont = true;
            this.labelControl4.Location = new System.Drawing.Point(29, 82);
            this.labelControl4.Name = "labelControl4";
            this.labelControl4.Size = new System.Drawing.Size(68, 21);
            this.labelControl4.TabIndex = 295;
            this.labelControl4.Text = "发料组织";
            //
            // txt_orgId
            //
            this.txt_orgId.IsReadly = false;
            this.txt_orgId.Location = new System.Drawing.Point(103, 77);
            this.txt_orgId.Name = "txt_orgId";
            this.txt_orgId.Size = new System.Drawing.Size(194, 30);
            this.txt_orgId.TabIndex = 294;
            //
            // labelControl3
            //
            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl3.Appearance.Options.UseFont = true;
            this.labelControl3.Location = new System.Drawing.Point(576, 51);
            this.labelControl3.Name = "labelControl3";
            this.labelControl3.Size = new System.Drawing.Size(51, 21);
            this.labelControl3.TabIndex = 292;
            this.labelControl3.Text = "供应商";
            //
            // txt_wwGys
            //
            this.txt_wwGys.Location = new System.Drawing.Point(630, 47);
            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(150, 28);
            this.txt_wwGys.TabIndex = 293;
            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(303, 51);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(68, 21);
            this.labelControl2.TabIndex = 290;
            this.labelControl2.Text = "委外组织";
            //
            // txt_wwOrg
            //
            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";
            // 
            // txt_aboutGuid
            // 
            this.txt_aboutGuid.IsReadly = false;
            this.txt_aboutGuid.Location = new System.Drawing.Point(112, 50);
            this.txt_aboutGuid.Location = new System.Drawing.Point(103, 47);
            this.txt_aboutGuid.Name = "txt_aboutGuid";
            this.txt_aboutGuid.Size = new System.Drawing.Size(150, 28);
            this.txt_aboutGuid.Size = new System.Drawing.Size(194, 28);
            this.txt_aboutGuid.TabIndex = 287;
            // 
            // txt_bl017
            // 
            this.txt_bl017.EditValue = "委外补料";
            this.txt_bl017.Location = new System.Drawing.Point(360, 88);
            this.txt_bl017.Location = new System.Drawing.Point(858, 49);
            this.txt_bl017.Name = "txt_bl017";
            this.txt_bl017.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_bl017.Properties.Items.AddRange(new object[] {
            "委外补料"});
            this.txt_bl017.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_bl017.Size = new System.Drawing.Size(150, 24);
            this.txt_bl017.Size = new System.Drawing.Size(174, 24);
            this.txt_bl017.TabIndex = 286;
            // 
            // labelControl1
            // 
            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl1.Appearance.Options.UseFont = true;
            this.labelControl1.Location = new System.Drawing.Point(281, 90);
            this.labelControl1.Location = new System.Drawing.Point(786, 51);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(68, 21);
            this.labelControl1.TabIndex = 285;
@@ -1138,15 +1219,15 @@
            // txt_bl010
            // 
            this.txt_bl010.IsReadly = false;
            this.txt_bl010.Location = new System.Drawing.Point(112, 85);
            this.txt_bl010.Location = new System.Drawing.Point(103, 109);
            this.txt_bl010.Margin = new System.Windows.Forms.Padding(0);
            this.txt_bl010.Name = "txt_bl010";
            this.txt_bl010.Size = new System.Drawing.Size(150, 30);
            this.txt_bl010.Size = new System.Drawing.Size(194, 30);
            this.txt_bl010.TabIndex = 281;
            // 
            // labelControl11
            // 
            this.labelControl11.Location = new System.Drawing.Point(914, 97);
            this.labelControl11.Location = new System.Drawing.Point(967, 121);
            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);
@@ -1157,7 +1238,7 @@
            // lbGuid
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(965, 97);
            this.lbGuid.Location = new System.Drawing.Point(1018, 127);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
@@ -1207,6 +1288,8 @@
            this.tabMx.ResumeLayout(false);
            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_bl017.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_bl018.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
@@ -1309,5 +1392,12 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraEditors.LabelControl labelControl4;
        private UserControl.UcLookOrg txt_orgId;
        private DevExpress.XtraEditors.LabelControl labelControl3;
        private DevExpress.XtraEditors.TextEdit txt_wwGys;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.TextEdit txt_wwOrg;
    }
}
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
@@ -14,7 +14,7 @@
{
    public partial class WwBlcl : DevExpress.XtraEditors.XtraUserControl
    {
        string _ucCk = "";//仓库
        string _webServiceName = "WWBlManager/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        public string strType = "";
@@ -23,7 +23,6 @@
            InitializeComponent();
            strType = _strType;
            txt_bl017.Text = _strType;
            // txt_bl017.Tag = "moren." + _strType;
        }
        protected override void OnCreateControl()
        {
@@ -38,8 +37,13 @@
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnLayoutClick += ToolBarMenu1_btnLayoutClick;
            Form parentForm = this.FindForm();
            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.SetGridViewParameter( gridView1, picCheckBox, parentForm, "bl018", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -53,11 +57,12 @@
            });
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            //设置仓库选择
            txt_bl010.getSuppler("");
            this.txt_bl010.EditChanged += (s, e) =>
            //设置组织
            this.txt_orgId.EditChanged += (s, e) =>
            {
                string orgdId = txt_orgId.GetId();
                if (string.IsNullOrEmpty(orgdId)) return;
                txt_bl010.getSuppler(orgdId, _ucCk);
            };
            //选择委外工单
            this.txt_aboutGuid.EditChanged += (s, e) =>
@@ -95,6 +100,28 @@
            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
            Task.Delay(100);
            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_blNo, 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>
        /// åˆ†é¡µäº‹ä»¶
@@ -259,6 +286,13 @@
            toolBarMenu1.isSetBtn = false;
            string inGdId = txt_aboutGuid.GetId();//工单号
            string inCkId = txt_bl010.GetId();//发料仓
            string inFlOrg= txt_orgId.GetId();//发料组织
            if (string.IsNullOrEmpty(inFlOrg))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择发料组织!");
                txt_orgId.Focus();
                return;
            }
            if (string.IsNullOrEmpty(inGdId))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择工单!");
@@ -280,7 +314,7 @@
            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                inOrgId = "",//
                inOrgId = inFlOrg,//发料组织
                inGdId = inGdId,//工单号
                inCkId = inCkId,//仓库
                inYy = txt_bl007.Text.Trim(),//原因
@@ -323,11 +357,13 @@
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    lbGuid.Text = _rtn.rtnData;
                    lbGuid.Text = _rtn.rtnData.outGuid;
                    txt_blNo.Text = _rtn.rtnData.outNo;
                    toolBarMenu1.isSetBtn = true;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
                    toolBarMenu1.currentAction = "";
                }
            }
            catch (Exception ex)
@@ -344,7 +380,7 @@
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            // _sbSqlWhere += " and bl017=200";
            _sbSqlWhere += " and a.bl008='" + strType + "'";
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -401,10 +437,12 @@
                if (_rtn.rtnCode > 0)
                {
                    dynamic dy = _rtn.rtnData;
                    _ucCk = dy.bl010;
                    lbGuid.Text = strGuid;
                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                    gvList.Add(gvMx1);
                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
                    _ucCk = "";
                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
                    foreach (var a in _job["rtnData"]["list"])
@@ -562,5 +600,6 @@
                }
            }
        }
    }
}
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1447,6 +1447,7 @@
    <None Include="Resources\globalcolorscheme_32x32.png" />
    <None Include="Resources\globalcolorscheme_16x16.png" />
    <None Include="Resources\convert_16x161.png" />
    <None Include="Resources\time.svg" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />
DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1681,6 +1681,16 @@
        }
        
        /// <summary>
        ///   æŸ¥æ‰¾ DevExpress.Utils.Svg.SvgImage ç±»åž‹çš„æœ¬åœ°åŒ–资源。
        /// </summary>
        internal static DevExpress.Utils.Svg.SvgImage time {
            get {
                object obj = ResourceManager.GetObject("time", resourceCulture);
                return ((DevExpress.Utils.Svg.SvgImage)(obj));
            }
        }
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„æœ¬åœ°åŒ–资源。
        /// </summary>
        internal static System.Drawing.Bitmap time2_16x16 {
DevApp/Gs.DevApp/Properties/Resources.resx
@@ -124,6 +124,11 @@
  <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -135,13 +140,18 @@
  <data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\updatetableofcontents_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -206,9 +216,6 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -239,6 +246,9 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -247,8 +257,8 @@
  <data name="checkbox2_32x323" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -277,11 +287,13 @@
    <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
@@ -291,11 +303,6 @@
  <data name="up2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\up2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -304,11 +311,21 @@
  <data name="sortasc_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -336,8 +353,10 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -456,6 +475,9 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="convert_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\convert_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -490,8 +512,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -566,11 +588,6 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -611,6 +628,11 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -631,9 +653,6 @@
  </data>
  <data name="sortasc_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="meeting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\meeting_32x32.png;System.Drawing.Bitmap,
@@ -718,20 +737,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
@@ -752,10 +764,8 @@
    <value>..\Resources\login_bg6.png;System.Drawing.Bitmap, System.Drawing,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
@@ -767,29 +777,22 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbuttons_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="changedatasourcepivottable_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\changedatasourcepivottable_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -813,13 +816,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
  <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -840,8 +843,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -856,8 +859,8 @@
  <data name="add_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\add_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
  <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -874,7 +877,7 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="convert_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\convert_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
</root>
DevApp/Gs.DevApp/Resources/time.svg
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Scientific" style="enable-background:new 0 0 32 32">
  <style type="text/css">
    .Black{fill:#727272;}
    .Red{fill:#D11C1C;}
</style>
  <path d="M15,2C7.8,2,2,7.8,2,15s5.8,13,13,13s13-5.8,13-13S22.2,2,15,2z M15,26C8.9,26,4,21.1,4,15S8.9,4,15,4  s11,4.9,11,11S21.1,26,15,26z" class="Red" />
  <polygon points="16,14 16,6 14,6 14,14 14,16 16,16 22,16 22,14 " class="Black" />
</svg>
DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs
@@ -1,4 +1,5 @@
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -35,28 +36,31 @@
        {
            if (EditChanged != null) EditChanged(this, e);
        }
        public void getSuppler(string shopGuid)
        /// <summary>
        /// è¯»å–线体
        /// </summary>
        /// <param name="shopGuid"></param>
        public void getSuppler(string shopGuid, string _dftVale = "")
        {
            lookSearchSupplier.EditValue = null;
            if (string.IsNullOrEmpty(shopGuid))
                return;
            var _obj = new
            {
                guid = shopGuid //主建
            };
            var json = JsonConvert.SerializeObject(_obj);
            var _sbSqlWhere = " and a.dpt_id="+ shopGuid;
            var pgq = new PageQueryModel(1, 999999, "org.FNumber asc ,c.departmentcode asc,a.line_no",
            "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("",
                    "SysDepartmentManager/GetModel", json);
                var _job = JObject.Parse(strReturn);
                var array = new JArray();
                var d = _job["rtnData"]["list"];
                foreach (var a in d) array.Add(a);
                var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                    "MesWorkshopLineManager/GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                DataTable dt = dd.rtnData.list;
                lookSearchSupplier.Properties.DataSource = dt;
                lookSearchSupplier.Properties.DisplayMember = "name";
                lookSearchSupplier.Properties.ValueMember = "id";
                lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
                if (!string.IsNullOrEmpty(_dftVale))
                    SetIdOrCode(_dftVale);
            }
            catch (Exception ex)
            {
@@ -97,7 +101,8 @@
                lookSearchSupplier.EditValue = null;
                return;
            }
            lookSearchSupplier.EditValue = ((Code.ToString().Trim()));
            if (!string.IsNullOrEmpty(Code))
                lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
        }
    }
}
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -62,8 +62,8 @@
            this.btnZhongTai = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnJieAn = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnFjieAn = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnLayout = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
            this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -397,6 +397,7 @@
            this.btnTzbl.Caption = "通知备料";
            this.btnTzbl.Id = 41;
            this.btnTzbl.ImageOptions.ImageUri.Uri = "business%20objects/bo_security_permission_object";
            this.btnTzbl.ImageOptions.SvgImage = global::Gs.DevApp.Properties.Resources.time;
            this.btnTzbl.Name = "btnTzbl";
            this.btnTzbl.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            this.btnTzbl.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
@@ -444,6 +445,15 @@
            this.btnFjieAn.Name = "btnFjieAn";
            this.btnFjieAn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnLayout
            //
            this.btnLayout.Caption = "保存版面";
            this.btnLayout.Id = 51;
            this.btnLayout.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.globalcolorscheme_16x16;
            this.btnLayout.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.globalcolorscheme_32x32;
            this.btnLayout.Name = "btnLayout";
            this.btnLayout.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            //
            // btnHelp
            // 
            this.btnHelp.Caption = "帮助";
@@ -453,15 +463,6 @@
            this.btnHelp.ItemAppearance.Normal.Font = new System.Drawing.Font("Tahoma", 10F);
            this.btnHelp.ItemAppearance.Normal.Options.UseFont = true;
            this.btnHelp.Name = "btnHelp";
            //
            // btnLayout
            //
            this.btnLayout.Caption = "保存版面";
            this.btnLayout.Id = 51;
            this.btnLayout.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.globalcolorscheme_16x16;
            this.btnLayout.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.globalcolorscheme_32x32;
            this.btnLayout.Name = "btnLayout";
            this.btnLayout.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barDockControlTop
            // 
@@ -475,7 +476,7 @@
            // 
            this.barDockControlBottom.CausesValidation = false;
            this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 68);
            this.barDockControlBottom.Location = new System.Drawing.Point(0, 61);
            this.barDockControlBottom.Manager = this.barManager1;
            this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
            // 
@@ -504,7 +505,7 @@
            this.Controls.Add(this.barDockControlBottom);
            this.Controls.Add(this.barDockControlTop);
            this.Name = "UcToolBarMenu";
            this.Size = new System.Drawing.Size(1543, 68);
            this.Size = new System.Drawing.Size(1543, 61);
            ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();