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

lu

2025-10-25 f929e794ed9deafe75653d58839fe42df7d2e6aa

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs

@@ -42,6 +42,7 @@
            toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick;
            toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick;
            toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick;
            toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isChk", "", (value) =>
@@ -68,17 +69,20 @@
                ucLookHuoZhu1.SetHzLx(_ucHzlx);
                ucLookHuoZhu1.SetHzId(_ucHz);
                _bindLookSearch(txt_qt035.Text.Trim(), "","");
            };
            //选择领用组织
            txt_qt024.EditChanged += (s, e) =>
            {
                string _orgId = txt_qt024.GetId();
                if (string.IsNullOrEmpty(_orgId))
                    return;
                txt_qt013.getSuppler(_orgId, _ucKh);
                txt_qt009.getSuppler(_orgId, _ucBm);
                txt_qt009.getSuppler(_orgId, _ucBm, " len(a.departmentcode)>2 ");
                txt_wwgys.getSuppler(_orgId, _ucGys);
            };
            //选择领用组织2025年-10-24已被禁用，为考虑性能，删除
            //txt_qt024.EditChanged += (s, e) =>
            //{
            //    string _orgId = txt_qt024.GetId();
            //    if (string.IsNullOrEmpty(_orgId))
            //        return;
            //    txt_qt013.getSuppler(_orgId, _ucKh);
            //    txt_qt009.getSuppler(_orgId, _ucBm);
            //    txt_wwgys.getSuppler(_orgId, _ucGys);
            //};
            //选择来源单号
            txt_qt035.ButtonClick += (s, e) =>
            {
@@ -420,7 +424,7 @@
            }
            //2025/07/12加上修改状态下不能修改
            txt_qt023.IsReadly = true;
            txt_qt024.IsReadly = true;
            //txt_qt024.IsReadly = true;
            ucLookHuoZhu1.Enabled = false;
        }
        /// <summary>
@@ -439,7 +443,7 @@
            ucLookHuoZhu1.Enabled = true;
            //增加时，默认组织
            string deftOrg = UtilityHelper.GetFirstOrg(txt_qt023);
            string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
            //string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
        }
        /// <summary>
        /// 保存事件
@@ -454,7 +458,8 @@
            string inHz = ucLookHuoZhu1.GetHzId();//货主
            string inRkyy = txt_qt010.Text.Trim();//原因
            string inDjlx = txt_qt019.Text.Trim();//单据类型
            string inLyOrg = txt_qt024.GetId();//领用组织
           // string inLyOrg = txt_qt024.GetId();//领用组织
            string inLyOrg = inOrgId;//领用组织等于库存组织
            string inLyCus = txt_qt013.GetId();//领用客户
            string inLyDepart = txt_qt009.GetId();//领用部门
            string inKcfx = txt_qt020.Text.Trim();//库存方向
@@ -476,12 +481,12 @@
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择货主！");
                return;
            }
            if (string.IsNullOrEmpty(inLyOrg))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择领用组织！");
                txt_qt024.Focus();
                return;
            }
            //if (string.IsNullOrEmpty(inLyOrg))
            //{
            //    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择领用组织！");
            //    txt_qt024.Focus();
            //    return;
            //}
            if (txt_qtlx.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择出库类型！");
@@ -986,5 +991,27 @@
            };
            frm.ShowDialog();
        }

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

        }
    }
}