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

cdk

4 天以前 b7d9f2e23cbda587d814c7d07c1664c053c83dcb

 DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs

@@ -59,7 +59,7 @@
                }
                if (_oldTable.Rows.Count <= 0)
                {
                    MsgHelper.ShowInformation("请选择你需要复制的物料！");
                    MsgHelper.ShowError("请选择你需要复制的物料！");
                    return;
                }
                gcMainCopy.BindingContext = new BindingContext();
@@ -72,7 +72,7 @@
                int _rows = gvMainCopy.RowCount;
                if (_rows <= 0)
                {
                    MsgHelper.ShowInformation("请选择你需要复制的物料！");
                    MsgHelper.ShowError("请选择你需要复制的物料！");
                    e.Cancel = true;
                    return;
                }
@@ -100,15 +100,17 @@
                {
                    var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    if (_rtn.rtnCode > 0)
                    {
                        MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                        UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
                    }
                    else
                        MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            };
            this.wizardControl1.NextClick += (s, e) =>
@@ -119,7 +121,7 @@
                    int _rows = gvMainCopy.RowCount;
                    if (_rows <= 0)
                    {
                        MsgHelper.ShowInformation("请选择你需要复制的物料！");
                        MsgHelper.ShowError("请选择你需要复制的物料！");
                        e.Handled = true;
                        return;
                    }
@@ -186,7 +188,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -229,12 +231,12 @@
                }
                else
                {
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }