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

cdk

3 小时以前 32e0a92a0c603db872d56739299cb7f603b23dd1

 DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.cs

@@ -25,7 +25,7 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            });
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                getModel(value);
@@ -36,12 +36,6 @@
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;

            //这是仓库标识卡，仅仅打印
            this.ucBtnPrint101.SetPlButton(false);
            this.ucBtnPrint101.btnPrintClick += (s, e) =>
            {
                _print101();
            };
  
        }
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -182,28 +176,6 @@
        }


        /// <summary>
        /// 这是仓库
        /// </summary>
        private void _print101()
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_itemBarcode, gridView1);
            ucBtnPrint101.guidKey = rowGuid;
            if (rowGuid.Length < 36)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择你要打印的行！");
                this.ucBtnPrint101.rptParameter = "return false";
                return;
            }
            this.ucBtnPrint101.rptParameter = "rpt_cktm{"
                   + ""
                   + "," + ""
                   + "," + ""
                   + "," + ""
                   + "," + ""
                   + "}";
        }
     
    }
}