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

@@ -285,6 +285,9 @@
            gridViews.Add(gvMx1);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            //增加时，默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_thOrgId);

        }
        /// <summary>
        /// ä¿å­˜äº‹ä»¶
@@ -362,7 +365,7 @@
                        AboutGuid = UtilityHelper.ToGuid(row["rkmxGuid"].ToString()),
                        Quantity = decimal.Parse(row["sqNum"].ToString()),
                        Bz = row["remark"].ToString(),
                        DepotId= row["depotId"].ToString(),
                        DepotId = row["depotId"].ToString(),
                    });
                }
            }
@@ -398,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);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs

@@ -275,6 +275,10 @@
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            ucLookHuoZhu1.Enabled = true;

            //增加时，默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_qt023);
            string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
        }
        /// <summary>
        /// ä¿å­˜äº‹ä»¶

 DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs

@@ -309,6 +309,8 @@
            gridViews.Add(gvMx1);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            //增加时，默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_orgId);

        }
        /// <summary>
@@ -323,19 +325,19 @@
            string inGdId = txt_aboutGuid.GetId();//工单号
            if (string.IsNullOrEmpty(inGdId))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择工单！");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择工单！");
                txt_aboutGuid.Focus();
                return;
            }
            if (string.IsNullOrEmpty(inGdId))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择工单！");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择工单！");
                txt_aboutGuid.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_bl017.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择单据类型！");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择单据类型！");
                txt_bl017.Focus();
                return;
            }
@@ -382,9 +384,10 @@
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);

                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    lbGuid.Text = _rtn.rtnData.outGuid;
                    txt_blNo.Text = _rtn.rtnData.outNo;
                    toolBarMenu1.isSetBtn = true;
@@ -394,10 +397,12 @@
                    toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                }
                else
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -408,7 +413,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);
            _sbSqlWhere += " and a.bl008='" + strType + "'";
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);

 DevApp/Gs.DevApp/DevFrm/FQC/UcChouJianList.cs

@@ -73,7 +73,7 @@
            }
        }

        private string _val;
       

        /// <summary>
        /// ä¸»é”®

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqDetect01.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,60 @@
using Gs.DevApp.ToolBox;

