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

cdk

5 天以前 33583f8a9716e4313163fb9bbde58fea02012a28

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs

@@ -124,27 +124,27 @@
                    ToolBox.MsgHelper.ShowError("请检查称重设置！");
                    return;
                }
                if (txtW1.Text.Trim().Length <= 0)
                if (txt_weight1.Text.Trim().Length <= 0)
                {
                    _setWeigth(1, _strCurrent);
                    return;
                }
                if (txtW2.Text.Trim().Length <= 0)
                if (txt_weight2.Text.Trim().Length <= 0)
                {
                    _setWeigth(2, _strCurrent);
                    return;
                }
                if (txtW3.Text.Trim().Length <= 0)
                if (txt_weight3.Text.Trim().Length <= 0)
                {
                    _setWeigth(3, _strCurrent);
                    return;
                }
                if (txtW4.Text.Trim().Length <= 0)
                if (txt_weight4.Text.Trim().Length <= 0)
                {
                    _setWeigth(4, _strCurrent);
                    return;
                }
                if (txtW5.Text.Trim().Length <= 0)
                if (txt_weight5.Text.Trim().Length <= 0)
                {
                    _setWeigth(5, _strCurrent);
                    return;
@@ -188,32 +188,32 @@
                {
                    if (_weightType == 1)
                    {
                        txtW1.Text = _weight;
                        txt_weight1.Text = _weight;
                        return;
                    }
                    if (_weightType == 2)
                    {
                        txtW2.Text = _weight;
                        txt_weight2.Text = _weight;
                        return;
                    }
                    if (_weightType == 3)
                    {
                        txtW3.Text = _weight;
                        txt_weight3.Text = _weight;
                        return;
                    }
                    if (_weightType == 4)
                    {
                        txtW4.Text = _weight;
                        txt_weight4.Text = _weight;
                        return;
                    }
                    if (_weightType == 5)
                    {
                        txtW5.Text = _weight;
                        txt_weight5.Text = _weight;
                        return;
                    }
                    if (_weightType == 99)
                    {
                        this.txtW1.Text = this.txtW2.Text = this.txtW3.Text = this.txtW4.Text = this.txtW5.Text = "";
                        this.txt_weight1.Text = this.txt_weight2.Text = this.txt_weight3.Text = this.txt_weight4.Text = this.txt_weight5.Text = "";
                        return;
                    }
                }
@@ -554,12 +554,12 @@
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                fngDesc = txt_fngDesc.TextTxt.Trim(),
                iqcRemark= txt_iqcRemark.Text.Trim(),
            };
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);

                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg);
@@ -586,7 +586,11 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.ReceiveOrgId in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try