From 2e3496c2bc19c1dcb25dbbde0022a6a6d2b4ff7b Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 22 十一月 2025 13:27:18 +0800
Subject: [PATCH] ID转人名：受托退料申请、受托退料单
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 9245540..f7a9f83 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/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();
}
}
--
Gitblit v1.9.3