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

lu

2025-08-03 2caa1d97437e4089a7d6547c2efb87c7990b3b16

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs

@@ -124,32 +124,37 @@
                    lbGuid, txt_daa001, gridView1);
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "追溯码");
                string strCodeList = "";
                string strAction = "";
                frm.UpdateParent += (ss, ee) =>
                {
                    strCodeList = ee.StringSingle;
                    strAction = ee.Data;
                };
                frm.ShowDialog();
                if (string.IsNullOrEmpty(strCodeList))
                    return;
                try
                if (strAction == "print")
                {
                    string rptParameter = "rpt_trace{"
                    + "100"
                    + "," + ""
                    + "," + ""
                    + "," + ""
                    + "," + ""
                    + "," + strCodeList
                    + "}";
                    using (Form rpt = new RptPreview(rowGuid, rptParameter))
                    try
                    {
                        rpt.ShowDialog();
                        string rptParameter = "rpt_trace{"
                        + "100"
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + strCodeList
                        + "}";
                        using (Form rpt = new RptPreview(rowGuid, rptParameter))
                        {
                            rpt.ShowDialog();
                        }
                        frm.Close();
                    }
                    frm.Close();
                }
                catch (Exception ex)
                {
                    MsgHelper.ShowError(ex.Message);
                    catch (Exception ex)
                    {
                        MsgHelper.ShowError(ex.Message);
                    }
                }
            };
            //这是后盖码
@@ -236,6 +241,7 @@
                };
                frm.ShowDialog();
            };
            //维护客户模版
            this.btnDesign.Click += (s, e) =>
            {
                EasyRptEdtShow frm = new EasyRptEdtShow();
@@ -720,7 +726,6 @@
                            continue;
                        }
                    }

                    //2025-7-20加上产线确认记录
                    JArray array6 = new JArray();
                    foreach (var a in _job["rtnData"]["list6"])
@@ -777,6 +782,8 @@
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx8, gvMx8);
                    }
                    txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
                    txt_iCount_98.Text = txt_kQty98.Text;//追溯码
                    txt_iCount_100.Text = txt_kQty100.Text;//后盖码
                }
                else
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);