namespace Gs.DevApp.DevFrm.RkQC
{
    partial class Frm_CqDetect01
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.rkDetect011 = new Gs.DevApp.DevFrm.RkQC.RkDetect01(QcSeason.超期检.ToString());
            this.SuspendLayout();
            // 
            // rkDetect011
            // 
            this.rkDetect011.Dock = System.Windows.Forms.DockStyle.Fill;
            this.rkDetect011.Location = new System.Drawing.Point(0, 0);
            this.rkDetect011.Name = "rkDetect011";
            this.rkDetect011.Size = new System.Drawing.Size(1118, 648);
            this.rkDetect011.TabIndex = 0;
            // 
            // Frm_RkDetect01
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1118, 648);
            this.Controls.Add(this.rkDetect011);
            this.Name = "Frm_RkDetect01";
            this.Text = "超期检";
            this.ResumeLayout(false);

        }

        #endregion

        private RkDetect01 rkDetect011;
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqDetect01.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.RkQC
{
    public partial class Frm_CqDetect01 : DevExpress.XtraEditors.XtraForm
    {
        public Frm_CqDetect01()
        {
            InitializeComponent();
        }
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,38 @@
namespace Gs.DevApp.DevFrm.RkQC
{
    partial class Frm_Cqfa
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.Text = "Frm_Cqfa";
        }

        #endregion
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.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.RkQC
{
    public partial class Frm_Cqfa : DevExpress.XtraEditors.XtraForm
    {
        public Frm_Cqfa()
        {
            InitializeComponent();
        }
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
namespace Gs.DevApp.DevFrm.RkQC
{
    partial class Frm_Cqsq
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.SuspendLayout();
            // 
            // Frm_Cqsq
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(298, 260);
            this.Name = "Frm_Cqsq";
            this.Text = "超期检验申请";
            this.ResumeLayout(false);

        }

        #endregion
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.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.RkQC
{
    public partial class Frm_Cqsq : DevExpress.XtraEditors.XtraForm
    {
        public Frm_Cqsq()
        {
            InitializeComponent();
        }
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.resx

ÎļþÃû´Ó DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.resx ÐÞ¸Ä
@@ -117,7 +117,4 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
</root>

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_QtrkDetect01.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,60 @@
using Gs.DevApp.ToolBox;

namespace Gs.DevApp.DevFrm.RkQC
{
    partial class Frm_QtrkDetect01
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.rkDetect011 = new Gs.DevApp.DevFrm.RkQC.RkDetect01(QcSeason.其它入库检.ToString());
            this.SuspendLayout();
            // 
            // rkDetect011
            // 
            this.rkDetect011.Dock = System.Windows.Forms.DockStyle.Fill;
            this.rkDetect011.Location = new System.Drawing.Point(0, 0);
            this.rkDetect011.Name = "rkDetect011";
            this.rkDetect011.Size = new System.Drawing.Size(1118, 648);
            this.rkDetect011.TabIndex = 0;
            // 
            // Frm_RkDetect01
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1118, 648);
            this.Controls.Add(this.rkDetect011);
            this.Name = "Frm_RkDetect01";
            this.Text = "其它入库检";
            this.ResumeLayout(false);

        }

        #endregion

        private RkDetect01 rkDetect011;
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_QtrkDetect01.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.RkQC
{
    public partial class Frm_QtrkDetect01 : DevExpress.XtraEditors.XtraForm
    {
        public Frm_QtrkDetect01()
        {
            InitializeComponent();
        }
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.Designer.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,60 @@
using Gs.DevApp.ToolBox;

namespace Gs.DevApp.DevFrm.RkQC
{
    partial class Frm_SctlDetect01
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.rkDetect011 = new Gs.DevApp.DevFrm.RkQC.RkDetect01(QcSeason.生产退料入库检.ToString());
            this.SuspendLayout();
            // 
            // rkDetect011
            // 
            this.rkDetect011.Dock = System.Windows.Forms.DockStyle.Fill;
            this.rkDetect011.Location = new System.Drawing.Point(0, 0);
            this.rkDetect011.Name = "rkDetect011";
            this.rkDetect011.Size = new System.Drawing.Size(1118, 648);
            this.rkDetect011.TabIndex = 0;
            // 
            // Frm_RkDetect01
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1118, 648);
            this.Controls.Add(this.rkDetect011);
            this.Name = "Frm_RkDetect01";
            this.Text = "生产退料入库检";
            this.ResumeLayout(false);

        }

        #endregion

        private RkDetect01 rkDetect011;
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.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.RkQC
{
    public partial class Frm_SctlDetect01 : DevExpress.XtraEditors.XtraForm
    {
        public Frm_SctlDetect01()
        {
            InitializeComponent();
        }
    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.resx

copy from DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.resx
copy to DevApp/Gs.DevApp/DevFrm/RkQC/Frm_SctlDetect01.resx
Îļþ´Ó DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.resx ¸´ÖÆ
@@ -117,7 +117,4 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
</root>

 DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs

ÎļþÃû´Ó DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.Designer.cs ÐÞ¸Ä
@@ -1,8 +1,8 @@
namespace Gs.DevApp.DevFrm.RkQC
{
    partial class Frm_RkDetect01
    partial class RkDetect01
    {
        /// <summary>
        /// <summary> 
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

 DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs

ÎļþÃû´Ó DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.cs ÐÞ¸Ä
@@ -13,14 +13,22 @@

namespace Gs.DevApp.DevFrm.RkQC
{
    public partial class Frm_RkDetect01 : DevExpress.XtraEditors.XtraForm
    public partial class RkDetect01 : DevExpress.XtraEditors.XtraUserControl
    {
        string _strTag = "N:不合格";

        List<FilterEntity> _filterList = new List<FilterEntity>();
        public Frm_RkDetect01()
        public string strType = "";//生产退料 type
        public RkDetect01(string _strType)
        {
            InitializeComponent();
            strType = _strType;
        }

        protected override void OnCreateControl()
        {
            base.OnCreateControl();
            if (Parent == null) return;
            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
@@ -33,7 +41,8 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fsubmitTxt", "", (value) =>
            Form parentForm = this.FindForm();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "fsubmitTxt", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
@@ -51,6 +60,12 @@
            xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
            btnIpt.Click += BtnIpt_Click;
            string rptName = "";
            if (strType == QcSeason.生产退料入库检.ToString())
                rptName = "rpt_SCTL";
            else
                  if (strType == QcSeason.其它入库检.ToString())
                rptName = "rpt_Qtrk";
            this.ucBtnPrint1.btnPrintClick += (s, e) =>
            {
                ucBtnPrint1.guidKey = "";
@@ -76,7 +91,8 @@
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                this.ucBtnPrint1.rptParameter = "rpt_SCTL{" + rowGuid.Trim()

                this.ucBtnPrint1.rptParameter = rptName + "{" + rowGuid.Trim()
                       + "," + ""
                       + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
                       + "," + txt_iCount_1.Text.Trim()
@@ -86,7 +102,7 @@
            this.ucBtnPrint1.btnAllClick += (s, e) =>
            {
                string rowGuid = txt_aboutGuid.Text.Trim();
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "采购入库");
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, strType);
                string strCodeList = "";
                frm.UpdateParent += (ss, ee) =>
                {
@@ -97,7 +113,7 @@
                    return;
                try
                {
                    string rptParameter = "rpt_SCTL{"
                    string rptParameter = rptName + "{"
                    + "100"
                    + "," + ""
                    + "," + ""
@@ -126,8 +142,6 @@
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
            };
        }


        /// <summary>
        /// æ‰¹é‡å½•å…¥
        /// </summary>
@@ -280,10 +294,15 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            Form parentForm;
            if (this.Parent is Form)
                parentForm = this.Parent as Form;
            else
                parentForm = this.Parent.Parent as Form;
            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1.ActiveFilter.Clear();
            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
            var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
@@ -409,7 +428,7 @@
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                fngDesc = txt_fngDesc.TextTxt.Trim(),
                ckId= rkckid
                ckId = rkckid
            };
            try
            {
@@ -443,7 +462,7 @@
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", " and a.order_type='" + strType + "' " + _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
            {
@@ -671,10 +690,11 @@
                    {
                        getModel(lbGuid.Text.Trim(), "0");
                    }
                    Form parentForm = this.FindForm();
                    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());
                    UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, parentForm, _inFieldValue.ToString());
                }
            }
            catch (Exception ex)
@@ -682,6 +702,6 @@
                MsgHelper.Warning("提示：" + ex.Message);
            }
        }
         

    }
}

 DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.resx

copy from DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.resx
copy to DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.resx
Îļþ´Ó DevApp/Gs.DevApp/DevFrm/RkQC/Frm_RkDetect01.resx ¸´ÖÆ
@@ -117,7 +117,4 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
</root>

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

@@ -181,6 +181,7 @@
                }
            };
            //这是齐套标识卡，仅仅打印
            this.ucBtnPrint101.SetPlButton(false);
            this.ucBtnPrint101.btnPrintClick += (s, e) =>
            {
                _print101();

 DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs

@@ -30,19 +30,19 @@
        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.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.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 rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -202,6 +202,7 @@
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -407,7 +408,8 @@
            this.gridColumn4,
            this.gridColumn7,
            this.gridColumn14,
            this.gridColumn15});
            this.gridColumn15,
            this.gridColumn16});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -425,7 +427,7 @@
            this.gv_orderNo.OptionsColumn.AllowEdit = false;
            this.gv_orderNo.Tag = "query_a.ORDER_NO";
            this.gv_orderNo.Visible = true;
            this.gv_orderNo.VisibleIndex = 0;
            this.gv_orderNo.VisibleIndex = 3;
            this.gv_orderNo.Width = 120;
            // 
            // gv_businessStatus
@@ -438,7 +440,7 @@
            this.gv_businessStatus.OptionsColumn.AllowEdit = false;
            this.gv_businessStatus.Tag = "query_a.BUSINESS_STATUS";
            this.gv_businessStatus.Visible = true;
            this.gv_businessStatus.VisibleIndex = 2;
            this.gv_businessStatus.VisibleIndex = 5;
            this.gv_businessStatus.Width = 50;
            // 
            // gridColumn3
@@ -448,7 +450,7 @@
            this.gridColumn3.MinWidth = 10;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 3;
            this.gridColumn3.VisibleIndex = 6;
            this.gridColumn3.Width = 100;
            // 
            // gridColumn2
@@ -458,7 +460,7 @@
            this.gridColumn2.MinWidth = 10;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 4;
            this.gridColumn2.VisibleIndex = 7;
            this.gridColumn2.Width = 150;
            // 
            // gridColumn1
@@ -468,7 +470,7 @@
            this.gridColumn1.MinWidth = 10;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 5;
            this.gridColumn1.VisibleIndex = 8;
            this.gridColumn1.Width = 150;
            // 
            // gv_erpProductionOrderNo
@@ -481,7 +483,7 @@
            this.gv_erpProductionOrderNo.OptionsColumn.AllowEdit = false;
            this.gv_erpProductionOrderNo.Tag = "query_a.ERP_PRODUCTION_ORDER_NO";
            this.gv_erpProductionOrderNo.Visible = true;
            this.gv_erpProductionOrderNo.VisibleIndex = 1;
            this.gv_erpProductionOrderNo.VisibleIndex = 4;
            this.gv_erpProductionOrderNo.Width = 94;
            // 
            // gv_orderType
@@ -494,7 +496,7 @@
            this.gv_orderType.OptionsColumn.AllowEdit = false;
            this.gv_orderType.Tag = "query_a.ORDER_TYPE";
            this.gv_orderType.Visible = true;
            this.gv_orderType.VisibleIndex = 6;
            this.gv_orderType.VisibleIndex = 9;
            this.gv_orderType.Width = 94;
            // 
            // gv_workOrderQty
@@ -507,7 +509,7 @@
            this.gv_workOrderQty.OptionsColumn.AllowEdit = false;
            this.gv_workOrderQty.Tag = "query_a.WORK_ORDER_QTY";
            this.gv_workOrderQty.Visible = true;
            this.gv_workOrderQty.VisibleIndex = 7;
            this.gv_workOrderQty.VisibleIndex = 10;
            this.gv_workOrderQty.Width = 50;
            // 
            // gv_nostockinqty
@@ -520,7 +522,7 @@
            this.gv_nostockinqty.OptionsColumn.AllowEdit = false;
            this.gv_nostockinqty.Tag = "query_a.NOSTOCKINQTY";
            this.gv_nostockinqty.Visible = true;
            this.gv_nostockinqty.VisibleIndex = 9;
            this.gv_nostockinqty.VisibleIndex = 12;
            this.gv_nostockinqty.Width = 50;
            // 
            // gv_stockinqty
@@ -533,7 +535,7 @@
            this.gv_stockinqty.OptionsColumn.AllowEdit = false;
            this.gv_stockinqty.Tag = "query_a.STOCKINQTY";
            this.gv_stockinqty.Visible = true;
            this.gv_stockinqty.VisibleIndex = 8;
            this.gv_stockinqty.VisibleIndex = 11;
            this.gv_stockinqty.Width = 50;
            // 
            // gv_unit
@@ -546,7 +548,7 @@
            this.gv_unit.OptionsColumn.AllowEdit = false;
            this.gv_unit.Tag = "query_a.UNIT";
            this.gv_unit.Visible = true;
            this.gv_unit.VisibleIndex = 12;
            this.gv_unit.VisibleIndex = 15;
            this.gv_unit.Width = 50;
            // 
            // gv_estimatedStartTime
@@ -559,7 +561,7 @@
            this.gv_estimatedStartTime.OptionsColumn.AllowEdit = false;
            this.gv_estimatedStartTime.Tag = "query_a.ESTIMATED_START_TIME";
            this.gv_estimatedStartTime.Visible = true;
            this.gv_estimatedStartTime.VisibleIndex = 10;
            this.gv_estimatedStartTime.VisibleIndex = 13;
            this.gv_estimatedStartTime.Width = 180;
            // 
            // gv_estimatedEndTime
@@ -572,7 +574,7 @@
            this.gv_estimatedEndTime.OptionsColumn.AllowEdit = false;
            this.gv_estimatedEndTime.Tag = "query_a.ESTIMATED_END_TIME";
            this.gv_estimatedEndTime.Visible = true;
            this.gv_estimatedEndTime.VisibleIndex = 11;
            this.gv_estimatedEndTime.VisibleIndex = 14;
            this.gv_estimatedEndTime.Width = 180;
            // 
            // gv_planReleaseDate
@@ -585,7 +587,7 @@
            this.gv_planReleaseDate.OptionsColumn.AllowEdit = false;
            this.gv_planReleaseDate.Tag = "query_a.PLAN_RELEASE_DATE";
            this.gv_planReleaseDate.Visible = true;
            this.gv_planReleaseDate.VisibleIndex = 13;
            this.gv_planReleaseDate.VisibleIndex = 16;
            this.gv_planReleaseDate.Width = 94;
            // 
            // gv_storageUpperLimit
@@ -598,7 +600,7 @@
            this.gv_storageUpperLimit.OptionsColumn.AllowEdit = false;
            this.gv_storageUpperLimit.Tag = "query_a.STORAGE_UPPER_LIMIT";
            this.gv_storageUpperLimit.Visible = true;
            this.gv_storageUpperLimit.VisibleIndex = 14;
            this.gv_storageUpperLimit.VisibleIndex = 17;
            this.gv_storageUpperLimit.Width = 50;
            // 
            // gv_storageLowerLimit
@@ -611,7 +613,7 @@
            this.gv_storageLowerLimit.OptionsColumn.AllowEdit = false;
            this.gv_storageLowerLimit.Tag = "query_a.STORAGE_LOWER_LIMIT";
            this.gv_storageLowerLimit.Visible = true;
            this.gv_storageLowerLimit.VisibleIndex = 15;
            this.gv_storageLowerLimit.VisibleIndex = 18;
            this.gv_storageLowerLimit.Width = 50;
            // 
            // gv_trackingNo
@@ -635,7 +637,7 @@
            this.gv_batchNo.OptionsColumn.AllowEdit = false;
            this.gv_batchNo.Tag = "query_a.BATCH_NO";
            this.gv_batchNo.Visible = true;
            this.gv_batchNo.VisibleIndex = 16;
            this.gv_batchNo.VisibleIndex = 19;
            this.gv_batchNo.Width = 94;
            // 
            // gv_bomVersion
@@ -648,7 +650,7 @@
            this.gv_bomVersion.OptionsColumn.AllowEdit = false;
            this.gv_bomVersion.Tag = "query_a.BOM_VERSION";
            this.gv_bomVersion.Visible = true;
            this.gv_bomVersion.VisibleIndex = 17;
            this.gv_bomVersion.VisibleIndex = 20;
            this.gv_bomVersion.Width = 94;
            // 
            // gv_generationMethod
@@ -661,7 +663,7 @@
            this.gv_generationMethod.OptionsColumn.AllowEdit = false;
            this.gv_generationMethod.Tag = "query_a.GENERATION_METHOD";
            this.gv_generationMethod.Visible = true;
            this.gv_generationMethod.VisibleIndex = 18;
            this.gv_generationMethod.VisibleIndex = 21;
            this.gv_generationMethod.Width = 94;
            // 
            // gv_demandOrderNo
@@ -674,7 +676,7 @@
            this.gv_demandOrderNo.OptionsColumn.AllowEdit = false;
            this.gv_demandOrderNo.Tag = "query_a.DEMAND_ORDER_NO";
            this.gv_demandOrderNo.Visible = true;
            this.gv_demandOrderNo.VisibleIndex = 19;
            this.gv_demandOrderNo.VisibleIndex = 22;
            this.gv_demandOrderNo.Width = 94;
            // 
            // gv_demandOrderLineNo
@@ -687,7 +689,7 @@
            this.gv_demandOrderLineNo.OptionsColumn.AllowEdit = false;
            this.gv_demandOrderLineNo.Tag = "query_a.DEMAND_ORDER_LINE_NO";
            this.gv_demandOrderLineNo.Visible = true;
            this.gv_demandOrderLineNo.VisibleIndex = 20;
            this.gv_demandOrderLineNo.VisibleIndex = 23;
            this.gv_demandOrderLineNo.Width = 60;
            // 
            // gv_closingPerson
@@ -722,7 +724,7 @@
            this.gv_remarks.OptionsColumn.AllowEdit = false;
            this.gv_remarks.Tag = "query_a.REMARKS";
            this.gv_remarks.Visible = true;
            this.gv_remarks.VisibleIndex = 21;
            this.gv_remarks.VisibleIndex = 24;
            this.gv_remarks.Width = 94;
            // 
            // gv_purchaseorderno
@@ -735,7 +737,7 @@
            this.gv_purchaseorderno.OptionsColumn.AllowEdit = false;
            this.gv_purchaseorderno.Tag = "query_a.PURCHASEORDERNO";
            this.gv_purchaseorderno.Visible = true;
            this.gv_purchaseorderno.VisibleIndex = 22;
            this.gv_purchaseorderno.VisibleIndex = 25;
            this.gv_purchaseorderno.Width = 94;
            // 
            // gv_purchaseorderentryseq
@@ -748,7 +750,7 @@
            this.gv_purchaseorderentryseq.OptionsColumn.AllowEdit = false;
            this.gv_purchaseorderentryseq.Tag = "query_a.PURCHASEORDERENTRYSEQ";
            this.gv_purchaseorderentryseq.Visible = true;
            this.gv_purchaseorderentryseq.VisibleIndex = 23;
            this.gv_purchaseorderentryseq.VisibleIndex = 26;
            this.gv_purchaseorderentryseq.Width = 70;
            // 
            // gv_auditor
@@ -760,6 +762,8 @@
            this.gv_auditor.Name = "gv_auditor";
            this.gv_auditor.OptionsColumn.AllowEdit = false;
            this.gv_auditor.Tag = "query_a.AUDITOR";
            this.gv_auditor.Visible = true;
            this.gv_auditor.VisibleIndex = 2;
            this.gv_auditor.Width = 94;
            // 
            // gv_auditDate
@@ -771,6 +775,8 @@
            this.gv_auditDate.Name = "gv_auditDate";
            this.gv_auditDate.OptionsColumn.AllowEdit = false;
            this.gv_auditDate.Tag = "query_a.AUDIT_DATE";
            this.gv_auditDate.Visible = true;
            this.gv_auditDate.VisibleIndex = 1;
            this.gv_auditDate.Width = 94;
            // 
            // gv_stockowner
@@ -799,7 +805,7 @@
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 24;
            this.gridColumn7.VisibleIndex = 27;
            this.gridColumn7.Width = 94;
            // 
            // gridColumn14
@@ -809,7 +815,7 @@
            this.gridColumn14.MinWidth = 25;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 25;
            this.gridColumn14.VisibleIndex = 28;
            this.gridColumn14.Width = 94;
            // 
            // gridColumn15
@@ -1296,47 +1302,47 @@
            this.layoutControlItem35});
            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;
            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;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition11.Height = 100D;
            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition12.Height = 100D;
            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition13.Height = 100D;
            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition14.Height = 100D;
            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition15.Height = 100D;
            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition16.Height = 100D;
            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition17.Height = 100D;
            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition18.Height = 100D;
            rowDefinition18.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,
            rowDefinition11,
            rowDefinition12,
            rowDefinition13,
            rowDefinition14,
            rowDefinition15,
            rowDefinition16,
            rowDefinition17,
            rowDefinition18});
            this.Root.Size = new System.Drawing.Size(1126, 303);
            this.Root.TextVisible = false;
            // 
