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

cdk

4 天以前 b5dcb53aa7b452d44b4fc19a0c830f86ab9cb5aa

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs

@@ -1,6 +1,8 @@
using DevExpress.Utils.MVVM.Services;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout.Customization;
using DevExpress.XtraRichEdit.Model;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -40,6 +42,7 @@
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            //确定反工
            btnZsm.Click += (s, e) =>
            {
                if (!MsgHelper.AskQuestion("确定生成新的追溯码吗？"))
@@ -67,7 +70,56 @@
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            };
            //这是打印，这和其它页面是不一样的，不能复制这里
            this.ucBtnPrint98.SetPrintButton(false);
            this.ucBtnPrint98.btnAllClick += (s, e) =>
            {
                string rowGuid = txt_aboutGuid.Text.Trim();
                if (rowGuid.Length < 36)
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择你要打印的行！");
                    this.ucBtnPrint98.rptParameter = "return false";
                    return;
                }
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "追溯码", lbGuid.Text.Trim());
                string strCodeList = "";
                string strAction = "";
                frm.UpdateParent += (ss, ee) =>
                {
                    strCodeList = ee.StringSingle;
                    strAction = ee.Data;
                };
                frm.ShowDialog();
                if (string.IsNullOrEmpty(strCodeList))
                    return;
                if (strAction == "print")
                {
                    try
                    {
                        string rptParameter = "rpt_trace{"
                        + "100"
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + strCodeList
                        + "}";
                        using (Form rpt = new RptPreview(rowGuid, rptParameter))
                        {
                            rpt.ShowDialog();
                        }
                        frm.Close();
                    }
                    catch (Exception ex)
                    {
                        MsgHelper.ShowError(ex.Message);
                    }
                }
                 
            };
        }


        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);