DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs

@@ -30,20 +30,20 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
            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();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -131,6 +131,7 @@
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -755,35 +756,35 @@
            this.layoutControlItem12});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5});
            rowDefinition6,
            rowDefinition7,
            rowDefinition8,
            rowDefinition9,
            rowDefinition10});
            this.Root.Size = new System.Drawing.Size(1126, 177);
            this.Root.TextVisible = false;
            // 
@@ -1005,7 +1006,8 @@
            this.gvMx1erpid,
            this.gvMx1invWorkLine,
            this.gvMxDel,
            this.gridColumn6});
            this.gridColumn6,
            this.gridColumn8});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1149,7 +1151,7 @@
            this.gvMx1ysNum.Name = "gvMx1ysNum";
            this.gvMx1ysNum.Tag = "query_a.YS_NUM";
            this.gvMx1ysNum.Visible = true;
            this.gvMx1ysNum.VisibleIndex = 9;
            this.gvMx1ysNum.VisibleIndex = 10;
            this.gvMx1ysNum.Width = 94;
            // 
            // gvMx1remark
@@ -1165,7 +1167,7 @@
            this.gvMx1remark.Name = "gvMx1remark";
            this.gvMx1remark.Tag = "edit";
            this.gvMx1remark.Visible = true;
            this.gvMx1remark.VisibleIndex = 10;
            this.gvMx1remark.VisibleIndex = 9;
            this.gvMx1remark.Width = 94;
            // 
            // gvMx1orderNo
@@ -1217,16 +1219,16 @@
            this.gvMxDel.MinWidth = 25;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 11;
            this.gvMxDel.VisibleIndex = 12;
            this.gvMxDel.Width = 94;
            // 
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
@@ -1251,6 +1253,16 @@
            this.picCheckBox.TabIndex = 8;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // gridColumn8
            // 
            this.gridColumn8.Caption = "当前库存";
            this.gridColumn8.FieldName = "kcQty";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 11;
            this.gridColumn8.Width = 94;
            // 
            // Frm_MesCgthSq
            // 
@@ -1409,5 +1421,6 @@
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
    }
}

 DevApp/Gs.DevApp/DevFrm/QC/DefectCodeShouJian.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using DevExpress.XtraEditors;
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;

namespace Gs.DevApp.DevFrm.QC
{
    public partial class DefectCodeShouJian : DevExpress.XtraEditors.XtraForm
    {
        public DefectCodeShouJian()
        {
            InitializeComponent();
        }
    }
}

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs

@@ -28,8 +28,8 @@
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
            toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
@@ -239,119 +239,17 @@
                lbGuid, txt_releaseNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
        /// <summary>
        ///提交检验事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_releaseNo, gridView1, "releaseNo");
            toolBarMenu1.guidKey = rowGuid;
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定提审核吗？"))
                return;
            if (txt_fcheckResu.Text.Trim() == _strTag)
            {
                if (string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
                {
                    MsgHelper.Warning("单据为不合格时，请填写异常备注说明！");
                    return;
                }
            };
            var _obj = new
            {
                guid = rowGuid,
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation("提示：" + _rtn.rtnData.outMsg);
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim(), "0");
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    int _inFieldValue = 1;
                    UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString());
                }
                else {
                    MsgHelper.ShowError("提示：" + _rtn.rtnData.outMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.ShowError("提示：" + ex.Message);
            }
       

        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
        {
            _toolCk("EditModelSubmit");
        }
        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
        {
            _toolCk("EditModelSubmitZhiLiang");
        }

        /// <summary>
        /// æäº¤åæ£€éªŒ
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_releaseNo, gridView1, "releaseNo");
            toolBarMenu1.guidKey = rowGuid;
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定反审核吗？"))
                return;
            var _obj = new
            {
                guid = rowGuid,
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "EditModelSubmitZhiLiang",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
              
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation("提示：" + _rtn.rtnData.outMsg);
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim(), "0");
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    int _inFieldValue = 1;
                    UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString());
                }
                else {
                    MsgHelper.ShowError("提示：" + _rtn.rtnData.outMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
        /// <summary>
        /// å–消事件
        /// </summary>
@@ -714,5 +612,50 @@
        }
        #endregion


        /// <summary>
        /// æ£€éªŒå’Œåæ£€éªŒ
        /// </summary>
        /// <param name="inFieldValue"></param>
        private void _toolCk(string _meth)
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定操作吗？"))
                return;
            var _obj = new
            {
                guid = rowGuid,
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + _meth,
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示：" + _rtn.rtnData.outMsg);
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim(), "0");
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    int _inFieldValue = (_meth == "EditModelSubmit" ? 1 : -1);
                    UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString());
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
            }
        }

    }
}

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs

@@ -31,8 +31,8 @@
            toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
            toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
@@ -115,6 +115,8 @@
            };
        }



        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -171,24 +173,13 @@
            toolBarMenu1.guidKey = rowGuid;
        }

        /// <summary>
        ///  åæ£€éªŒ
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
        {
            _toolCk("EditModelSubmitF");
        }

        /// <summary>
        /// æ£€éªŒ
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
        {
            _toolCk("EditModelSubmit");
        }
        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
        {
            _toolCk("EditModelSubmitF");
        }
        /// <summary>
        ///     å–消事件
@@ -410,7 +401,7 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
                "asc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
@@ -577,7 +568,6 @@
                }
                var lst = new List<string>();
                lst.Add(mxGuid);

                var _obj = lst;
                try
                {
@@ -587,13 +577,14 @@
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {

                        MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    }
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                    else
                        MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            }
        }

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs

@@ -145,6 +145,7 @@
            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -153,7 +154,6 @@
            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -174,6 +174,7 @@
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -274,6 +275,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
@@ -282,7 +284,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
@@ -1193,7 +1194,7 @@
            // 
            this.layoutControl1.Controls.Add(this.txt_iCount_1);
            this.layoutControl1.Controls.Add(this.txt_yuliang_1);
            this.layoutControl1.Location = new System.Drawing.Point(692, 50);
            this.layoutControl1.Location = new System.Drawing.Point(692, 82);
            this.layoutControl1.Name = "layoutControl1";
            this.layoutControl1.Root = this.layoutControlGroup2;
            this.layoutControl1.Size = new System.Drawing.Size(336, 31);
@@ -1264,7 +1265,7 @@
            // 
            // radOut
            // 
            this.radOut.Location = new System.Drawing.Point(1033, -22);
            this.radOut.Location = new System.Drawing.Point(1033, 10);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1279,7 +1280,7 @@
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 15);
            this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 47);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
@@ -1298,7 +1299,7 @@
            // 
            // txtWlid
            // 
            this.txtWlid.Location = new System.Drawing.Point(114, -20);
            this.txtWlid.Location = new System.Drawing.Point(114, 12);
            this.txtWlid.Name = "txtWlid";
            this.txtWlid.Properties.Appearance.Options.UseFont = true;
            this.txtWlid.Properties.ReadOnly = true;
@@ -1308,7 +1309,7 @@
            // 
            // txt_psnQty_1
            // 
            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 15);
            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 47);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
@@ -1317,7 +1318,7 @@
            // 
            // txtWlmc
            // 
            this.txtWlmc.Location = new System.Drawing.Point(114, 15);
            this.txtWlmc.Location = new System.Drawing.Point(114, 47);
            this.txtWlmc.Name = "txtWlmc";
            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
            this.txtWlmc.Properties.ReadOnly = true;
@@ -1327,7 +1328,7 @@
            // 
            // txtWlgg
            // 
            this.txtWlgg.Location = new System.Drawing.Point(114, 50);
            this.txtWlgg.Location = new System.Drawing.Point(114, 82);
            this.txtWlgg.Name = "txtWlgg";
            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
            this.txtWlgg.Properties.ReadOnly = true;
@@ -1337,7 +1338,7 @@
            // 
            // txt_kQty
            // 
            this.txt_kQty.Location = new System.Drawing.Point(794, -20);
            this.txt_kQty.Location = new System.Drawing.Point(794, 12);
            this.txt_kQty.Name = "txt_kQty";
            this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_kQty.Properties.Appearance.Options.UseFont = true;
@@ -1349,7 +1350,7 @@
            // 
            // txtQuantity
            // 
            this.txtQuantity.Location = new System.Drawing.Point(454, -20);
            this.txtQuantity.Location = new System.Drawing.Point(454, 12);
            this.txtQuantity.Name = "txtQuantity";
            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
            this.txtQuantity.Properties.ReadOnly = true;
