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

cdk

6 天以前 b7d9f2e23cbda587d814c7d07c1664c053c83dcb

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs

@@ -125,7 +125,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
@@ -139,6 +139,7 @@
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                    {
                        getPageList(this.pageBar1.CurrentPage);
@@ -146,11 +147,12 @@
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                }
                ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                else
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -187,7 +189,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -231,14 +233,14 @@
            toolBarMenu1.isSetBtn = false;
            if (string.IsNullOrEmpty(txt_sampleSizeNo.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("标准编码不能为空！");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("标准编码不能为空！");
                txt_sampleSizeNo.Focus();
                return;
            }

            if (string.IsNullOrEmpty(txt_sampleSizeName.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("标准名称不能为空！");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("标准名称不能为空！");
                txt_sampleSizeName.Focus();
                return;
            }
@@ -325,12 +327,12 @@
                }
                if (qmaql2.Count <= 0)
                {
                    Gs.DevApp.ToolBox.MsgHelper.Warning("样本量子码不能为空！");
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("样本量子码不能为空！");
                    return;
                }
                if (qmaql3.Count <= 0)
                {
                    Gs.DevApp.ToolBox.MsgHelper.Warning("抽样方案不能为空！");
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("抽样方案不能为空！");
                    return;
                }
                var _obj = new MesQmAql1
@@ -351,9 +353,10 @@
                {
                    string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                    ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                    ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);

                    if (_rtn.rtnCode > 0)
                    {
                        ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                        lbGuid.Text = _rtn.rtnData;
                        toolBarMenu1.isSetBtn = true;
                        List<GridView> gridViews = new List<GridView>();
@@ -363,10 +366,12 @@
                        toolBarMenu1.currentAction = "";
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                    }
                    else
                        ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    ToolBox.MsgHelper.Warning("提示：" + ex.Message);
                    ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
                }
            }
            catch (Exception ex)
@@ -414,7 +419,7 @@
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -429,7 +434,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            var _obj = new
@@ -485,11 +490,11 @@
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -527,13 +532,17 @@
                        JsonConvert.SerializeObject(lst));
                    var _rtn =
                        UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);

                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    if (_rtn.rtnCode > 0)
                    {
                        MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                        getModel(lbGuid.Text);
                    }
                    else
                        MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            }
        }
@@ -570,13 +579,16 @@
                        JsonConvert.SerializeObject(lst));
                    var _rtn =
                        UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);

                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    if (_rtn.rtnCode > 0)
                    {
                        getModel(lbGuid.Text); MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
                    }
                    else
                        MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                    MsgHelper.ShowError("提示：" + ex.Message);
                }
            }
        }
@@ -596,13 +608,14 @@
                case 0:
                    strMsg = "反审核";
                    break;
            };
            }
            ;
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
@@ -619,9 +632,9 @@
                var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -630,10 +643,12 @@
                    gridView1.FocusedRowHandle = rowHandle;
                    UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
    }