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

cdk

3 天以前 f4d5aa97370f698c63b0b9f185f06e7bae56975c

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs

@@ -146,7 +146,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
        /// <summary>
@@ -160,7 +160,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            var _obj = new
@@ -216,12 +216,12 @@
                }
                else
                {
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }