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

lu

2025-10-15 ebd8dc093cc83a41aade3fd74857974806ad9298

 DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs

@@ -36,6 +36,7 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
            this.toolBarMenu1.getXmlConfig();
            Form parentForm = this.FindForm();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
@@ -52,10 +53,23 @@
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            txt_orgId.EditChanged += (s, e) =>
            {
                var orgId = txt_orgId.GetId();
                if (string.IsNullOrEmpty(orgId))
                    return;
                txt_wwGys.getSuppler(orgId, txt_wwGys.GetId());
            };
            //选择需要入库的明细
            btnSelect.Click += (s, e) =>
            {
                var frm = new UcWwBlclSelectAll();
                if (string.IsNullOrEmpty(txt_wwGys.GetId()))
                {
                    MsgHelper.ShowError("请选择供应商！");
                    txt_wwGys.Focus();
                    return;
                }
                var frm = new UcWwBlclSelectAll(txt_orgId.GetId(), txt_wwGys.GetId());
                //赋值给明细表
                frm.UpdateParent += (ss, ee) =>
                {
@@ -71,6 +85,7 @@
                            _row["bld003"] = dym.itemName;//物料名称
                            _row["bld004"] = dym.itemModel;//规格型号
                            _row["dabGuid"] = dym.dabGuid;
                            _row["xlsl"] = dym.dab006;
                            _row["bld008"] = dym.dab007;//已领用量
                            _row["bld009"] = dym.dwName;//单位
                            _row["bld001"] = dym.bld001;//工单号
@@ -284,11 +299,25 @@
                txt_bl017.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_orgId.GetId()))
            {
                MsgHelper.ShowError("请选择组织！");
                txt_orgId.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_wwGys.GetId()))
            {
                MsgHelper.ShowError("请选择供应商！");
                txt_wwGys.Focus();
                return;
            }
            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建
                inYy = txt_bl007.Text.Trim(),//原因
                inType = txt_bl017.Text.Trim(),//出库类别
                inOrgId = txt_orgId.GetId(),
                inWwGys = txt_wwGys.GetId(),
                list = new List<dynamic>(),
            };
            gvMx1.CloseEditor();
@@ -570,5 +599,27 @@
                }
            }
        }

        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
        {
            //guidKey, rptParameter
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_blNo, gridView1, "blNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            this.toolBarMenu1.rptParameter = "rpt_WWBL{"
                                               + ""
                                               + "," + ""
                                               + "," + ""
                                               + "," + ""
                                               + "," + ""
                                               + "}";
            this.toolBarMenu1.guidKey = rowGuid;

        }
    }
}