Merge branch 'master' of http://git.gs-mes.com:8080/r/~cnf/JH/JH_MesCilent

cnf

5 天以前 342b5740dded9d8bdb4a6bc5917d79b724b59aec

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs

@@ -27,7 +27,7 @@
        public Frm_MesInvItemArn()
        {
            InitializeComponent();
            this.chkAllUrgent.CheckedChanged += ChkAllUrgent_CheckedChanged;
            this.txt_chkAllUrgent.CheckedChanged += ChkAllUrgent_CheckedChanged;
            toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
            toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
            toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
@@ -174,9 +174,9 @@
        private void ChkAllUrgent_CheckedChanged(object sender, EventArgs e)
        {
            if (gvMx1.DataRowCount == 0) return;
            if (chkAllUrgent.Properties.ReadOnly) return;
            if (txt_chkAllUrgent.Properties.ReadOnly) return;

            bool isUrgent = chkAllUrgent.Checked;
            bool isUrgent = txt_chkAllUrgent.Checked;
            string targetTxt = isUrgent ? "1:急料" : "0:普通";

            gvMx1.BeginDataUpdate();
@@ -373,11 +373,11 @@
            setSrm();
            txt_receiveOrgId.IsReadly = true;
            txt_suppId.IsReadly = true;
            if (chkAllUrgent != null)
            if (txt_chkAllUrgent != null)
            {
                // 1. 确保控件启用
                chkAllUrgent.Enabled = true;
                chkAllUrgent.Properties.ReadOnly = false;
                txt_chkAllUrgent.Enabled = true;
                txt_chkAllUrgent.Properties.ReadOnly = false;
            }
        }

@@ -584,9 +584,9 @@
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                        if (chkAllUrgent != null)
                        if (txt_chkAllUrgent != null)
                        {
                            chkAllUrgent.CheckedChanged -= ChkAllUrgent_CheckedChanged;
                            txt_chkAllUrgent.CheckedChanged -= ChkAllUrgent_CheckedChanged;
                            bool allUrgent = true;
                            foreach (DataRow dr in dt.Rows)
                            {
@@ -599,12 +599,12 @@
                                }
                            }
                            // 3. 设置开关状态
                            chkAllUrgent.Checked = allUrgent;
                            txt_chkAllUrgent.Checked = allUrgent;
                            // 4. 根据当前模式（编辑/查看）决定是否可用
                            // 如果是 add 或 edit 模式，且有权限，则允许点击
                            chkAllUrgent.Enabled = isEdit || toolBarMenu1.currentAction == "add";
                            chkAllUrgent.Properties.ReadOnly = !(isEdit || toolBarMenu1.currentAction == "add");
                            chkAllUrgent.CheckedChanged += ChkAllUrgent_CheckedChanged;
                            txt_chkAllUrgent.Enabled = isEdit || toolBarMenu1.currentAction == "add";
                            txt_chkAllUrgent.Properties.ReadOnly = !(isEdit || toolBarMenu1.currentAction == "add");
                            txt_chkAllUrgent.CheckedChanged += ChkAllUrgent_CheckedChanged;
                        }
                    }
                    else