@@ -2210,6 +2216,16 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // gridColumn16
            // 
            this.gridColumn16.Caption = "审核";
            this.gridColumn16.FieldName = "auditStatusChk";
            this.gridColumn16.MinWidth = 25;
            this.gridColumn16.Name = "gridColumn16";
            this.gridColumn16.Visible = true;
            this.gridColumn16.VisibleIndex = 0;
            this.gridColumn16.Width = 94;
            // 
            // Frm_ProductionOrder
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2478,5 +2494,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
    }
}

 DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs

@@ -23,6 +23,8 @@
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick1;
            this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "auditStatusChk", "", (value) =>
@@ -236,6 +238,27 @@
        }

        /// <summary>
        ///     å®¡æ ¸äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
        {
            _toolCk(8);
        }

        /// <summary>
        ///     åå®¡æ ¸
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
        {
            _toolCk(9);
        }

        /// <summary>
        /// å·¥å…·æ¡äº‹ä»¶
        /// </summary>
        /// <param name="inFieldValue"></param>
@@ -253,6 +276,12 @@
                case 3:
                    strMsg = "反结案（反执行至完工）";
                    break;
                case 8:
                    strMsg = "审核";
                    break;
                case 9:
                    strMsg = "反审核";
                    break;
            };
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;

 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs

