修改过站提示

lu

2025-11-07 59a03c5660209acfac6cafae2a46c15f316b7f3e

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

@@ -140,7 +140,7 @@
                    {
                        if (txt_gongWei.Text.Trim().Length <= 0)
                        {
                            Toast vm = new Toast(-1, "~请扫工位码~");
                            Toast vm = new Toast(-1, "操作失败@n请先扫描工位码");
                            vm.Show();
                            this.ActiveControl = this.txt_gongWei;
                            txt_gongWei.Focus();
@@ -161,7 +161,7 @@
                int idx = tabMx.SelectedTabPageIndex;
                if (idx > 0)
                {
                    Toast vm = new Toast(-1, "~已帮你切换到【良品明细】,请重新操作~");
                    Toast vm = new Toast(-1, "请重新操作@n已帮你切换到【良品明细】");
                    vm.Show();
                    tabMx.SelectedTabPageIndex = 0;
                    return;
@@ -180,7 +180,7 @@
                }
                if (_collectGuid.Length < 30)
                {
                    Toast vm = new Toast(-1, "~请先选择追溯码~");
                    Toast vm = new Toast(-1, "操作失败@n请先选择追溯码");
                    vm.Show();
                    return;
                }
@@ -194,7 +194,17 @@
                    _type = "工序G003:水检不良描述";
                if (txt_gx.Text.Trim() == fGxZhongJian)
                    _type = "工序G004:终检不良描述";
                UcDictionarySelect frm = new UcDictionarySelect(_type, " a.s_type='" + _type + "' and pid<>'00000000-0000-0000-0000-000000000000'", _msg);
                string condition = $" pid<>'00000000-0000-0000-0000-000000000000' " ;
                if(txt_orgId.Text.Trim() == "104554") // 电器
                {
                    condition += $" and a.s_type =  '{_type}' ";
                }
                if (txt_orgId.Text.Trim() == "104540") // 魔凡
                {
                    condition += $" and a.s_type = '魔凡{_type}' ";
                }

                UcDictionarySelect frm = new UcDictionarySelect(_type, condition, _msg);
                frm.UpdateParent += (ss, ee) =>
                {
                    System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
@@ -208,7 +218,7 @@
                    string _txt = stringBuilder.ToString();
                    if (string.IsNullOrEmpty(_txt))
                    {
                        Toast vm = new Toast(-1, "~当为不良时，请选择不良项目~");
                        Toast vm = new Toast(-1, "操作失败@n请选择不良项目");
                        vm.Show();
                    }
                    else
@@ -358,7 +368,7 @@
            {
                if (string.IsNullOrEmpty(_barCode))
                {
                    Toast vm = new Toast(-1, "~请先扫追溯码~");
                    Toast vm = new Toast(-1, "操作失败@n请先扫描追溯码");
                    vm.Show();
                    this.ActiveControl = this.txt_barCode;
                    txt_barCode.Focus();
@@ -426,7 +436,11 @@
                    if (!string.IsNullOrEmpty(_msg))
                    {
                        // Toast vm = new Toast((goodTag == "√" ? 1 : -1), _msg); 2025-08-20 修改提示外观
                        Toast vm = new Toast(1, _rtn.rtnMsg);
                        Toast vm;
                        if (_msg.EndsWith("."))
                            vm = new Toast(-1, _rtn.rtnMsg);
                        else
                            vm = new Toast(1, _rtn.rtnMsg);
                        vm.Show();
                    }
                }