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

cdk

2 天以前 91d3b71e4ff6884ae4c064929b0071ed98363ff9

 DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs

@@ -107,14 +107,24 @@
            };
            btnBad.Click += (s, e) =>
            {
                string _collectGuid = lbCollectGuid.Text.Trim();
                string _collectGuid ="";
                string _collCode = "";
                var dr = gvMx1.GetFocusedDataRow();
                if (dr == null || string.IsNullOrEmpty(dr["guid"].ToString()))
                {
                }
                else
                {
                    _collectGuid = dr["guid"].ToString();
                    _collCode = dr["barCode"].ToString();
                }
                if (_collectGuid.Length < 30)
                {
                    Toast vm = new Toast(-1, "~请先选择追溯码~");
                    vm.Show();
                    return;
                }
                string _msg = "你准备将【" + txt_gdbh.Text + "】【" + txt_currentBarCode.Text.Trim() + "】变更为不良";
                string _msg = "你准备将【" + _collCode + "】变更为不良";
                UcDictionarySelect frm = new UcDictionarySelect("工序不良描述", " a.s_type='工序不良描述' and pid<>'00000000-0000-0000-0000-000000000000'", _msg);
                frm.UpdateParent += (ss, ee) =>
                {
@@ -133,22 +143,14 @@
                        vm.Show();
                    }
                    else
                        addModel(badTag, _txt, lbCollectGuid.Text.Trim());
                        addModel(badTag, _txt, _collectGuid);
                };
                frm.ShowDialog();
                this.ActiveControl = this.txt_barCode;
                txt_barCode.Focus();
            };
            this.ActiveControl = this.txt_barCode;
            txt_barCode.Focus();
            gvMx1.FocusedRowChanged += (s, e) =>
            {
                if (e.FocusedRowHandle >= 0)
                {
                    DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
                    txt_gdbh.Text = row["gdbh"].ToString();
                    txt_currentBarCode.Text = row["barCode"].ToString();
                    lbCollectGuid.Text = row["guid"].ToString();
                }
            };
        }

        /// <summary>
@@ -347,7 +349,8 @@
                    string _msg = _rtn.rtnMsg;
                    if (!string.IsNullOrEmpty(_msg))
                    {
                        Toast vm = new Toast((goodTag == "√" ? 1 : -1), _msg);
                        // Toast vm = new Toast((goodTag == "√" ? 1 : -1), _msg); 2025-08-20 修改提示外观
                        Toast vm = new Toast(1, _rtn.rtnMsg);
                        vm.Show();
                    }
                }