@@ -19,8 +19,6 @@
        public Frm_WwGd()
        {
            InitializeComponent();
            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
@@ -29,7 +27,6 @@
            this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
            this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "pcShChk", "", (value) =>
@@ -162,111 +159,8 @@
                getPageList(this.pageBar1.CurrentPage);
            }
        }
        /// <summary>
        /// ä¿®æ”¹äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_daa001, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
            if (xtraTabControl1.SelectedTabPageIndex == 1)
            {
                getModel(rowGuid);
            }
            else
            {
                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }

        }
        /// <summary>
        /// åˆ é™¤å·¥å•
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnDelClick(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1, "daa001");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
                return;
            var _obj = new
            {
                guid = rowGuid,
                mxGuid = Guid.Empty.ToString(),
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "DeleteModelOrMx",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                    { }
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                }
                MsgHelper.Warning("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
            }
        }
        /// <summary>
        /// ä¿å­˜äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            //toolBarMenu1.isSetBtn = false;
            //var _obj = new
            //{
            //    guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
            //    sjxt = txt_sjXt.GetCode(), //实际线体
            //    bz = txt_daa009.Text.Trim()//备注
            //};
            //try
            //{
            //    string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
            //    ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
            //    ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
            //    if (_rtn.rtnCode > 0)
            //    {
            //        lbGuid.Text = _rtn.rtnData;
            //        toolBarMenu1.isSetBtn = true;
            //        UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
            //toolBarMenu1.currentAction = "";
            //Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
            //    }
            //}
            //catch (Exception ex)
            //{
            //    ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            //}
        }

        
       
        /// <summary>
        /// 
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs

@@ -52,11 +52,6 @@
            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.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();
@@ -176,8 +171,6 @@
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
            this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -268,7 +261,6 @@
            this.xtraTabPage3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
            // 
@@ -964,6 +956,7 @@
            // 
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.allClickKey = null;
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
@@ -974,7 +967,7 @@
            // 
            // radOut
            // 
            this.radOut.Location = new System.Drawing.Point(1033, 10);
            this.radOut.Location = new System.Drawing.Point(1030, 10);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -982,7 +975,8 @@
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "全打"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "只打整张"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动打")});
            this.radOut.Size = new System.Drawing.Size(227, 28);
            this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
            this.radOut.Size = new System.Drawing.Size(340, 32);
            this.radOut.StyleController = this.layout99;
            this.radOut.TabIndex = 476;
            // 
@@ -1285,13 +1279,10 @@
            // 
            this.layoutControlItem24.Control = this.radOut;
            this.layoutControlItem24.Location = new System.Drawing.Point(1020, 0);
            this.layoutControlItem24.MaxSize = new System.Drawing.Size(230, 28);
            this.layoutControlItem24.MinSize = new System.Drawing.Size(230, 28);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem24.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
            this.layoutControlItem24.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlItem24.Size = new System.Drawing.Size(340, 32);
            this.layoutControlItem24.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem24.Text = "计算方式";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem24.TextVisible = false;
