lu
2025-04-09 48ff014392dbb512ed141383a4a3ed8b43a57ff0
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -1,5 +1,4 @@

using Gs.DevApp.Entity;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -94,7 +93,6 @@
            Gs.DevApp.DevFrm.QC.Frm_MesQaItemsDetect01Input frm = new Gs.DevApp.DevFrm.QC.Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(), bl);
            frm.ShowDialog();
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -270,7 +268,7 @@
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_releaseNo, gridView1, "lotNo");
                lbGuid, txt_releaseNo, gridView1, "releaseNo");
            toolBarMenu1.guidKey = rowGuid;
            if (string.IsNullOrEmpty(rowGuid))
            {
@@ -281,9 +279,9 @@
                return;
            if (txt_fcheckResu.Text.Trim() == "不合格")
            {
                if (string.IsNullOrEmpty(txt_remarks.Text.Trim()))
                if (string.IsNullOrEmpty(txt_msg.TextTxt.Trim()))
                {
                    MsgHelper.Warning("单据为不合格时,请填写备注说明!");
                    MsgHelper.Warning("单据为不合格时,请填写违规信息!");
                    return;
                }
            };
@@ -445,21 +443,18 @@
        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
        {
            toolBarMenu1.isSetBtn = false;
            string _txt_djType = txt_djType.Text.Trim();
            string _txt_fbatchQty = txt_fbatchQty.Text.Trim();
            string _txt_lifnr = txt_lifnr.Text.Trim();
            string _txt_suppId = txt_suppId.GetId();
            string _txt_lineId = txt_lineId.GetId();
            string _txt_itemId = txt_itemId.Text.Trim();
            string _txt_remarks = txt_remarks.Text.Trim();
            string _txt_workNo = "";
            string _txt_epTag = txt_epTag.Text.Trim();
            string _txt_fzrId = "";
            string _txt_msg = txt_msg.TextTxt;
            string _txt_fmanageNo = txt_fmanageNo.Text.Trim();
            string _txt_lotNo2 = txt_lotNo2.Text.Trim();
            string _txt_lotNo1 = txt_lotNo1.Text.Trim();
            string _txt_lotNo = txt_lotNo.Text.Trim();
            string _txt_djType = txt_djType.Text.Trim();//单据类型
            string _txt_fbatchQty = txt_fbatchQty.Text.Trim();//抽检数量
            string _txt_lifnr = txt_lifnr.Text.Trim();//客户订单
            string _txt_suppId = txt_suppId.GetId();//客户id
            string _txt_lineId = txt_lineId.GetId();//产线
            string _txt_itemId = txt_itemId.Text.Trim();//产品
            string _txt_remarks = txt_remarks.Text.Trim();//备注
            string _txt_epTag = txt_epTag.Text.Trim();//环保
            string _txt_msg = txt_msg.TextTxt;//异常
            string _txt_fmanageNo = txt_fmanageNo.Text.Trim();//流程编号
            string _txt_lotNo1 = txt_lotNo1.Text.Trim();//送检批号
            string _txt_lotNo = txt_lotNo.Text.Trim();//生产工单
            if (txt_djType.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("单据类型不能为空!");
@@ -493,21 +488,19 @@
            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                djType = _txt_djType,
                fbatchQty = _txt_fbatchQty,
                lifnr = _txt_lifnr,
                suppId = _txt_suppId,
                lineId = _txt_lineId,
                itemId = _txt_itemId,
                remarks = _txt_remarks,
                workNo = _txt_workNo,
                epTag = _txt_epTag,
                fzrId = _txt_fzrId,
                msg = _txt_msg,
                fmanageNo = _txt_fmanageNo,
                lotNo2 = _txt_lotNo2,
                lotNo1 = _txt_lotNo1,
                lotNo = _txt_lotNo
                djType = _txt_djType,//单据类型
                fbatchQty = _txt_fbatchQty,//抽检数量
                lifnr = _txt_lifnr,//客户订单
                suppId = _txt_suppId,//客户id
                lineId = _txt_lineId,//产线
                itemId = _txt_itemId,//产品
                remarks = _txt_remarks,//备注
                epTag = _txt_epTag,//环保
                msg = _txt_msg,//异常
                fmanageNo = _txt_fmanageNo,//流程编号
                lotNo1 = _txt_lotNo1,//送检批号
                lotNo = _txt_lotNo,//生产工单
                edtType = 0
            };
            try
            {
@@ -523,6 +516,7 @@
                    this.setEable(false);
                    toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                    getModel(lbGuid.Text,"0");
                }
            }
            catch (Exception ex)