Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

3 天以前 ae28c33700e413d5acf60d1e48bbc9870bdef5a5

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

@@ -63,11 +63,20 @@
            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
            btnIpt.Click += BtnIpt_Click;
            string rptName = "";
            if (strType == QcSeason.生产退料入库检.ToString())
                rptName = "rpt_SCTL";
            if (strType == QcSeason.受托入库.ToString())
            {
                rptName = "rpt_Strk";
                layoutControlItem25.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                layoutControlItem27.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            }
            else
                  if (strType == QcSeason.其它入库检.ToString())
            {
                rptName = "rpt_Qtrk";
                layoutControlItem25.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                layoutControlItem27.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            }

            else
                 if (strType == QcSeason.销售退货入库检.ToString())
                rptName = "rpt_Xsth";
@@ -130,7 +139,8 @@
                frm.ShowDialog();
                if (string.IsNullOrEmpty(strCodeList))
                    return;
                if (strAction == "print") {
                if (strAction == "print")
                {
                    try
                    {
                        string rptParameter = rptName + "{"
@@ -432,7 +442,13 @@
        {
            toolBarMenu1.isSetBtn = false;
            string rkckid = txt_rkCkId.GetId();
            if (strType != QcSeason.超期检.ToString())
            if (strType == QcSeason.超期检.ToString()
                || strType == QcSeason.其它入库检.ToString()
                || strType == QcSeason.受托入库.ToString())
            {

            }
            else
            {
                if (string.IsNullOrEmpty(rkckid))
                {
@@ -484,7 +500,13 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            if (strType == QcSeason.其它入库检.ToString())
            {
                _sbSqlWhere.Append(" and isnull(qtrk.qt028,0)=1 and isnull(qtrk.qt032,0)=1 and isnull(qtrk.qt015,0)=1 ");
            }
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", " and a.order_type='" + strType + "' " + _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -518,7 +540,6 @@
            {
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }

        }
        /// <summary>
        /// 读取实体