bug

lu

4 天以前 8f01d83e693ee01e8013ac77874ecd3fa385be16

 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs

@@ -32,7 +32,9 @@
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnBaoGaoClick += ToolBarMenu1_btnBaoGaoClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
@@ -403,6 +405,14 @@
            this.ucUpFileList1.pGuid = "";
            this.ucChouJianList1.pGuid = "";
            this.setEable(false);

            //增加的时候禁止2025-08-14 beg
            this.txt_msg.Enabled = false;
            this.txt_fngHandle.Enabled = false;
            this.txt_zrType.Enabled = false;
            this.txt_fzrId.Enabled = false;
            this.txt_fmrmode.Enabled = false;
            //增加的时候禁止2025-08-14 end
        }
        /// <summary>
        /// 修改事件
@@ -432,6 +442,16 @@
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
                this.setEable(true);
            }

            //2025/07/12加上修改状态下不能修改
            txt_lotNo.Enabled = false;
            txt_kbList.Enabled = false;
            //txt_fPurchaserId.IsReadly = true;
            this.txt_msg.Enabled = true;
            this.txt_fngHandle.Enabled = true;
            this.txt_zrType.Enabled = true;
            this.txt_fzrId.Enabled = true;
            this.txt_fmrmode.Enabled = true;
        }

        /// <summary>
@@ -455,7 +475,7 @@
            string _txt_lotNo1 = txt_lotNo1.Text.Trim();//送检批号
            string _txt_lotNo = txt_lotNo.Text.Trim();//生产工单
            string _kbList = txt_kbList.Text.Trim();
            if (txt_djType.SelectedIndex <= 0)
            if (txt_djType.SelectedIndex < 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("单据类型不能为空！");
                txt_djType.Focus();
@@ -505,7 +525,7 @@
            }
            //当不合格时的检查
            string _txt_fngHandle = txt_fngHandle.Text.Trim();
            string _txt_fmrmode = txt_fmrmode.SelectedText.Trim();
            string _txt_fmrmode = txt_fmrmode.Text.Trim();
            string _txt_fzrId = txt_fzrId.GetId();
            string _txt_workNo = txt_workNo.Text.Trim();
            string _txt_zrType = txt_zrType.Text.Trim();
@@ -657,7 +677,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 daa.erp_sczz 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
@@ -699,7 +723,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            var _obj = new
@@ -732,6 +756,7 @@
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                        ucUpFileList1.pGuid = lbGuid.Text.Trim();
                        ucChouJianList1.pGuid = lbGuid.Text.Trim();
                        if (guid5.Length > 10)
@@ -758,6 +783,10 @@
            }
        }

        /// <summary>
        /// 读取工序
        /// </summary>
        /// <param name="daaGuid"></param>
        private void getGxList(string daaGuid)
        {
            txt_fmrmode.Properties.Items.Clear();
@@ -792,7 +821,6 @@
            if (e.Page.Name == "tabMxPage2")
            {
                ucChouJianList1.getList14();

            }
            if (e.Page.Name == "tabMxPage3")
            {
@@ -847,7 +875,6 @@
            btnLoad.Enabled = bl;
            ucChouJianList1.IsReadOnly(!bl);
            btnIpt.Text = (bl == true ? "录入样本" : "查看样本");

        }

        /// <summary>
@@ -901,6 +928,37 @@
            frm.ShowDialog();
        }

        //生产报告
        private void ToolBarMenu1_btnBaoGaoClick(object sender, EventArgs e)
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_releaseNo, gridView1, "releaseNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            var _obj = new
            {
                guid = rowGuid,
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetBaoGao", JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("生成成功");
                }
                else
                    MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

        /// <summary>
        /// 检验和反检验
@@ -940,7 +998,7 @@
                        return;
                    }
                    string _txt_fngHandle = txt_fngHandle.Text.Trim();
                    string _txt_fmrmode = txt_fmrmode.SelectedText.Trim();
                    string _txt_fmrmode = txt_fmrmode.Text.Trim();
                    string _txt_fzrId = txt_fzrId.GetId();
                    string _txt_workNo = txt_workNo.Text.Trim();
                    string _txt_msg = txt_msg.TextTxt;