dogchang70
2016-01-15 81c46add6b31e0f347da357feaff7ebbdb6a2c36
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
                            {