@@ -1608,8 +1599,6 @@
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.rptChongDa});
            this.gcMx2.Size = new System.Drawing.Size(1165, 422);
            this.gcMx2.TabIndex = 2;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1626,8 +1615,7 @@
            this.gvMx1quantity,
            this.gridColumn6,
            this.gvMx1createBy,
            this.gvMx1lotDate,
            this.gvBtnAlawys});
            this.gvMx1lotDate});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1731,27 +1719,6 @@
            this.gvMx1lotDate.Visible = true;
            this.gvMx1lotDate.VisibleIndex = 7;
            this.gvMx1lotDate.Width = 94;
            // 
            // gvBtnAlawys
            // 
            this.gvBtnAlawys.Caption = "重打";
            this.gvBtnAlawys.ColumnEdit = this.rptChongDa;
            this.gvBtnAlawys.MinWidth = 25;
            this.gvBtnAlawys.Name = "gvBtnAlawys";
            this.gvBtnAlawys.Visible = true;
            this.gvBtnAlawys.VisibleIndex = 8;
            this.gvBtnAlawys.Width = 94;
            // 
            // rptChongDa
            // 
            this.rptChongDa.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "重打", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.rptChongDa.Name = "rptChongDa";
            this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
            // 
            // picCheckBox
            // 
