lu
昨天 5e376d06404a16cb3c82a93cff351c5315bbcfe3
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.cs
@@ -31,7 +31,7 @@
            }, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            {
                txt_barCode.Text = "";
                txt_barCode111.Text = "";
                getModel(value, "", "", "", "");
            }, (value) =>
            {
@@ -39,17 +39,18 @@
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            txt_barCode.KeyDown += (s, e) =>
            txt_barCode111.KeyDown += (s, e) =>
            {
                if (e.KeyCode == Keys.Enter) { getModel(lbGuid.Text.Trim(), "", "", "", ""); };
            };
            btnGood.Click += (s, e) =>
            {
                getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, goodTag);
                getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_repairReson.TextTxt.Trim(), txt_repairMethd.TextTxt.Trim(), goodTag);
            };
            btnBad.Click += (s, e) =>
            {
                getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_badReson.TextTxt, txt_repairMethd.TextTxt, badTag);
                getModel(lbGuid.Text.Trim(), txt_badDescription.TextTxt, txt_repairReson.TextTxt.Trim(), txt_repairMethd.TextTxt.Trim(), badTag);
            };
        }
        /// <summary>
@@ -128,8 +129,8 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            txt_barCode.Text = "";
            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            txt_barCode111.Text = "";
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.createDate", "desc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -174,7 +175,25 @@
        /// <param name="_checkResult"></param>
        private void getModel(string strGuid, string _badXx, string _badYy, string _badDc, string _checkResult)
        {
            string _barCode = txt_barCode.Text.Trim();
            if (!string.IsNullOrEmpty(_checkResult))
            {
                string _reason = txt_repairReson.TextTxt.Trim();
                if (string.IsNullOrEmpty(_reason))
                {
                    Toast vm = new Toast(0, "不良原因不能为空!");
                    vm.Show();
                    return;
                };
                string _meth = txt_repairMethd.TextTxt.Trim();
                if (string.IsNullOrEmpty(_meth))
                {
                    Toast vm = new Toast(0, "不良对策不能为空!");
                    vm.Show();
                    return;
                };
            }
            string _barCode = txt_barCode111.Text.Trim();
            var _obj = new
            {
                guid = strGuid,//主建
@@ -197,9 +216,17 @@
                    lbSum2.Text = dy.lbSum2;
                    lbSum3.Text = dy.lbSum3;
                    prog1.Position = dy.jd;
                    txt_barCode.ReadOnly = false;
                    txt_badReson.IsReadly = false;
                    txt_repairMethd.IsReadly = false;
                    txt_barCode111.ReadOnly = false;
                    string _repairResult = dy.repairResult;
                    if (!string.IsNullOrEmpty(_repairResult))
                    {
                        txt_repairReson.IsReadly = true;
                        txt_repairMethd.IsReadly = true;
                    }
                    else {
                        txt_repairReson.IsReadly = false;
                        txt_repairMethd.IsReadly = false;
                    }
                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
                    foreach (var a in _job["rtnData"]["list"])