@@ -1359,13 +1360,25 @@
            // 
            // txtYdy
            // 
            this.txtYdy.Location = new System.Drawing.Point(454, 15);
            this.txtYdy.Location = new System.Drawing.Point(454, 47);
            this.txtYdy.Name = "txtYdy";
            this.txtYdy.Properties.Appearance.Options.UseFont = true;
            this.txtYdy.Properties.ReadOnly = true;
            this.txtYdy.Size = new System.Drawing.Size(234, 24);
            this.txtYdy.StyleController = this.layout99;
            this.txtYdy.TabIndex = 222;
            // 
            // layoutControlItem26
            // 
            this.layoutControlItem26.Control = this.lbMxGuid;
            this.layoutControlItem26.Location = new System.Drawing.Point(1020, 70);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem26.Size = new System.Drawing.Size(340, 35);
            this.layoutControlItem26.Text = "lbMxGuid";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem26.TextVisible = false;
            // 
            // layoutControlGroup1
            // 
@@ -1481,18 +1494,6 @@
            this.layoutControlItem25.Text = "每张条码数量";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem26
            // 
            this.layoutControlItem26.Control = this.lbMxGuid;
            this.layoutControlItem26.Location = new System.Drawing.Point(1020, 70);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem26.Size = new System.Drawing.Size(340, 35);
            this.layoutControlItem26.Text = "lbMxGuid";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem26.TextVisible = false;
            // 
            // layoutControlItem27
            // 
            this.layoutControlItem27.Control = this.ucBtnPrint1;
@@ -1562,7 +1563,8 @@
            this.gvMx1tld009,
            this.gridColumn1,
            this.gridColumn2,
            this.gvMxDel});
            this.gvMxDel,
            this.gridColumn18});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1658,7 +1660,7 @@
            this.gridColumn13.MinWidth = 25;
            this.gridColumn13.Name = "gridColumn13";
            this.gridColumn13.Visible = true;
            this.gridColumn13.VisibleIndex = 5;
            this.gridColumn13.VisibleIndex = 6;
            this.gridColumn13.Width = 94;
            // 
            // gvMx1tld006
@@ -1670,7 +1672,7 @@
            this.gvMx1tld006.Name = "gvMx1tld006";
            this.gvMx1tld006.Tag = "query_a.tld006";
            this.gvMx1tld006.Visible = true;
            this.gvMx1tld006.VisibleIndex = 6;
            this.gvMx1tld006.VisibleIndex = 7;
            this.gvMx1tld006.Width = 94;
            // 
            // gvMx1tld007
@@ -1682,7 +1684,7 @@
            this.gvMx1tld007.Name = "gvMx1tld007";
            this.gvMx1tld007.Tag = "query_a.tld007";
            this.gvMx1tld007.Visible = true;
            this.gvMx1tld007.VisibleIndex = 7;
            this.gvMx1tld007.VisibleIndex = 8;
            this.gvMx1tld007.Width = 94;
            // 
            // gvMx1tld009
@@ -1702,7 +1704,7 @@
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 8;
            this.gridColumn1.VisibleIndex = 9;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn2
@@ -1712,7 +1714,7 @@
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 9;
            this.gridColumn2.VisibleIndex = 10;
            this.gridColumn2.Width = 94;
            // 
            // gvMxDel
@@ -1722,7 +1724,7 @@
            this.gvMxDel.MinWidth = 25;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 10;
            this.gvMxDel.VisibleIndex = 11;
            this.gvMxDel.Width = 94;
            // 
            // repositoryItemButtonEdit1
@@ -1735,6 +1737,21 @@
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            // 
            // gridColumn18
            // 
            this.gridColumn18.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn18.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn18.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn18.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn18.Caption = "备注";
            this.gridColumn18.FieldName = "tld014";
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Tag = "edit";
            this.gridColumn18.Visible = true;
            this.gridColumn18.VisibleIndex = 5;
            this.gridColumn18.Width = 94;
            // 
            // xtraTabPage3
            // 
@@ -2040,6 +2057,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
@@ -2048,7 +2066,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
@@ -2199,5 +2216,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
        private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
    }
}

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs

@@ -451,11 +451,18 @@
                        MsgHelper.ShowError("申请数量不能为空！");
                        return;
                    }
                    _sl = row["tld014"].ToString();
                    if (string.IsNullOrEmpty(_sl))
                    {
                        MsgHelper.ShowError("退料备注不能为空！");
                        return;
                    }
                    _obj.list.Add(new
                    {
                        Guid = _guid,
                        AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
                        Sl = _sl //申请数量
                        Sl = _sl, //申请数量
                        Remark = row["tld014"].ToString()
                    });
                }
            }
@@ -490,7 +497,7 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -756,8 +763,9 @@
                txtYdy.Text = row["ydy"].ToString();//已打印总量
                txt_kQty.Text = row["kdy"].ToString();//可打印总量
            }
            else {
                lbMxGuid.Text ="";
            else
            {
                lbMxGuid.Text = "";
                toolBarMenu1.guidKey = "";
                txtWlid.Text = "";
                txtWlgg.Text = "";

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs

@@ -236,16 +236,7 @@
            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx3 = new DevExpress.XtraGrid.GridControl();
            this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx98 = new DevExpress.XtraLayout.LayoutControl();
            this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.txt_yQty98 = new DevExpress.XtraEditors.TextEdit();
@@ -260,17 +251,18 @@
            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
            this.gcMx3 = new DevExpress.XtraGrid.GridControl();
            this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx4 = new DevExpress.XtraGrid.GridControl();
            this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn44 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn45 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.splitMx100 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layMx100 = new DevExpress.XtraDataLayout.DataLayoutControl();
            this.ucBtnPrint100 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
@@ -285,11 +277,19 @@
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem();
            this.gcMx4 = new DevExpress.XtraGrid.GridControl();
            this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn44 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn45 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
            this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
            this.splitMx100 = new DevExpress.XtraEditors.SplitContainerControl();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -397,8 +397,12 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
            this.xtraTabPage3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).BeginInit();
            this.splitMx98.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).BeginInit();
            this.splitMx98.Panel2.SuspendLayout();
            this.splitMx98.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).BeginInit();
            this.layoutMx98.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).BeginInit();
@@ -413,9 +417,15 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
            this.xtraTabPage4.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx100)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel1)).BeginInit();
            this.splitMx100.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel2)).BeginInit();
            this.splitMx100.Panel2.SuspendLayout();
            this.splitMx100.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layMx100)).BeginInit();
            this.layMx100.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty100.Properties)).BeginInit();
@@ -429,19 +439,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
            this.xtraTabPage5.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).BeginInit();
            this.splitMx98.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).BeginInit();
            this.splitMx98.Panel2.SuspendLayout();
            this.splitMx98.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx100)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel1)).BeginInit();
            this.splitMx100.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel2)).BeginInit();
            this.splitMx100.Panel2.SuspendLayout();
            this.splitMx100.SuspendLayout();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -1989,6 +1989,7 @@
            // 
            this.splitMx99.Panel2.Controls.Add(this.gcMx2);
            this.splitMx99.Panel2.Text = "Panel2";
            this.splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
            this.splitMx99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx99.Size = new System.Drawing.Size(1648, 481);
            this.splitMx99.SplitterPosition = 83;
@@ -2007,9 +2008,9 @@
            this.layoutMx99.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx99.Location = new System.Drawing.Point(0, 0);
            this.layoutMx99.Name = "layoutMx99";
            this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(221, 389, 812, 500);
            this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(312, 530, 812, 500);
            this.layoutMx99.Root = this.layoutControlGroup1;
            this.layoutMx99.Size = new System.Drawing.Size(1648, 83);
            this.layoutMx99.Size = new System.Drawing.Size(0, 0);
            this.layoutMx99.TabIndex = 0;
            this.layoutMx99.Text = "layoutControl1";
            // 
@@ -2242,7 +2243,7 @@
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
            this.layoutControlItem26.Size = new System.Drawing.Size(321, 32);
            this.layoutControlItem26.Text = "报工打印";
            this.layoutControlItem26.Text = "托板打印";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem26.TextVisible = false;
            // 
@@ -2311,7 +2312,7 @@
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.rptChongDa});
            this.gcMx2.Size = new System.Drawing.Size(1648, 386);
            this.gcMx2.Size = new System.Drawing.Size(1648, 481);
            this.gcMx2.TabIndex = 0;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