@@ -1862,7 +1829,6 @@
            this.xtraTabPage3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);

@@ -1947,8 +1913,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa;
        private DevExpress.XtraEditors.TextEdit txt_createBy;
        private DevExpress.XtraEditors.TextEdit txt_createDate;
        private UserControl.UcLookCustomer txt_fCustId;

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs

@@ -1,4 +1,5 @@
using DevExpress.XtraEditors;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -104,6 +105,45 @@
                       + "," + txt_iCount_1.Text.Trim()
                       + "," + txt_psnQty_1.Text.Trim()
                       + "}";
            };
            this.ucBtnPrint1.btnAllClick += (s, e) =>
            {
                string rowGuid = lbMxGuid.Text.Trim();
                if (rowGuid.Length < 10)
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印的行！");
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "受托入库");
                string strCodeList = "";
                frm.UpdateParent += (ss, ee) =>
                {
                    strCodeList = ee.StringSingle;
                };
                frm.ShowDialog();
                if (string.IsNullOrEmpty(strCodeList))
                    return;
                try
                {
                    string rptParameter = "rpt_Strk{"
                    + "100"
                    + "," + ""
                    + "," + ""
                    + "," + ""
                    + "," + ""
                    + "," + strCodeList
                    + "}";
                    using (Form rpt = new RptPreview(rowGuid, rptParameter))
                    {
                        rpt.ShowDialog();
                    }
                    frm.Close();
                }
                catch (Exception ex)
                {
                    MsgHelper.ShowError(ex.Message);
                }
            };
            //自动计算打印量
            txt_psnQty_1.TextChanged += (s, e) =>
