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

lu

2025-08-03 2caa1d97437e4089a7d6547c2efb87c7990b3b16

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

@@ -100,6 +100,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 +151,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) =>
@@ -441,6 +445,12 @@
                txt_tbl005.Focus();
                return;
            }
            if ((txt_tbl005.Text.Trim()=="良品退料") && txt_chkOut.Checked)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("良品退料不能自动生成补料单，请检查！");
                txt_tbl005.Focus();
                return;
            }
            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
@@ -448,6 +458,7 @@
                yy = txt_tbl005.Text.Trim(),//原因
                inDaaGuid = workId,//工单
                inOrgId = orgId,//组织
                chkOut = (txt_chkOut.Checked ? "1" : "0"),
                list = new List<dynamic>(),
            };
            gvMx1.CloseEditor();
@@ -490,7 +501,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 +513,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);
@@ -584,17 +595,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"])
@@ -723,32 +723,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 +735,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 +779,6 @@
                    stringBuilder.Append(dym.dicTxt);
                }
                gvMx1.SetFocusedRowCellValue("tld015", stringBuilder.ToString());
                // this.TextTxt = ;
            };
            frm.ShowDialog();
        }
@@ -812,6 +789,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 +798,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
            {