bug

lu

6 天以前 8b8c26398639c86d4a8a94a7afdfca0785837685

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs

@@ -34,6 +34,8 @@
            toolBarMenu1.btnFPiZhunClick += ToolBarMenu1_btnFPiZhunClick;
            toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnPingZhiClick += ToolBarMenu1_btnPingZhiClick;
            toolBarMenu1.btnFPingZhiClick += ToolBarMenu1_btnFPingZhiClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -100,6 +102,10 @@
                        gcMx1.DataSource = _oldTable;
                        gcMx1.ForceInitialize();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                        gvMx1.CloseEditor();
                        gvMx1.PostEditor();
                        gvMx1.UpdateCurrentRow();
                        gridView1.BestFitColumns();
                    }
                    catch (Exception ex)
                    {
@@ -147,7 +153,7 @@
            this.ucBtnPrint1.btnAllClick += (s, e) =>
            {
                string rowGuid = lbMxGuid.Text.Trim();
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "采购入库");
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "生产退料");
                string strCodeList = "";
                string strAction = "";
                frm.UpdateParent += (ss, ee) =>
@@ -193,7 +199,7 @@
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
            };
        }

 
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -266,6 +272,25 @@
        {
            _toolCk(3);
        }
        /// <summary>
        /// 反品质
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnPingZhiClick(object sender, EventArgs e)
        {
            _toolCk(4);
        }
        /// <summary>
        /// 品质
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void ToolBarMenu1_btnFPingZhiClick(object sender, EventArgs e)
        {
            _toolCk(5);
        }
       
        /// <summary>
        ///     审核事件
        /// </summary>
@@ -435,9 +460,21 @@
                txt_tbl002.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_tbl005.Text.Trim()))
            if (txt_tbl005.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择原因！");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择类型！");
                txt_tbl005.Focus();
                return;
            }
            if ((txt_tbl005.Text.Trim()=="良品退料") && txt_chkOut.Checked)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("良品退料不能自动生成补料单，\n只有作业不良类型才能生成补料单，\n 请检查！");
                txt_tbl005.Focus();
                return;
            }
            if ((txt_tbl005.Text.Trim() == "来料不良退料") && txt_chkOut.Checked)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("来料不良退料不能自动生成补料单，\n只有作业不良类型才能生成补料单，\n 请检查！");
                txt_tbl005.Focus();
                return;
            }
@@ -448,6 +485,7 @@
                yy = txt_tbl005.Text.Trim(),//原因
                inDaaGuid = workId,//工单
                inOrgId = orgId,//组织
                chkOut = (txt_chkOut.Checked ? "1" : "0"),
                list = new List<dynamic>(),
            };
            gvMx1.CloseEditor();
@@ -490,7 +528,6 @@
            {
                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);
@@ -503,6 +540,7 @@
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
                    toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                    getModel(lbGuid.Text);
                }
                else
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
@@ -520,7 +558,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.tbl023 in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -584,17 +626,6 @@
                    gvList.Add(gvMx2);
                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
                    _ucGg = "";
                    if (txt_tbl005.Text == "良品退料")
                    {
                        split99.Panel1.Enabled = false;
                        split99.Panel1.Visible = false;
                    }
                    else
                    {
                        split99.Panel1.Enabled = true;
                        split99.Panel1.Enabled = true;
                    }

                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
                    foreach (var a in _job["rtnData"]["list"])
@@ -711,6 +742,12 @@
                case 3:
                    strMsg = "反批准";
                    break;
                case 4:
                    strMsg = "品质审核";
                    break;
                case 5:
                    strMsg = "品质反审核";
                    break;
            }
            ;
            toolBarMenu1.guidKey = "";
@@ -723,32 +760,11 @@
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
                return;

            //如果是审核，询问要不要生成补料beg
            string txt_chkOut = "0";
            if (_inFieldValue == 1 && txt_tbl005.Text.Trim() == "作业不良退料")
            {
                var frm = new Frm_MesItemTblShow();
                frm.UpdateParent += (ss, ee) =>
                {
                    try
                    {
                        txt_chkOut = ee.StringSingle;
                    }
                    catch (Exception ex)
                    {
                        MessageBox.Show(ex.Message);
                    }
                };
                frm.ShowDialog();
            }
            //如果是审核，询问要不要生成补料end

            var _obj = new
            {
                guid = rowGuid,
                inFieldValue = _inFieldValue,
                chkOut = txt_chkOut
             
            };
            try
            {
@@ -756,7 +772,6 @@
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);

                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
@@ -801,7 +816,6 @@
                    stringBuilder.Append(dym.dicTxt);
                }
                gvMx1.SetFocusedRowCellValue("tld015", stringBuilder.ToString());
                // this.TextTxt = ;
            };
            frm.ShowDialog();
        }
@@ -812,6 +826,8 @@
            {
                DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
                lbMxGuid.Text = row["tlid"].ToString();
                if (string.IsNullOrEmpty(lbMxGuid.Text))
                    return;
                toolBarMenu1.guidKey = row["tlid"].ToString();
                txtWlid.Text = row["tld002"].ToString();
                txtWlgg.Text = row["tld004"].ToString();
@@ -819,7 +835,7 @@
                txtQuantity.Text = row["tld005"].ToString();//申请总量
                txt_yQty.Text = row["ydy"].ToString();//已打印总量
                txt_kQty.Text = row["kdy"].ToString();//可打印总量
                txt_psnQty_1.Text = row["mrtmsl"].ToString(); //默认每张条码数量
                txt_psnQty_1.Text = row["tld005"].ToString(); //默认每张条码数量
            }
            else
            {