@@ -2517,130 +2518,27 @@
            this.xtraTabPage3.Size = new System.Drawing.Size(1648, 481);
            this.xtraTabPage3.Text = "追溯码明细";
            // 
            // gcMx3
            // splitMx98
            // 
            this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx3.Location = new System.Drawing.Point(0, 0);
            this.gcMx3.MainView = this.gvMx3;
            this.gcMx3.Name = "gcMx3";
            this.gcMx3.Size = new System.Drawing.Size(1648, 417);
            this.gcMx3.TabIndex = 1;
            this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx3});
            this.splitMx98.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitMx98.Horizontal = false;
            this.splitMx98.Location = new System.Drawing.Point(0, 0);
            this.splitMx98.Name = "splitMx98";
            // 
            // gvMx3
            // splitMx98.Panel1
            // 
            this.gvMx3.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gvMx3.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gvMx3.Appearance.Row.Options.UseFont = true;
            this.gvMx3.ColumnPanelRowHeight = 50;
            this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn33,
            this.gridColumn38,
            this.gridColumn36,
            this.gridColumn37,
            this.gridColumn42,
            this.gridColumn43,
            this.gridColumn34,
            this.gridColumn35});
            this.gvMx3.GridControl = this.gcMx3;
            this.gvMx3.Name = "gvMx3";
            this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx3.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx3.OptionsView.ShowFooter = true;
            this.gvMx3.OptionsView.ShowGroupPanel = false;
            this.splitMx98.Panel1.Controls.Add(this.layoutMx98);
            this.splitMx98.Panel1.Text = "Panel1";
            // 
            // gridColumn33
            // splitMx98.Panel2
            // 
            this.gridColumn33.AppearanceCell.Options.UseFont = true;
            this.gridColumn33.Caption = "guid ";
            this.gridColumn33.FieldName = "guid";
            this.gridColumn33.MinWidth = 50;
            this.gridColumn33.Name = "gridColumn33";
            this.gridColumn33.Tag = "query_a.guid";
            this.gridColumn33.Width = 94;
            // 
            // gridColumn38
            // 
            this.gridColumn38.AppearanceCell.Options.UseFont = true;
            this.gridColumn38.Caption = "工单号";
            this.gridColumn38.FieldName = "daa001";
            this.gridColumn38.MinWidth = 50;
            this.gridColumn38.Name = "gridColumn38";
            this.gridColumn38.Tag = "query_a.UNIT";
            this.gridColumn38.Visible = true;
            this.gridColumn38.VisibleIndex = 0;
            this.gridColumn38.Width = 94;
            // 
            // gridColumn36
            // 
            this.gridColumn36.AppearanceCell.Options.UseFont = true;
            this.gridColumn36.Caption = "追溯码";
            this.gridColumn36.FieldName = "barCode";
            this.gridColumn36.MinWidth = 50;
            this.gridColumn36.Name = "gridColumn36";
            this.gridColumn36.Tag = "query_a.ITEM_BARCODE";
            this.gridColumn36.Visible = true;
            this.gridColumn36.VisibleIndex = 1;
            this.gridColumn36.Width = 94;
            // 
            // gridColumn37
            // 
            this.gridColumn37.AppearanceCell.Options.UseFont = true;
            this.gridColumn37.Caption = "数量 ";
            this.gridColumn37.FieldName = "quantity";
            this.gridColumn37.MinWidth = 50;
            this.gridColumn37.Name = "gridColumn37";
            this.gridColumn37.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计：{0:0.##}")});
            this.gridColumn37.Tag = "query_a.QUANTITY";
            this.gridColumn37.Visible = true;
            this.gridColumn37.VisibleIndex = 2;
            this.gridColumn37.Width = 94;
            // 
            // gridColumn42
            // 
            this.gridColumn42.AppearanceCell.Options.UseFont = true;
            this.gridColumn42.Caption = "创建人 ";
            this.gridColumn42.FieldName = "createBy";
            this.gridColumn42.MinWidth = 50;
            this.gridColumn42.Name = "gridColumn42";
            this.gridColumn42.Tag = "query_a.CREATE_BY";
            this.gridColumn42.Visible = true;
            this.gridColumn42.VisibleIndex = 3;
            this.gridColumn42.Width = 94;
            // 
            // gridColumn43
            // 
            this.gridColumn43.AppearanceCell.Options.UseFont = true;
            this.gridColumn43.Caption = "创建时间 ";
            this.gridColumn43.FieldName = "createDate";
            this.gridColumn43.MinWidth = 50;
            this.gridColumn43.Name = "gridColumn43";
            this.gridColumn43.Tag = "query_a.CREATE_DATE";
            this.gridColumn43.Visible = true;
            this.gridColumn43.VisibleIndex = 4;
            this.gridColumn43.Width = 94;
            // 
            // gridColumn34
            // 
            this.gridColumn34.Caption = "线别ID";
            this.gridColumn34.FieldName = "lineId";
            this.gridColumn34.MinWidth = 25;
            this.gridColumn34.Name = "gridColumn34";
            this.gridColumn34.Visible = true;
            this.gridColumn34.VisibleIndex = 5;
            this.gridColumn34.Width = 94;
            // 
            // gridColumn35
            // 
            this.gridColumn35.Caption = "线别名称";
            this.gridColumn35.FieldName = "xtName";
            this.gridColumn35.MinWidth = 25;
            this.gridColumn35.Name = "gridColumn35";
            this.gridColumn35.Visible = true;
            this.gridColumn35.VisibleIndex = 6;
            this.gridColumn35.Width = 94;
            this.splitMx98.Panel2.Controls.Add(this.gcMx3);
            this.splitMx98.Panel2.Text = "Panel2";
            this.splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
            this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx98.Size = new System.Drawing.Size(1648, 481);
            this.splitMx98.SplitterPosition = 52;
            this.splitMx98.TabIndex = 2;
            // 
            // layoutMx98
            // 
@@ -2655,7 +2553,7 @@
            this.layoutMx98.Name = "layoutMx98";
            this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(96, 558, 812, 500);
            this.layoutMx98.Root = this.layoutControlGroup2;
            this.layoutMx98.Size = new System.Drawing.Size(1648, 52);
            this.layoutMx98.Size = new System.Drawing.Size(0, 0);
            this.layoutMx98.TabIndex = 0;
            this.layoutMx98.Text = "layoutControl1";
            // 
@@ -2812,6 +2710,131 @@
            this.layoutControlItem37.Text = "工单总量";
            this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
            // 
            // gcMx3
            // 
            this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx3.Location = new System.Drawing.Point(0, 0);
            this.gcMx3.MainView = this.gvMx3;
            this.gcMx3.Name = "gcMx3";
            this.gcMx3.Size = new System.Drawing.Size(1648, 481);
            this.gcMx3.TabIndex = 1;
            this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx3});
            // 
            // gvMx3
            // 
            this.gvMx3.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gvMx3.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gvMx3.Appearance.Row.Options.UseFont = true;
            this.gvMx3.ColumnPanelRowHeight = 50;
            this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn33,
            this.gridColumn38,
            this.gridColumn36,
            this.gridColumn37,
            this.gridColumn42,
            this.gridColumn43,
            this.gridColumn34,
            this.gridColumn35});
            this.gvMx3.GridControl = this.gcMx3;
            this.gvMx3.Name = "gvMx3";
            this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx3.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx3.OptionsView.ShowFooter = true;
            this.gvMx3.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn33
            // 
            this.gridColumn33.AppearanceCell.Options.UseFont = true;
            this.gridColumn33.Caption = "guid ";
            this.gridColumn33.FieldName = "guid";
            this.gridColumn33.MinWidth = 50;
            this.gridColumn33.Name = "gridColumn33";
            this.gridColumn33.Tag = "query_a.guid";
            this.gridColumn33.Width = 94;
            // 
            // gridColumn38
            // 
            this.gridColumn38.AppearanceCell.Options.UseFont = true;
            this.gridColumn38.Caption = "工单号";
            this.gridColumn38.FieldName = "daa001";
            this.gridColumn38.MinWidth = 50;
            this.gridColumn38.Name = "gridColumn38";
            this.gridColumn38.Tag = "query_a.UNIT";
            this.gridColumn38.Visible = true;
            this.gridColumn38.VisibleIndex = 0;
            this.gridColumn38.Width = 94;
            // 
            // gridColumn36
            // 
            this.gridColumn36.AppearanceCell.Options.UseFont = true;
            this.gridColumn36.Caption = "追溯码";
            this.gridColumn36.FieldName = "barCode";
            this.gridColumn36.MinWidth = 50;
            this.gridColumn36.Name = "gridColumn36";
            this.gridColumn36.Tag = "query_a.ITEM_BARCODE";
            this.gridColumn36.Visible = true;
            this.gridColumn36.VisibleIndex = 1;
            this.gridColumn36.Width = 94;
            // 
            // gridColumn37
            // 
            this.gridColumn37.AppearanceCell.Options.UseFont = true;
            this.gridColumn37.Caption = "数量 ";
            this.gridColumn37.FieldName = "quantity";
            this.gridColumn37.MinWidth = 50;
            this.gridColumn37.Name = "gridColumn37";
            this.gridColumn37.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计：{0:0.##}")});
            this.gridColumn37.Tag = "query_a.QUANTITY";
            this.gridColumn37.Visible = true;
            this.gridColumn37.VisibleIndex = 2;
            this.gridColumn37.Width = 94;
            // 
            // gridColumn42
            // 
            this.gridColumn42.AppearanceCell.Options.UseFont = true;
            this.gridColumn42.Caption = "创建人 ";
            this.gridColumn42.FieldName = "createBy";
            this.gridColumn42.MinWidth = 50;
            this.gridColumn42.Name = "gridColumn42";
            this.gridColumn42.Tag = "query_a.CREATE_BY";
            this.gridColumn42.Visible = true;
            this.gridColumn42.VisibleIndex = 3;
            this.gridColumn42.Width = 94;
            // 
            // gridColumn43
            // 
            this.gridColumn43.AppearanceCell.Options.UseFont = true;
            this.gridColumn43.Caption = "创建时间 ";
            this.gridColumn43.FieldName = "createDate";
            this.gridColumn43.MinWidth = 50;
            this.gridColumn43.Name = "gridColumn43";
            this.gridColumn43.Tag = "query_a.CREATE_DATE";
            this.gridColumn43.Visible = true;
            this.gridColumn43.VisibleIndex = 4;
            this.gridColumn43.Width = 94;
            // 
            // gridColumn34
            // 
            this.gridColumn34.Caption = "线别ID";
            this.gridColumn34.FieldName = "lineId";
            this.gridColumn34.MinWidth = 25;
            this.gridColumn34.Name = "gridColumn34";
            this.gridColumn34.Visible = true;
            this.gridColumn34.VisibleIndex = 5;
            this.gridColumn34.Width = 94;
            // 
            // gridColumn35
            // 
            this.gridColumn35.Caption = "线别名称";
            this.gridColumn35.FieldName = "xtName";
            this.gridColumn35.MinWidth = 25;
            this.gridColumn35.Name = "gridColumn35";
            this.gridColumn35.Visible = true;
            this.gridColumn35.VisibleIndex = 6;
            this.gridColumn35.Width = 94;
            // 
            // xtraTabPage4
            // 
            this.xtraTabPage4.Controls.Add(this.splitMx100);
@@ -2819,130 +2842,27 @@
            this.xtraTabPage4.Size = new System.Drawing.Size(1648, 481);
            this.xtraTabPage4.Text = "后盖码明细";
            // 
            // gcMx4
            // splitMx100
            // 
            this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx4.Location = new System.Drawing.Point(0, 0);
            this.gcMx4.MainView = this.gvMx4;
            this.gcMx4.Name = "gcMx4";
            this.gcMx4.Size = new System.Drawing.Size(1648, 417);
            this.gcMx4.TabIndex = 2;
            this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx4});
            this.splitMx100.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitMx100.Horizontal = false;
            this.splitMx100.Location = new System.Drawing.Point(0, 0);
            this.splitMx100.Name = "splitMx100";
            // 
            // gvMx4
            // splitMx100.Panel1
            // 
            this.gvMx4.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gvMx4.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gvMx4.Appearance.Row.Options.UseFont = true;
            this.gvMx4.ColumnPanelRowHeight = 50;
            this.gvMx4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn39,
            this.gridColumn40,
            this.gridColumn41,
            this.gridColumn44,
            this.gridColumn45,
            this.gridColumn46,
            this.gridColumn47,
            this.gridColumn48});
            this.gvMx4.GridControl = this.gcMx4;
            this.gvMx4.Name = "gvMx4";
            this.gvMx4.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx4.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx4.OptionsView.ShowFooter = true;
            this.gvMx4.OptionsView.ShowGroupPanel = false;
            this.splitMx100.Panel1.Controls.Add(this.layMx100);
            this.splitMx100.Panel1.Text = "Panel1";
            // 
            // gridColumn39
            // splitMx100.Panel2
            // 
            this.gridColumn39.AppearanceCell.Options.UseFont = true;
            this.gridColumn39.Caption = "guid ";
            this.gridColumn39.FieldName = "guid";
            this.gridColumn39.MinWidth = 50;
            this.gridColumn39.Name = "gridColumn39";
            this.gridColumn39.Tag = "query_a.guid";
            this.gridColumn39.Width = 94;
            // 
            // gridColumn40
            // 
            this.gridColumn40.AppearanceCell.Options.UseFont = true;
            this.gridColumn40.Caption = "工单号";
            this.gridColumn40.FieldName = "daa001";
            this.gridColumn40.MinWidth = 50;
            this.gridColumn40.Name = "gridColumn40";
            this.gridColumn40.Tag = "query_a.UNIT";
            this.gridColumn40.Visible = true;
            this.gridColumn40.VisibleIndex = 0;
            this.gridColumn40.Width = 94;
            // 
            // gridColumn41
            // 
            this.gridColumn41.AppearanceCell.Options.UseFont = true;
            this.gridColumn41.Caption = "后盖码";
            this.gridColumn41.FieldName = "itemBarcode";
            this.gridColumn41.MinWidth = 50;
            this.gridColumn41.Name = "gridColumn41";
            this.gridColumn41.Tag = "query_a.ITEM_BARCODE";
            this.gridColumn41.Visible = true;
            this.gridColumn41.VisibleIndex = 1;
            this.gridColumn41.Width = 94;
            // 
            // gridColumn44
            // 
            this.gridColumn44.AppearanceCell.Options.UseFont = true;
            this.gridColumn44.Caption = "数量 ";
            this.gridColumn44.FieldName = "quantity";
            this.gridColumn44.MinWidth = 50;
            this.gridColumn44.Name = "gridColumn44";
            this.gridColumn44.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计：{0:0.##}")});
            this.gridColumn44.Tag = "query_a.QUANTITY";
            this.gridColumn44.Visible = true;
            this.gridColumn44.VisibleIndex = 2;
            this.gridColumn44.Width = 94;
            // 
            // gridColumn45
            // 
            this.gridColumn45.AppearanceCell.Options.UseFont = true;
            this.gridColumn45.Caption = "创建人 ";
            this.gridColumn45.FieldName = "createBy";
            this.gridColumn45.MinWidth = 50;
            this.gridColumn45.Name = "gridColumn45";
            this.gridColumn45.Tag = "query_a.CREATE_BY";
            this.gridColumn45.Visible = true;
            this.gridColumn45.VisibleIndex = 3;
            this.gridColumn45.Width = 94;
            // 
            // gridColumn46
            // 
            this.gridColumn46.AppearanceCell.Options.UseFont = true;
            this.gridColumn46.Caption = "创建时间 ";
            this.gridColumn46.FieldName = "createDate";
            this.gridColumn46.MinWidth = 50;
            this.gridColumn46.Name = "gridColumn46";
            this.gridColumn46.Tag = "query_a.CREATE_DATE";
            this.gridColumn46.Visible = true;
            this.gridColumn46.VisibleIndex = 4;
            this.gridColumn46.Width = 94;
            // 
            // gridColumn47
            // 
            this.gridColumn47.Caption = "已绑托板码";
            this.gridColumn47.FieldName = "aboutTbBarcode";
            this.gridColumn47.MinWidth = 25;
            this.gridColumn47.Name = "gridColumn47";
            this.gridColumn47.Visible = true;
            this.gridColumn47.VisibleIndex = 5;
            this.gridColumn47.Width = 94;
            // 
            // gridColumn48
            // 
            this.gridColumn48.Caption = "已绑追溯码";
            this.gridColumn48.FieldName = "aboutTracBarcode";
            this.gridColumn48.MinWidth = 25;
            this.gridColumn48.Name = "gridColumn48";
            this.gridColumn48.Visible = true;
            this.gridColumn48.VisibleIndex = 6;
            this.gridColumn48.Width = 94;
            this.splitMx100.Panel2.Controls.Add(this.gcMx4);
            this.splitMx100.Panel2.Text = "Panel2";
            this.splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
            this.splitMx100.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx100.Size = new System.Drawing.Size(1648, 481);
            this.splitMx100.SplitterPosition = 52;
            this.splitMx100.TabIndex = 3;
            // 
            // layMx100
            // 
@@ -2957,7 +2877,7 @@
            this.layMx100.Name = "layMx100";
            this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(359, 336, 812, 500);
            this.layMx100.Root = this.layoutControlGroup4;
            this.layMx100.Size = new System.Drawing.Size(1648, 52);
            this.layMx100.Size = new System.Drawing.Size(0, 0);
            this.layMx100.TabIndex = 2;
            this.layMx100.Text = "dataLayoutControl1";
            // 
@@ -3117,10 +3037,136 @@
            this.layoutControlItem45.Text = "本次打印张数";
            this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
            // 
            // gcMx4
            // 
            this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx4.Location = new System.Drawing.Point(0, 0);
            this.gcMx4.MainView = this.gvMx4;
            this.gcMx4.Name = "gcMx4";
            this.gcMx4.Size = new System.Drawing.Size(1648, 481);
            this.gcMx4.TabIndex = 2;
            this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx4});
            // 
            // gvMx4
            // 
            this.gvMx4.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gvMx4.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gvMx4.Appearance.Row.Options.UseFont = true;
            this.gvMx4.ColumnPanelRowHeight = 50;
            this.gvMx4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn39,
            this.gridColumn40,
            this.gridColumn41,
            this.gridColumn44,
            this.gridColumn45,
            this.gridColumn46,
            this.gridColumn47,
            this.gridColumn48});
            this.gvMx4.GridControl = this.gcMx4;
            this.gvMx4.Name = "gvMx4";
            this.gvMx4.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx4.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx4.OptionsView.ShowFooter = true;
            this.gvMx4.OptionsView.ShowGroupPanel = false;
            // 
            // gridColumn39
            // 
            this.gridColumn39.AppearanceCell.Options.UseFont = true;
            this.gridColumn39.Caption = "guid ";
            this.gridColumn39.FieldName = "guid";
            this.gridColumn39.MinWidth = 50;
            this.gridColumn39.Name = "gridColumn39";
            this.gridColumn39.Tag = "query_a.guid";
            this.gridColumn39.Width = 94;
            // 
            // gridColumn40
            // 
            this.gridColumn40.AppearanceCell.Options.UseFont = true;
            this.gridColumn40.Caption = "工单号";
            this.gridColumn40.FieldName = "daa001";
            this.gridColumn40.MinWidth = 50;
            this.gridColumn40.Name = "gridColumn40";
            this.gridColumn40.Tag = "query_a.UNIT";
            this.gridColumn40.Visible = true;
            this.gridColumn40.VisibleIndex = 0;
            this.gridColumn40.Width = 94;
            // 
            // gridColumn41
            // 
            this.gridColumn41.AppearanceCell.Options.UseFont = true;
            this.gridColumn41.Caption = "后盖码";
            this.gridColumn41.FieldName = "itemBarcode";
            this.gridColumn41.MinWidth = 50;
            this.gridColumn41.Name = "gridColumn41";
            this.gridColumn41.Tag = "query_a.ITEM_BARCODE";
            this.gridColumn41.Visible = true;
            this.gridColumn41.VisibleIndex = 1;
            this.gridColumn41.Width = 94;
            // 
            // gridColumn44
            // 
            this.gridColumn44.AppearanceCell.Options.UseFont = true;
            this.gridColumn44.Caption = "数量 ";
            this.gridColumn44.FieldName = "quantity";
            this.gridColumn44.MinWidth = 50;
            this.gridColumn44.Name = "gridColumn44";
            this.gridColumn44.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计：{0:0.##}")});
            this.gridColumn44.Tag = "query_a.QUANTITY";
            this.gridColumn44.Visible = true;
            this.gridColumn44.VisibleIndex = 2;
            this.gridColumn44.Width = 94;
            // 
            // gridColumn45
            // 
            this.gridColumn45.AppearanceCell.Options.UseFont = true;
            this.gridColumn45.Caption = "创建人 ";
            this.gridColumn45.FieldName = "createBy";
            this.gridColumn45.MinWidth = 50;
            this.gridColumn45.Name = "gridColumn45";
            this.gridColumn45.Tag = "query_a.CREATE_BY";
            this.gridColumn45.Visible = true;
            this.gridColumn45.VisibleIndex = 3;
            this.gridColumn45.Width = 94;
            // 
            // gridColumn46
            // 
            this.gridColumn46.AppearanceCell.Options.UseFont = true;
            this.gridColumn46.Caption = "创建时间 ";
            this.gridColumn46.FieldName = "createDate";
            this.gridColumn46.MinWidth = 50;
            this.gridColumn46.Name = "gridColumn46";
            this.gridColumn46.Tag = "query_a.CREATE_DATE";
            this.gridColumn46.Visible = true;
            this.gridColumn46.VisibleIndex = 4;
            this.gridColumn46.Width = 94;
            // 
            // gridColumn47
            // 
            this.gridColumn47.Caption = "已绑托板码";
            this.gridColumn47.FieldName = "aboutTbBarcode";
            this.gridColumn47.MinWidth = 25;
            this.gridColumn47.Name = "gridColumn47";
            this.gridColumn47.Visible = true;
            this.gridColumn47.VisibleIndex = 5;
            this.gridColumn47.Width = 94;
            // 
            // gridColumn48
            // 
            this.gridColumn48.Caption = "已绑追溯码";
            this.gridColumn48.FieldName = "aboutTracBarcode";
            this.gridColumn48.MinWidth = 25;
            this.gridColumn48.Name = "gridColumn48";
            this.gridColumn48.Visible = true;
            this.gridColumn48.VisibleIndex = 6;
            this.gridColumn48.Width = 94;
            // 
            // xtraTabPage5
            // 
            this.xtraTabPage5.Controls.Add(this.ucBtnPrint101);
            this.xtraTabPage5.Name = "xtraTabPage5";
            this.xtraTabPage5.PageVisible = false;
            this.xtraTabPage5.Size = new System.Drawing.Size(1648, 481);
            this.xtraTabPage5.Text = "物料齐套标识卡";
            // 
@@ -3133,48 +3179,6 @@
            this.ucBtnPrint101.rptParameter = null;
            this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
            this.ucBtnPrint101.TabIndex = 0;
            // 
            // splitMx98
            // 
            this.splitMx98.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitMx98.Horizontal = false;
            this.splitMx98.Location = new System.Drawing.Point(0, 0);
            this.splitMx98.Name = "splitMx98";
            // 
            // splitMx98.splitMx98_Panel1
            // 
            this.splitMx98.Panel1.Controls.Add(this.layoutMx98);
            this.splitMx98.Panel1.Text = "Panel1";
            // 
            // splitMx98.splitMx98_Panel2
            // 
            this.splitMx98.Panel2.Controls.Add(this.gcMx3);
            this.splitMx98.Panel2.Text = "Panel2";
            this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx98.Size = new System.Drawing.Size(1648, 481);
            this.splitMx98.SplitterPosition = 52;
            this.splitMx98.TabIndex = 2;
            // 
            // splitMx100
            // 
            this.splitMx100.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitMx100.Horizontal = false;
            this.splitMx100.Location = new System.Drawing.Point(0, 0);
            this.splitMx100.Name = "splitMx100";
            // 
            // splitMx100.splitMx100_Panel1
            // 
            this.splitMx100.Panel1.Controls.Add(this.layMx100);
            this.splitMx100.Panel1.Text = "Panel1";
            // 
            // splitMx100.splitMx100_Panel2
            // 
            this.splitMx100.Panel2.Controls.Add(this.gcMx4);
            this.splitMx100.Panel2.Text = "Panel2";
            this.splitMx100.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx100.Size = new System.Drawing.Size(1648, 481);
            this.splitMx100.SplitterPosition = 52;
            this.splitMx100.TabIndex = 3;
            // 
            // Frm_Womdaa
            // 
@@ -3292,8 +3296,12 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
            this.xtraTabPage3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).EndInit();
            this.splitMx98.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).EndInit();
            this.splitMx98.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).EndInit();
            this.splitMx98.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).EndInit();
            this.layoutMx98.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).EndInit();
@@ -3308,9 +3316,15 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
            this.xtraTabPage4.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel1)).EndInit();
            this.splitMx100.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel2)).EndInit();
            this.splitMx100.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx100)).EndInit();
            this.splitMx100.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layMx100)).EndInit();
            this.layMx100.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty100.Properties)).EndInit();
@@ -3324,19 +3338,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
            this.xtraTabPage5.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).EndInit();
            this.splitMx98.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).EndInit();
            this.splitMx98.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).EndInit();
            this.splitMx98.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel1)).EndInit();
            this.splitMx100.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel2)).EndInit();
            this.splitMx100.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx100)).EndInit();
            this.splitMx100.ResumeLayout(false);
            this.ResumeLayout(false);

        }

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs

@@ -124,7 +124,7 @@
                frm.ShowDialog();
            };
        }
 

        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -562,6 +562,32 @@
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx4, gvMx4);
                    }
                    //加上打印权限
                    JArray array5 = new JArray();
                    foreach (var a in _job["rtnData"]["list5"])
                    {
                        if (a["blackName"].ToString() == "托板码打印")
                        {
                            splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
                            continue;
                        }
                        if (a["blackName"].ToString() == "追溯码打印")
                        {
                            splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
                            continue;
                        }
                        if (a["blackName"].ToString() == "后盖码打印")
                        {
                            splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both;
                            continue;
                        }
                        if (a["blackName"].ToString() == "齐套标识卡打印")
                        {
                            xtraTabPage5.PageVisible = true;
                            continue;
                        }
                    }

                    txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
                }
                else

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs

@@ -382,6 +382,12 @@
                        MsgHelper.ShowError("申请数量不能为空！");
                        return;
                    }
                    _sl = row["tld014"].ToString();
                    if (string.IsNullOrEmpty(_sl))
                    {
                        MsgHelper.ShowError("退料备注不能为空！");
                        return;
                    }
                    _obj.list.Add(new
                    {
                        Guid = _guid,

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -461,6 +461,12 @@
    <Compile Include="DevFrm\QC\DefectCodeDaa.Designer.cs">
      <DependentUpon>DefectCodeDaa.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\DefectCodeShouJian.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\QC\DefectCodeShouJian.Designer.cs">
      <DependentUpon>DefectCodeShouJian.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\QC\DefectCodeXianChang.cs">
      <SubType>Form</SubType>
    </Compile>
@@ -2060,6 +2066,13 @@
    <None Include="Resources\historyitem_16x16.png" />
    <None Include="Resources\usergroup_16x16.png" />
    <None Include="Resources\usergroup_16x161.png" />
    <None Include="Resources\print_32x32.png" />
    <None Include="Resources\print_32x321.png" />
    <None Include="Resources\print_16x161.png" />
    <None Include="Resources\print_32x322.png" />
    <None Include="Resources\print_16x162.png" />
    <None Include="Resources\printer_32x32.png" />
    <None Include="Resources\printer_16x16.png" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />

 DevApp/Gs.DevApp/Properties/Resources.Designer.cs

@@ -1833,6 +1833,66 @@
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap print_16x16 {
            get {
                object obj = ResourceManager.GetObject("print_16x16", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap print_16x161 {
            get {
                object obj = ResourceManager.GetObject("print_16x161", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap print_16x162 {
            get {
                object obj = ResourceManager.GetObject("print_16x162", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap print_32x32 {
            get {
                object obj = ResourceManager.GetObject("print_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap print_32x321 {
            get {
                object obj = ResourceManager.GetObject("print_32x321", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap print_32x322 {
            get {
                object obj = ResourceManager.GetObject("print_32x322", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap printarea_32x32 {
            get {
                object obj = ResourceManager.GetObject("printarea_32x32", resourceCulture);
@@ -1843,6 +1903,26 @@
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap printer_16x16 {
            get {
                object obj = ResourceManager.GetObject("printer_16x16", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap printer_32x32 {
            get {
                object obj = ResourceManager.GetObject("printer_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap printernetwork_16x16 {
            get {
                object obj = ResourceManager.GetObject("printernetwork_16x16", resourceCulture);

 DevApp/Gs.DevApp/Properties/Resources.resx

@@ -121,8 +121,8 @@
  <data name="iconsetarrows3_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\iconsetarrows3_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\meeting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="print_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\print_16x162.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,
@@ -146,10 +146,8 @@
  <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="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="print_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\print_16x16.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>
@@ -213,6 +211,9 @@
  <data name="converttorange_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="splinearea_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\splinearea_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -267,10 +268,8 @@
  <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_16x16.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="bouser_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bouser_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -284,15 +283,13 @@
  <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap,
  <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="richeditcleartablestyle_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\richeditcleartablestyle_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -319,14 +316,19 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sendpdf_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sendpdf_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <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="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="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="operatingsystem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\operatingsystem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -372,16 +374,11 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <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="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,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <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>
@@ -537,6 +534,11 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="mapit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\mapit_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="addfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\addfooter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -574,8 +576,16 @@
  <data name="usergroup_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\usergroup_16x161.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>
  <data name="chartswitchrowcolumn_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\chartswitchrowcolumn_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="printer_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\printer_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="serieslines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\serieslines_32x32.png;System.Drawing.Bitmap,
@@ -590,19 +600,14 @@
  <data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.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>
  <data name="user_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="meeting_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\meeting_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="refresh_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -752,6 +757,9 @@
  <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -811,6 +819,9 @@
  </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="statistical_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\statistical_16x16.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>
@@ -877,8 +888,10 @@
  <data name="cleartablestyle_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\cleartablestyle_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ok123" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ok123.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <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,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="exportfile_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\exportfile_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -903,8 +916,10 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodetails_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodetails_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -924,11 +939,6 @@
            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="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -940,16 +950,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="statistical_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\statistical_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="print_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\print_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\doublenext_16x16.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="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap,
@@ -964,6 +971,9 @@
  </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>
  <data name="print_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\print_32x32.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,
@@ -992,8 +1002,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="inlinesizelegend_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\inlinesizelegend_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <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="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>
@@ -1020,8 +1030,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="down_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\down_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="inlinesizelegend_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\inlinesizelegend_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -1031,8 +1041,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="wordwrap_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wordwrap_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="ok123" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ok123.jpg;System.Drawing.Bitmap, 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,
@@ -1048,11 +1058,14 @@
  <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>
  </data>
  <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodetails_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodetails_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="print_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\print_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="lookup&amp;reference_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_16x16.png;System.Drawing.Bitmap,
@@ -1069,9 +1082,6 @@
    <value>..\Resources\forcetesting_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_showmarkup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_showmarkup_32x32.png;System.Drawing.Bitmap, 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,
@@ -1098,6 +1108,15 @@
  <data name="trackingchanges_previous_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_previous_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="print_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\print_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="wordwrap_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wordwrap_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="down_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\down_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x324" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x324.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -1115,8 +1134,10 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <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="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
@@ -1131,4 +1152,7 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="printer_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\printer_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
</root>

 DevApp/Gs.DevApp/Resources/print_16x16.png

 DevApp/Gs.DevApp/Resources/print_16x161.png

 DevApp/Gs.DevApp/Resources/print_16x162.png

 DevApp/Gs.DevApp/Resources/print_32x32.png

 DevApp/Gs.DevApp/Resources/print_32x321.png

 DevApp/Gs.DevApp/Resources/print_32x322.png

 DevApp/Gs.DevApp/Resources/printer_16x16.png

 DevApp/Gs.DevApp/Resources/printer_32x32.png

 DevApp/Gs.DevApp/UserControl/SelectMesCgthSq.Designer.cs

@@ -52,6 +52,7 @@
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit();
            this.panelControl3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).BeginInit();
@@ -125,7 +126,8 @@
            this.gridColumn2,
            this.gridColumn1,
            this.gridColumn8,
            this.gridColumn11});
            this.gridColumn11,
            this.gridColumn12});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -165,7 +167,7 @@
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.OptionsColumn.ReadOnly = true;
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 10;
            this.gridColumn3.VisibleIndex = 11;
            this.gridColumn3.Width = 50;
            // 
            // gridColumn4
@@ -189,7 +191,7 @@
            this.gv_billNo.OptionsColumn.ReadOnly = true;
            this.gv_billNo.Tag = "query_a.BILL_NO";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 9;
            this.gv_billNo.VisibleIndex = 10;
            this.gv_billNo.Width = 110;
            // 
            // gv_supplierItemCode
@@ -283,7 +285,7 @@
            this.gridColumn10.FieldName = "gysName";
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 8;
            this.gridColumn10.VisibleIndex = 9;
            this.gridColumn10.Width = 125;
            // 
            // gridColumn2
@@ -292,7 +294,7 @@
            this.gridColumn2.FieldName = "receivingOrg";
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 11;
            this.gridColumn2.VisibleIndex = 12;
            this.gridColumn2.Width = 250;
            // 
            // gridColumn1
@@ -310,7 +312,7 @@
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 12;
            this.gridColumn8.VisibleIndex = 13;
            this.gridColumn8.Width = 94;
            // 
            // gridColumn11
@@ -347,6 +349,16 @@
            this.btnIn.Size = new System.Drawing.Size(94, 39);
            this.btnIn.TabIndex = 4;
            this.btnIn.Text = "确定导入";
            // 
            // gridColumn12
            // 
            this.gridColumn12.Caption = "当前库存";
            this.gridColumn12.FieldName = "kcQty";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 8;
            this.gridColumn12.Width = 94;
            // 
            // SelectMesCgthSq
            // 
@@ -400,5 +412,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
    }
}

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs

@@ -47,12 +47,7 @@
            this.btnOut = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnReport = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnDesign = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnJianYan = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnFjianYan = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnPiZhun = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnZhiLiangChk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnZhiLiangFchk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnBoHui = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnCaiGouChk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnCaiGouFchk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnLog = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -63,7 +58,6 @@
            this.btnZhongTai = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnJieAn = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnFjieAn = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnOa = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnShouHouChk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnShouHouFchk = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnCaiWuChk = new DevExpress.XtraBars.BarLargeButtonItem();
@@ -71,6 +65,10 @@
            this.btnLayout = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnFont = new DevExpress.XtraBars.BarLargeButtonItem();
            this.btnHelp = new DevExpress.XtraBars.BarLargeButtonItem();
            this.barLargeButtonItem1 = new DevExpress.XtraBars.BarLargeButtonItem();
            this.barLargeButtonItem2 = new DevExpress.XtraBars.BarLargeButtonItem();
            this.barLargeButtonItem3 = new DevExpress.XtraBars.BarLargeButtonItem();
            this.barLargeButtonItem4 = new DevExpress.XtraBars.BarLargeButtonItem();
            this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
            this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
@@ -106,14 +104,9 @@
            this.btnReport,
            this.btnQuery,
            this.btnDesign,
            this.btnJianYan,
            this.btnFjianYan,
            this.btnPiZhun,
            this.btnZhiLiangChk,
            this.btnZhiLiangFchk,
            this.btnCaiGouChk,
            this.btnCaiGouFchk,
            this.btnBoHui,
            this.btnJieAn,
            this.btnFjieAn,
            this.btnTzbl,
@@ -122,15 +115,18 @@
            this.btnWg,
            this.btnHelp,
            this.btnLayout,
            this.btnOa,
            this.btnFont,
            this.btnShouJian,
            this.btnCaiWuChk,
            this.btnCaiWuFchk,
            this.btnShouHouChk,
            this.btnShouHouFchk});
            this.btnShouHouFchk,
            this.barLargeButtonItem1,
            this.barLargeButtonItem2,
            this.barLargeButtonItem3,
            this.barLargeButtonItem4});
            this.barManager1.MainMenu = this.bar2;
            this.barManager1.MaxItemId = 62;
            this.barManager1.MaxItemId = 66;
            // 
            // bar2
            // 
@@ -157,12 +153,7 @@
            new DevExpress.XtraBars.LinkPersistInfo(this.btnOut),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnReport),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnDesign),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnJianYan),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnFjianYan),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnPiZhun),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnZhiLiangChk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnZhiLiangFchk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnBoHui),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiGouChk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiGouFchk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnLog),
@@ -173,14 +164,17 @@
            new DevExpress.XtraBars.LinkPersistInfo(this.btnZhongTai),
            new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnJieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
            new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnFjieAn, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
            new DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, this.btnOa, DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnShouHouChk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnShouHouFchk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuChk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnCaiWuFchk),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnLayout),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnFont),
            new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp)});
            new DevExpress.XtraBars.LinkPersistInfo(this.btnHelp),
            new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem1),
            new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem2),
            new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem3),
            new DevExpress.XtraBars.LinkPersistInfo(this.barLargeButtonItem4)});
            this.bar2.OptionsBar.AllowQuickCustomization = false;
            this.bar2.OptionsBar.DrawBorder = false;
            this.bar2.OptionsBar.DrawDragBorder = false;
