From 81c46add6b31e0f347da357feaff7ebbdb6a2c36 Mon Sep 17 00:00:00 2001
From: dogchang70 <dogchang70@7fafa455-2d8e-8247-9248-17d0fe17a33f>
Date: Fri, 15 Jan 2016 09:52:09 +0800
Subject: [PATCH] CT-4 網站須可於Windows Server 2012 64位元版本平台使用。

---
 CCSTrace/CCS/Function/Leach.cs |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CCSTrace/CCS/Function/Leach.cs b/CCSTrace/CCS/Function/Leach.cs
index 75cef77..96f460f 100644
--- a/CCSTrace/CCS/Function/Leach.cs
+++ b/CCSTrace/CCS/Function/Leach.cs
@@ -18,11 +18,13 @@
         private RecordLog _PLog;
         private OracleConnection _ConnectionTPC;
         private OracleTransaction _Transaction;
+        private String _traceConnectionString = String.Empty;
 
-        public Leach(OracleConnection _Conn, OracleTransaction _Trx, RecordLog _Log)
+        public Leach(OracleConnection _Conn, OracleTransaction _Trx, String _traceConnection, RecordLog _Log)
         {
             _ConnectionTPC = _Conn;
             _Transaction = _Trx;
+            _traceConnectionString = _traceConnection;
             _PLog = _Log;
         }
 
@@ -286,7 +288,7 @@
                     m_NewRec.getLocateEquipment().setFSC(CCS.LocalVariable.Breaker);
                     m_NewRec.getLocateEquipment().setUFID(m_NewRec.getUfid());
                     _PLog.Info("饋線全停:" + m_NewRec.getFsc() + ", " + m_NewRec.getUfid());
-                    MergeCase.Merge(m_NewRec, _ConnectionTPC, _Transaction, _PLog);
+                    MergeCase.Merge(m_NewRec, _ConnectionTPC, _Transaction, _traceConnectionString, _PLog);
                     return CCS.LocalVariable.Success;
                 }
             }
@@ -325,7 +327,7 @@
                             if (m_NewRec.getBrief().Length !=0 && m_NewRec.getBrief().Substring(0,1).Equals("A"))
                             { // A類事故原因,做追蹤合併
                                 _PLog.Info("<A類案件>");
-                                MergeCase.Merge(m_NewRec,_ConnectionTPC,_Transaction,_PLog);
+                                MergeCase.Merge(m_NewRec, _ConnectionTPC, _Transaction, _traceConnectionString, _PLog);
                             }
                             else
                             {

--
Gitblit v0.0.0-SNAPSHOT