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

cdk

8 天以前 cc286e3641ef72fe7cb1312487a6d4e40bda81fe

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs

@@ -197,31 +197,33 @@
                string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
                if (File.Exists(filePath))
                {
                    var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.其它入库.ToString(), txt_qt022.GetId());
                    var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.其它入库.ToString());
                    frm.UpdateParent += (ss, ee) =>
                    {
                        try
                        {
                            var lst = ee.DynamicList;
                            MessageBox.Show(lst.Count.ToString());
                            //DataTable _Table = (DataTable)gcMx1.DataSource;
                            //foreach (dynamic dym in lst)
                            //{
                            //    DataRow _row = _Table.NewRow();
                            //    _row["fSeq"] = dym.fSeq;
                            //    _row["statStatus"] = "Y-是";
                            //    _row["collectionName"] = "空";
                            //    _row["processNo"] = dym.processNo;
                            //    _row["processName"] = dym.processName;
                            //    _Table.Rows.Add(_row);
                            //}
                            //gcMx1.BindingContext = new BindingContext();
                            //gcMx1.DataSource = _Table;
                            //gcMx1.ForceInitialize();
                            //gvMx1.CloseEditor();
                            //gvMx1.PostEditor();
                            //gvMx1.UpdateCurrentRow();
                            //gvMx1.BestFitColumns();
                            DataTable _Table = (DataTable)gcMx1.DataSource;
                            foreach (dynamic dym in lst)
                            {
                                DataRow _row = _Table.NewRow();
                                _row["qd002"] = dym.itemNo;
                                _row["qd003"] = dym.itemName;
                                _row["qd004"] = dym.itemModel;
                                _row["kcDw"] = dym.dwName;
                                _row["itemId"] = dym.itemId;
                                _row["qd007"] = dym.sl;
                                _row["qd010"] = dym.bz;
                                _row["qd012"] = dym.bllx;
                                _Table.Rows.Add(_row);
                            }
                            gcMx1.BindingContext = new BindingContext();
                            gcMx1.DataSource = _Table;
                            gcMx1.ForceInitialize();
                            gvMx1.CloseEditor();
                            gvMx1.PostEditor();
                            gvMx1.UpdateCurrentRow();
                            gvMx1.BestFitColumns();
                        }
                        catch (Exception ex)
                        {
@@ -602,7 +604,6 @@
        /// <param name="strGuid"></param>
        private void getModel(string strGuid)
        {

            gcMx1.DataSource = null;
            bool isEdit = false;
            if (toolBarMenu1.currentAction == "add") return;