@@ -331,26 +325,6 @@
            this.btnDesign.Name = "btnDesign";
            this.btnDesign.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnJianYan
            // 
            this.btnJianYan.Caption = "QC审核";
            this.btnJianYan.Id = 27;
            this.btnJianYan.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x16;
            this.btnJianYan.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbuttons_32x32;
            this.btnJianYan.ItemAppearance.Normal.Options.UseFont = true;
            this.btnJianYan.Name = "btnJianYan";
            this.btnJianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnFjianYan
            // 
            this.btnFjianYan.Caption = "QC反审核";
            this.btnFjianYan.Id = 28;
            this.btnFjianYan.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.radiobuttons_16x16;
            this.btnFjianYan.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.radiobuttons_32x32;
            this.btnFjianYan.ItemAppearance.Normal.Options.UseFont = true;
            this.btnFjianYan.Name = "btnFjianYan";
            this.btnFjianYan.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnPiZhun
            // 
            this.btnPiZhun.Caption = "批准";
@@ -360,36 +334,6 @@
            this.btnPiZhun.ItemAppearance.Normal.Options.UseFont = true;
            this.btnPiZhun.Name = "btnPiZhun";
            this.btnPiZhun.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnZhiLiangChk
            // 
            this.btnZhiLiangChk.Caption = "质量审核";
            this.btnZhiLiangChk.Id = 31;
            this.btnZhiLiangChk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x162;
            this.btnZhiLiangChk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.checkbuttons_32x321;
            this.btnZhiLiangChk.ItemAppearance.Normal.Options.UseFont = true;
            this.btnZhiLiangChk.Name = "btnZhiLiangChk";
            this.btnZhiLiangChk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnZhiLiangFchk
            // 
            this.btnZhiLiangFchk.Caption = "质量反审核";
            this.btnZhiLiangFchk.Id = 33;
            this.btnZhiLiangFchk.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.forcetesting_16x161;
            this.btnZhiLiangFchk.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.forcetesting_32x321;
            this.btnZhiLiangFchk.ItemAppearance.Normal.Options.UseFont = true;
            this.btnZhiLiangFchk.Name = "btnZhiLiangFchk";
            this.btnZhiLiangFchk.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnBoHui
            // 
            this.btnBoHui.Caption = "驳回重检";
            this.btnBoHui.Id = 37;
            this.btnBoHui.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.updatetableofcontents_16x16;
            this.btnBoHui.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.updatetableofcontents_32x32;
            this.btnBoHui.ItemAppearance.Normal.Options.UseFont = true;
            this.btnBoHui.Name = "btnBoHui";
            this.btnBoHui.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnCaiGouChk
            // 
