From ae28c33700e413d5acf60d1e48bbc9870bdef5a5 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 15 八月 2025 11:27:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index 13a5612..27494c4 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -181,7 +181,7 @@
lbGuid, txt_hNo, gridView1, "hNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
@@ -339,6 +339,11 @@
if (row != null)
{
Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
+ if (string.IsNullOrEmpty(row["daa025"].ToString()))
+ {
+ MsgHelper.ShowError("鐢熶骇绫诲瀷涓嶈兘涓虹┖锛�");
+ return;
+ }
string _LineId = row["daa015"].ToString();
if (string.IsNullOrEmpty(_LineId))
{
@@ -367,11 +372,11 @@
Guid = _guid,
AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["caaGuid"].ToString()),
LineId = row["daa015"].ToString(),//浜х嚎id
- Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
Hxsj = row["daa025"].ToString(),//鐢熶骇绫诲瀷
- Bz = row["daa009"].ToString(),//澶囨敞
+ Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
+ Yjwgsj = row["mesEndProd"].ToString(),//棰勮瀹屽伐鏃堕棿
Pcsl = row["daa008"].ToString(),//鎺掍骇鏁伴噺
- Yjwgsj = row["mesEndProd"].ToString()//棰勮瀹屽伐鏃堕棿
+ Bz = row["daa009"].ToString(),//澶囨敞
});
}
}
--
Gitblit v1.9.3