From 59a03c5660209acfac6cafae2a46c15f316b7f3e Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 07 十一月 2025 14:35:28 +0800
Subject: [PATCH] 修改过站提示
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 109 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 42 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index d94aadc..f7a9f83 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -53,11 +53,11 @@
//璁剧疆瀛椾綋澶у皬
this.btnGood.Appearance.Font = ft1;
this.btnBad.Appearance.Font = ft1;
- this.simpleButton3.Appearance.Font =ft2;
- this.simpleButton7.Appearance.Font =ft2;
- this.simpleButton5.Appearance.Font =ft2;
- this.simpleButton4.Appearance.Font =ft2;
- this.simpleButton6.Appearance.Font =ft2;
+ this.simpleButton3.Appearance.Font = ft2;
+ this.simpleButton7.Appearance.Font = ft2;
+ this.simpleButton5.Appearance.Font = ft2;
+ this.simpleButton4.Appearance.Font = ft2;
+ this.simpleButton6.Appearance.Font = ft2;
this.lbSum1.Appearance.Font = ft2;
this.lbSum2.Appearance.Font = ft2;
this.lbSum3.Appearance.Font = ft2;
@@ -78,21 +78,21 @@
this.layoutControlItem13.AppearanceItemCaption.Font = ft4;
this.layoutControlItem14.AppearanceItemCaption.Font = ft4;
this.layoutControlItem15.AppearanceItemCaption.Font = ft4;
- this.txt_gdbh.Properties.Appearance.Font =ft5;
- this.txt_itemNo.Properties.Appearance.Font =ft5;
- this.txt_itemModel.Properties.Appearance.Font =ft5;
- this.txt_gx.Properties.Appearance.Font =ft5;
- this.txt_bc.Properties.Appearance.Font =ft5;
- this.txt_itemName.Properties.Appearance.Font =ft5;
- this.txt_yjDate.Properties.Appearance.Font =ft5;
- this.txt_collectBy.Properties.Appearance.Font =ft5;
- this.txt_sbNo.Properties.Appearance.Font =ft5;
- this.txt_sjXt.Properties.Appearance.Font =ft5;
- this.txt_sjDate.Properties.Appearance.Font =ft5;
- this.txt_barCode.Properties.Appearance.Font =ft5;
- this.txt_currentBarCode.Properties.Appearance.Font =ft5;
- this.txt_gongWei.Properties.Appearance.Font =ft5;
- this.txt_dianJianPath.Properties.Appearance.Font =ft5;
+ this.txt_gdbh.Properties.Appearance.Font = ft5;
+ this.txt_itemNo.Properties.Appearance.Font = ft5;
+ this.txt_itemModel.Properties.Appearance.Font = ft5;
+ this.txt_gx.Properties.Appearance.Font = ft5;
+ this.txt_bc.Properties.Appearance.Font = ft5;
+ this.txt_itemName.Properties.Appearance.Font = ft5;
+ this.txt_yjDate.Properties.Appearance.Font = ft5;
+ this.txt_collectBy.Properties.Appearance.Font = ft5;
+ this.txt_sbNo.Properties.Appearance.Font = ft5;
+ this.txt_sjXt.Properties.Appearance.Font = ft5;
+ this.txt_sjDate.Properties.Appearance.Font = ft5;
+ this.txt_barCode.Properties.Appearance.Font = ft5;
+ this.txt_currentBarCode.Properties.Appearance.Font = ft5;
+ this.txt_gongWei.Properties.Appearance.Font = ft5;
+ this.txt_dianJianPath.Properties.Appearance.Font = ft5;
try
{
string _vanishingSeconds = chkWater.ToString();
@@ -116,6 +116,7 @@
this.Text = "宸ュ簭閲囬泦銆�" + _fGx + " - " + _fBc + "銆�";
label8.Text = _fGx + "鏁伴噺";
addColumn();
+ //杩芥函鐮佹鍥炶溅浜嬩欢
txt_barCode.KeyDown += (s, e) =>
{
if (e.KeyCode == Keys.Enter)
@@ -129,6 +130,7 @@
addModel(goodTag);
}
};
+ //宸ヤ綅鍥炶溅妗嗕簨浠�
txt_gongWei.KeyDown += (s, e) =>
{
if (e.KeyCode == Keys.Enter)
@@ -138,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();
@@ -148,16 +150,18 @@
}
}
};
+ //鑹搧鎸夐挳浜嬩欢
btnGood.Click += (s, e) =>
{
addModel(goodTag);
};
+ //涓嶈壇鍝佹寜閽簨浠�
btnBad.Click += (s, e) =>
{
int idx = tabMx.SelectedTabPageIndex;
if (idx > 0)
{
- Toast vm = new Toast(-1, "~宸插府浣犲垏鎹㈠埌銆愯壇鍝佹槑缁嗐��,璇烽噸鏂版搷浣渵");
+ Toast vm = new Toast(-1, "璇烽噸鏂版搷浣淍n宸插府浣犲垏鎹㈠埌銆愯壇鍝佹槑缁嗐��");
vm.Show();
tabMx.SelectedTabPageIndex = 0;
return;
@@ -176,7 +180,7 @@
}
if (_collectGuid.Length < 30)
{
- Toast vm = new Toast(-1, "~璇峰厛閫夋嫨杩芥函鐮亊");
+ Toast vm = new Toast(-1, "鎿嶄綔澶辫触@n璇峰厛閫夋嫨杩芥函鐮�");
vm.Show();
return;
}
@@ -190,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();
@@ -204,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
@@ -224,6 +238,7 @@
/// <param name="_barCode">鏉＄爜</param>
/// <param name="_checkResult">缁撴灉</param>
/// <param name="_badDescription">涓嶈壇鎻忚堪</param>
+ /// <param name="_collectGuid">閲囬泦guid,濡傛灉鏄笉鑹紝闇�瑕乧ollectGuid</param>
/// <returns></returns>
private dynamic getObj(string _barCode, string _checkResult, string _badDescription = "", string _collectGuid = "")
{
@@ -235,23 +250,25 @@
_obj.gongWei = txt_gongWei.Text.Trim();//宸ヤ綅
_obj.badDescription = _badDescription.Trim();//涓嶈壇鎻忚堪
_obj.collectGuid = _collectGuid;
+ //涓嶈壇锛岀洿鎺ユ彁浜�
if (!string.IsNullOrEmpty(_collectGuid))
{
return _obj;
}
+ //鎶曞叆锛岀洿鎺ユ彁浜�
if (txt_gx.Text.Trim() == fGxTouRu)
{
return _obj;
}
- //鐢垫
+ //鐢垫锛岄渶瑕佽鍙栫浉鍏虫暟鎹�
if (txt_gx.Text.Trim() == fGxDianJian)
{
string TM = "";
- string JD = "";
- string JY = "";
- string JN = "";
- string XL = "";
- string GV = "";
+ string JD = "";//鎺ュ湴
+ string JY = "";//缁濈紭
+ string JN = "";//浜よ��
+ string XL = "";//娉勬紡
+ string GV = ""; //GV鍔熺巼
string JDV = "";
string JYV = "";
string JNV = "";
@@ -262,15 +279,19 @@
{
return _obj;
}
+ //鎶婄數妫�鏁版嵁杞负json
+ //[{"TiaoMa":"","JiaoNai":{"state":"ok","value":"1800V 0.192mA"},"XieLou":{"state":"ok","value":"235.0V 0.024mA"},"JieDi":{"state":"ok","value":"25.0A 43m娆�"},"GongLv":{"state":"ok","value":"220.0V 9.96A 2196.0W"}}]
JArray dsTemp = JArray.Parse(myStr);
- foreach (var ss in dsTemp) //鏌ユ壘鏌愪釜瀛楁涓庡��
+ foreach (var ss in dsTemp)
{
TM = (((JObject)ss)["TiaoMa"] == null) ? "" : ((JObject)ss)["TiaoMa"].ToString();
+ //鐘舵�侊紝ng鎴杘k
JD = (((JObject)ss)["JieDi"] == null) ? "" : ((JObject)ss)["JieDi"]["state"].ToString();
JY = (((JObject)ss)["JueYuan"] == null) ? "" : ((JObject)ss)["JueYuan"]["state"].ToString();
JN = (((JObject)ss)["JiaoNai"] == null) ? "" : ((JObject)ss)["JiaoNai"]["state"].ToString();
XL = (((JObject)ss)["XieLou"] == null) ? "" : ((JObject)ss)["XieLou"]["state"].ToString();
GV = (((JObject)ss)["GongLv"] == null) ? "" : ((JObject)ss)["GongLv"]["state"].ToString();
+ //鍏蜂綋鐨勫��
JDV = (((JObject)ss)["JieDi"] == null) ? "" : ((JObject)ss)["JieDi"]["value"].ToString().Replace(" ", ",");
JYV = (((JObject)ss)["JueYuan"] == null) ? "" : ((JObject)ss)["JueYuan"]["value"].ToString().Replace(" ", ", ");
JNV = (((JObject)ss)["JiaoNai"] == null) ? "" : ((JObject)ss)["JiaoNai"]["value"].ToString().Replace(" ", ", ");
@@ -313,18 +334,18 @@
string GWZT = "";//宸ヤ綅鐘舵��
string SJJGZ = "";//姘存鏌ョ粨鏋�1
(strCsl1, strSw1, SJJG, GWZT, SJJGZ) = getShuiJian();
- _obj.t002 = strCsl1;
- _obj.t003 = strSw1;
- _obj.t004 = strCsl2;
- _obj.t005 = strSw2;
- _obj.t006 = strCsl3;
- _obj.t007 = strSw3;
+ _obj.t002 = strCsl1;//鍑烘按閲�1
+ _obj.t003 = strSw1;//姘存俯1
+ _obj.t004 = strCsl2;//鍑烘按閲�2
+ _obj.t005 = strSw2;//姘存俯2
+ _obj.t006 = strCsl3;//鍑烘按閲�3
+ _obj.t007 = strSw3;//姘存俯3
_obj.t008 = strCsl4;
_obj.t009 = strSw4;
_obj.t010 = strCsl5;
_obj.t011 = strSw5;
- _obj.t012 = SJJGZ;
- _obj.t013 = GWZT;
+ _obj.t012 = SJJGZ;//姘存缁撴灉浼间箮涓嶇敤
+ _obj.t013 = GWZT;//宸ヤ綅鐘舵�佷技涔庝笉鐢�
return _obj;
}
//缁堟
@@ -347,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();
@@ -415,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