@@ -487,16 +431,6 @@
            this.btnFjieAn.Name = "btnFjieAn";
            this.btnFjieAn.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnOa
            // 
            this.btnOa.Caption = "提交OA";
            this.btnOa.Id = 54;
            this.btnOa.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.meeting_16x16;
            this.btnOa.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.meeting_32x321;
            this.btnOa.ItemAppearance.Normal.Options.UseFont = true;
            this.btnOa.Name = "btnOa";
            this.btnOa.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // btnShouHouChk
            // 
            this.btnShouHouChk.Caption = "售后审核";
@@ -561,6 +495,47 @@
            this.btnHelp.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.knowledgebasearticle_32x32;
            this.btnHelp.ItemAppearance.Normal.Options.UseFont = true;
            this.btnHelp.Name = "btnHelp";
            // 
            // barLargeButtonItem1
            // 
            this.barLargeButtonItem1.Caption = "托板码打印";
            this.barLargeButtonItem1.Id = 62;
            this.barLargeButtonItem1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.print_16x16;
            this.barLargeButtonItem1.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.print_32x32;
            this.barLargeButtonItem1.Name = "barLargeButtonItem1";
            this.barLargeButtonItem1.Tag = "Never";
            this.barLargeButtonItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barLargeButtonItem2
            // 
            this.barLargeButtonItem2.Caption = "追溯码打印";
            this.barLargeButtonItem2.Id = 63;
            this.barLargeButtonItem2.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.print_16x161;
            this.barLargeButtonItem2.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.print_32x321;
            this.barLargeButtonItem2.Name = "barLargeButtonItem2";
            this.barLargeButtonItem2.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
            this.barLargeButtonItem2.Tag = "Never";
            this.barLargeButtonItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barLargeButtonItem3
            // 
            this.barLargeButtonItem3.Caption = "后盖码打印";
            this.barLargeButtonItem3.Id = 64;
            this.barLargeButtonItem3.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.print_16x162;
            this.barLargeButtonItem3.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.print_32x322;
            this.barLargeButtonItem3.Name = "barLargeButtonItem3";
            this.barLargeButtonItem3.Tag = "Never";
            this.barLargeButtonItem3.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barLargeButtonItem4
            // 
            this.barLargeButtonItem4.Caption = "齐套标识卡打印";
            this.barLargeButtonItem4.Id = 65;
            this.barLargeButtonItem4.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printer_16x16;
            this.barLargeButtonItem4.ImageOptions.LargeImage = global::Gs.DevApp.Properties.Resources.printer_32x32;
            this.barLargeButtonItem4.Name = "barLargeButtonItem4";
            this.barLargeButtonItem4.Tag = "Never";
            this.barLargeButtonItem4.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barDockControlTop
            // 
