From 0295f0d93a3dd54bb6104f5e9a488f94596e756b Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 26 十月 2024 00:37:00 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/Transaction/TestNode.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 3b95a76..dbe6279 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -425,7 +425,7 @@
CurWipSNHiss.Clear();
foreach (var wipSN in wipSNs)
{
- var his = new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]杩囩珯宸ュ簭[{wipSN.NODE_NAME}]鎴愬姛");
+ var his = new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]杩囩珯宸ュ簭[{wipSN.NODE_NAME}]鎴愬姛锛圱ransId锛� {TransID} 锛�");
wipSN.History.Add(his);
CurWipSNHiss.Add(his);
}
@@ -597,7 +597,7 @@
var wipHiss = new List<MES_WIP_HIS>();
foreach (var wipSN in CurWipSNs)
{
- var his = new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]杩囩珯宸ュ簭[{wipSN.NODE_NAME}]鎴愬姛");
+ var his = new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]杩囩珯宸ュ簭[{wipSN.NODE_NAME}]鎴愬姛锛圱ransId锛� {TransID} 锛�");
wipSN.History.Add(his);
wipHiss.Add(his);
}
@@ -655,6 +655,8 @@
return action;
}
action.Data = CurBatch.GetNodeDefects(PostCode);
+ //action.Data = new List<DefectOutput> { new DefectOutput { DFTG_CODE = "111111"} };
+ //action.Data = new List<DefectOutput> { new DefectOutput { DFTG_CODE = "222222" } };
return action;
}
--
Gitblit v1.9.3