@@ -288,6 +328,8 @@
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
            //增加时，默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_fStockOrgId);
        }
        /// <summary>
        /// ä¿å­˜äº‹ä»¶
@@ -655,47 +697,6 @@
                txt_kQty.Text = "";
                txt_psnQty_1.Text = "";
                txt_iCount_1.Text = "";
            }
        }
        /// <summary>
        /// é‡æ‰“条码
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            MsgHelper.ShowInformation("功能开发中！");
            return;
            var rowhandle = gvMx2.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gvMx2.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
                    return;
                var _obj = new
                {
                    mxGuid = mxGuid,
                    inType = "dhtm"
                };
                try
                {
                    var strJson = UtilityHelper.HttpPost("",
                           "VArrivalBarcodeManager/DeleteBarcode",
                        JsonConvert.SerializeObject(_obj));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {
                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                    }
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                }
            }
        }
    }

 DevApp/Gs.DevApp/Gs.DevApp.csproj

@@ -566,11 +566,41 @@
    <Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
    <Compile Include="DevFrm\QC\Models\MesSysLookups.cs" />
    <Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" />
    <Compile Include="DevFrm\RkQC\Frm_RkDetect01.cs">
    <Compile Include="DevFrm\RkQC\Frm_CqDetect01.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_RkDetect01.Designer.cs">
      <DependentUpon>Frm_RkDetect01.cs</DependentUpon>
    <Compile Include="DevFrm\RkQC\Frm_CqDetect01.Designer.cs">
      <DependentUpon>Frm_CqDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_Cqfa.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_Cqfa.Designer.cs">
      <DependentUpon>Frm_Cqfa.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_Cqsq.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_Cqsq.Designer.cs">
      <DependentUpon>Frm_Cqsq.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_QtrkDetect01.Designer.cs">
      <DependentUpon>Frm_QtrkDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="DevFrm\RkQC\Frm_SctlDetect01.Designer.cs">
      <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\RkQC\RkDetect01.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Include="DevFrm\RkQC\RkDetect01.Designer.cs">
      <DependentUpon>RkDetect01.cs</DependentUpon>
    </Compile>
    <Compile Include="DevFrm\Rk\Frm_MesInvItemIns.cs">
      <SubType>Form</SubType>
@@ -1489,8 +1519,14 @@
    <EmbeddedResource Include="DevFrm\QC\MesQcExceptional.resx">
      <DependentUpon>MesQcExceptional.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\Frm_RkDetect01.resx">
      <DependentUpon>Frm_RkDetect01.cs</DependentUpon>
    <EmbeddedResource Include="DevFrm\RkQC\Frm_Cqsq.resx">
      <DependentUpon>Frm_Cqsq.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\Frm_SctlDetect01.resx">
      <DependentUpon>Frm_SctlDetect01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\RkQC\RkDetect01.resx">
      <DependentUpon>RkDetect01.cs</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="DevFrm\Rk\Frm_MesInvItemIns.resx">
      <DependentUpon>Frm_MesInvItemIns.cs</DependentUpon>

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -2437,7 +2437,8 @@
        ipqc首检,
        fqc,
        ç”Ÿäº§é€€æ–™å…¥åº“检,
        å…¶å®ƒå…¥åº“检
        å…¶å®ƒå…¥åº“检,
        è¶…期检
    }



 DevApp/Gs.DevApp/UserControl/UcBtnPrint.Designer.cs

@@ -123,7 +123,7 @@
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlItem3.Size = new System.Drawing.Size(116, 30);
            this.layoutControlItem3.Text = "重打";
            this.layoutControlItem3.Text = "批量操作";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem3.TextVisible = false;
            // 

 DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs

@@ -103,5 +103,12 @@
            return false;
        }


        public void SetPlButton( bool blPiLiang) {
            if (blPiLiang == true)
                this.layoutControlItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
            else
                this.layoutControlItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
        }
    }
}