@@ -628,14 +603,9 @@
        private DevExpress.XtraBars.BarLargeButtonItem btnReport;
        private DevExpress.XtraBars.BarLargeButtonItem btnQuery;
        private DevExpress.XtraBars.BarLargeButtonItem btnDesign;
        private DevExpress.XtraBars.BarLargeButtonItem btnJianYan;
        private DevExpress.XtraBars.BarLargeButtonItem btnFjianYan;
        private DevExpress.XtraBars.BarLargeButtonItem btnPiZhun;
        private DevExpress.XtraBars.BarLargeButtonItem btnZhiLiangChk;
        private DevExpress.XtraBars.BarLargeButtonItem btnZhiLiangFchk;
        private DevExpress.XtraBars.BarLargeButtonItem btnCaiGouChk;
        private DevExpress.XtraBars.BarLargeButtonItem btnCaiGouFchk;
        private DevExpress.XtraBars.BarLargeButtonItem btnBoHui;
        private DevExpress.XtraBars.BarDockControl barDockControlTop;
        private DevExpress.XtraBars.BarDockControl barDockControlBottom;
        private DevExpress.XtraBars.BarDockControl barDockControlLeft;
@@ -648,12 +618,15 @@
        private DevExpress.XtraBars.BarLargeButtonItem btnWg;
        private DevExpress.XtraBars.BarLargeButtonItem btnHelp;
        private DevExpress.XtraBars.BarLargeButtonItem btnLayout;
        private DevExpress.XtraBars.BarLargeButtonItem btnOa;
        private DevExpress.XtraBars.BarLargeButtonItem btnFont;
        private DevExpress.XtraBars.BarLargeButtonItem btnShouJian;
        private DevExpress.XtraBars.BarLargeButtonItem btnCaiWuChk;
        private DevExpress.XtraBars.BarLargeButtonItem btnCaiWuFchk;
        private DevExpress.XtraBars.BarLargeButtonItem btnShouHouChk;
        private DevExpress.XtraBars.BarLargeButtonItem btnShouHouFchk;
        private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem1;
        private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem2;
        private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem3;
        private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem4;
    }
}

 DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs

@@ -39,15 +39,10 @@
            btnIn.ItemClick += BtnIn_ItemClick;
            btnChk.ItemClick += BtnChk_ItemClick;
            btnFchk.ItemClick += BtnFchk_ItemClick;
            btnJianYan.ItemClick += BtnJianYan_ItemClick;
            btnFjianYan.ItemClick += BtnFjianYan_ItemClick;
            btnPiZhun.ItemClick += BtnPiZhun_ItemClick;
            btnLog.ItemClick += BtnLog_ItemClick;
            btnZhiLiangChk.ItemClick += BtnZhiLiangChk_ItemClick;
            btnZhiLiangFchk.ItemClick += BtnZhiLiangFchk_ItemClick;
            btnCaiGouChk.ItemClick += BtnCaiGouChk_ItemClick;
            btnCaiGouFchk.ItemClick += BtnCaiGouFchk_ItemClick;
            btnBoHui.ItemClick += BtnBoHui_ItemClick;
            btnJieAn.ItemClick += BtnJieAn_ItemClick;
            btnFjieAn.ItemClick += BtnFjieAn_ItemClick;
            btnTzbl.ItemClick += BtnTzbl_ItemClick;
@@ -62,7 +57,6 @@
            btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
            btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
            btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
            btnOa.ItemClick += BtnOa_ItemClick;
            var lst = new List<string>();
            foreach (BarItem item in barManager1.Items)
                if (item is BarLargeButtonItem largeButtonItem)
@@ -116,27 +110,7 @@
            }
            return false;
        }

        private void BtnBoHui_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnBoHuiClick != null)
                btnBoHuiClick(this, e);
            //if (string.IsNullOrEmpty(guidKey))
            //{
            //    MsgHelper.Warning("请先选择你要操作的行！");
            //    return;
            //}

            //if (string.IsNullOrEmpty(chkParameter))
            //{
            //    MsgHelper.ShowError("没有指定驳回参数，请联系开发人员获取支持！");
            //    return;
            //}

            //if (!MsgHelper.AskQuestion("你选择了1条数据，确定驳回重检吗？"))
            //    return;
            //_ckService("5");
        }
       
        private void BtnCaiGouFchk_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnCaiGouFchkClick != null)
@@ -171,34 +145,7 @@
            if (btnShouHouChkClick != null)
                btnShouHouChkClick(this, e);
        }

        private void BtnZhiLiangFchk_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnZhiLiangFchkClick != null)
                btnZhiLiangFchkClick(this, e);
        }

        private void BtnZhiLiangChk_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnZhiLiangChkClick != null)
                btnZhiLiangChkClick(this, e);
            //if (string.IsNullOrEmpty(guidKey))
            //{
            //    MsgHelper.Warning("请先选择你要操作的行！");
            //    return;
            //}

            //if (string.IsNullOrEmpty(chkParameter))
            //{
            //    MsgHelper.ShowError("没有指定审核参数，请联系开发人员获取支持！");
            //    return;
            //}

            //if (!MsgHelper.AskQuestion("你选择了1条数据，确定质量审核吗？"))
            //    return;
            //_ckService("3");
        }

       
        private void BtnFchk_ItemClick(object sender, ItemClickEventArgs e)
        {
            bool bl = _isCk(0);
@@ -236,7 +183,6 @@
                return;
        }


        private void BtnLog_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnLogClick != null) btnLogClick(this, e);
@@ -256,25 +202,6 @@
            if (btnPiZhunClick != null) btnPiZhunClick(this, e);
        }

        private void BtnFjianYan_ItemClick(object sender, ItemClickEventArgs e)
        {
            bool bl = _isCk(0);
            if (bl) return;
            if (btnFjianYanClick != null)
                btnFjianYanClick(this, e);
            else
                return;
        }

        private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
        {
            bool bl = _isCk(1);
            if (bl) return;
            if (btnJianYanClick != null)
                btnJianYanClick(this, e);
            else
                return;
        }
        private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnShouJianClick != null)
@@ -430,11 +357,6 @@
            if (btnQueryClick != null) btnQueryClick(this, e);
        }

        private void BtnOa_ItemClick(object sender, ItemClickEventArgs e)
        {
            if (btnOaClick != null) btnOaClick(this, e);
        }

        /// <summary>
        /// å–消时，还原按钮可用性
        /// </summary>
@@ -454,8 +376,6 @@
                lst.Add(btnDesign.Name);
                lst.Add(btnChk.Name);
                lst.Add(btnFchk.Name);
                lst.Add(btnJianYan.Name);
                lst.Add(btnFjianYan.Name);
                lst.Add(btnOut.Name);
                lst.Add(btnIn.Name);
                lst.Add(btnLog.Name);
@@ -463,7 +383,6 @@
                lst.Add(btnHelp.Name);
                lst.Add(btnLayout.Name);
                lst.Add(btnFont.Name);
                lst.Add(btnBoHui.Name);
                lst.Add(btnTzbl.Name);
                lst.Add(btnKg.Name);
                lst.Add(btnWg.Name);
@@ -499,14 +418,9 @@
                    lst.Add(btnChk.Name);
                    lst.Add(btnFchk.Name);
                    lst.Add(btnDel.Name);
                    lst.Add(btnJianYan.Name);
                    lst.Add(btnFjianYan.Name);
                    lst.Add(btnQuery.Name);
                    lst.Add(btnLog.Name);
                    lst.Add(btnZhiLiangChk.Name);
                    lst.Add(btnZhiLiangFchk.Name);
                    lst.Add(btnPiZhun.Name);
                    lst.Add(btnBoHui.Name);
                    lst.Add(btnDesign.Name);
                    lst.Add(btnReport.Name);
                    lst.Add(btnKg.Name);
@@ -551,7 +465,6 @@
            lst.Add(btnLayout.Name);
            lst.Add(btnFont.Name);
            lst.Add(btnFont.Name);
            lst.Add(btnJianYan.Name);
            lst.Add(btnLog.Name);
            _enabledBtn(lst);
            this.currentAction = "edit";
@@ -715,7 +628,6 @@
                    JsonConvert.SerializeObject(_obj));
                var dd = UtilityHelper.ReturnToList(strReturn);
                var dt = dd.rtnData;

                if (!string.IsNullOrEmpty(defaultActions) && defaultActions.Contains("查询"))
                {
                    if (dt == null || dt.Rows.Count <= 0)