diff --git a/project/src/plc/client.ts b/project/src/plc/client.ts index 96a7013..af8fc0e 100644 --- a/project/src/plc/client.ts +++ b/project/src/plc/client.ts @@ -75,6 +75,22 @@ export function disconnectAll(): void { clients.clear() } +export function readAllStationsBlock(cfg: PLCConfig): Buffer | null { + const client = clients.get(cfg.id) + if (!client) return null + + const totalSize = cfg.stationCount * STATION_SIZE + if (totalSize === 0) return null + + const buf = Buffer.alloc(totalSize) + const result = client.DBRead(cfg.dbNumber, 0, totalSize, buf) + if (result === false) { + logger.warn(TAG, `DB${cfg.dbNumber} 批量读取 ${cfg.stationCount} 个工序失败: ${client.ErrorText(client.LastError())}`) + return null + } + return result instanceof Buffer ? result : buf +} + function readStationBlock(dbNumber: number, stationIndex: number, client: any): Buffer | null { const offset = stationOffset(stationIndex) const buf = Buffer.alloc(STATION_SIZE) diff --git a/project/src/plc/scanner.ts b/project/src/plc/scanner.ts index 8818509..305adbb 100644 --- a/project/src/plc/scanner.ts +++ b/project/src/plc/scanner.ts @@ -1,10 +1,11 @@ import { getDb } from '../database/connection.js' -import { connectPLC, readStationData, readControlWord, clearDataReady, +import { connectPLC, readAllStationsBlock, clearDataReady, writePrevResult, disconnectAll, type PLCConfig } from './client.js' import { handleDataCollection } from '../services/collection.js' import { handleInterlock } from '../services/interlock.js' import { logger } from '../logger.js' -import { STATION_SIZE, OFFSET, CONTROL_BITS } from './protocol.js' +import { STATION_SIZE, OFFSET, + readDINT, readREAL, readWORD, parseControlWord } from './protocol.js' const TAG = 'Scanner' const POLL_INTERVAL_MS = 1000 @@ -24,52 +25,16 @@ function logConfig(): void { return } - const fieldMeta = [ - { name: 'ProductID', key: 'ProductID', offset: OFFSET.ProductID, type: 'DINT', size: 4, dir: '读' }, - { name: 'UpperLimit', key: 'UpperLimit', offset: OFFSET.UpperLimit, type: 'REAL', size: 4, dir: '读' }, - { name: 'LowerLimit', key: 'LowerLimit', offset: OFFSET.LowerLimit, type: 'REAL', size: 4, dir: '读' }, - { name: 'MeasuredValue', key: 'MeasuredValue', offset: OFFSET.MeasuredValue, type: 'REAL', size: 4, dir: '读' }, - { name: 'ControlWord', key: 'ControlWord', offset: OFFSET.ControlWord, type: 'WORD', size: 2, dir: '读写' }, - ] - - const bits = [ - { bit: CONTROL_BITS.DataReady, name: 'DataReady', dir: 'PLC→PC ' }, - { bit: CONTROL_BITS.IsQualified, name: 'IsQualified', dir: 'PLC→PC ' }, - { bit: CONTROL_BITS.PrevResultReq, name: 'PrevResultReq', dir: 'PLC→PC ' }, - { bit: CONTROL_BITS.PrevResult, name: 'PrevResult', dir: 'PC →PLC ' }, - ] - - logger.info(TAG, `── PLC 配置详情 (每工序 ${STATION_SIZE} 字节) ──────────────────────`) - for (const plc of plcs) { - logger.info(TAG, `${plc.PLCName} (${plc.IPAddress}) DB${plc.DBNumber}`) - const stations = db.prepare(` - SELECT s.StationIndex, s.StationName, mp.PointName + SELECT s.StationName, mp.PointName FROM Stations s JOIN MeasurementPoints mp ON mp.Id = s.PointId WHERE s.PLCId = ? ORDER BY s.Id `).all(plc.Id) as any[] - if (stations.length === 0) { - logger.info(TAG, ` (无工序配置)`) - continue - } - - for (const st of stations) { - const base = st.StationIndex * STATION_SIZE - logger.info(TAG, ` ${st.StationName} (${st.PointName}) idx=${st.StationIndex} 偏移 ${base}`) - - for (const f of fieldMeta) { - const addr = `DB${plc.DBNumber}.DB${f.type === 'WORD' ? 'W' : 'D'}+${base + f.offset}` - logger.info(TAG, ` ${addr.padEnd(20)} ${f.name.padEnd(16)} ${f.type.padEnd(6)} ${String(f.size).padStart(2)} ${f.dir}`) - } - - logger.info(TAG, ` ControlWord 位定义:`) - for (const b of bits) { - logger.info(TAG, ` Bit ${b.bit}: ${b.name.padEnd(18)} ${b.dir}`) - } - } + const names = stations.map((s: any) => s.StationName).join(', ') + logger.info(TAG, `${plc.PLCName} DB${plc.DBNumber} → ${names || '(无工序)'}`) } } @@ -126,27 +91,39 @@ function pollCycle(): void { 'SELECT Id FROM Stations WHERE PLCId = ? ORDER BY Id' ).all(plc.id) as { Id: number }[] - for (let idx = 0; idx < stationIds.length; idx++) { - const i = idx - try { - const data = readStationData(plc, i) - if (!data) continue + if (stationIds.length === 0) continue - if (data.dataReady) { - logger.info(TAG, `${plc.plcName} 工序${i} DataReady=1, ProductID=${data.productID}, 开始采集`) - handleDataCollection(plc, i, data) - clearDataReady(plc, i, data.controlWord) + const bigBuf = readAllStationsBlock({ id: plc.id, plcName: plc.plcName, ipAddress: plc.ipAddress, dbNumber: plc.dbNumber, stationCount: stationIds.length }) + if (!bigBuf) continue + + for (let idx = 0; idx < stationIds.length; idx++) { + const offset = idx * STATION_SIZE + const buf = bigBuf.subarray(offset, offset + STATION_SIZE) + + try { + const productID = readDINT(buf, OFFSET.ProductID) + const upperLimit = readREAL(buf, OFFSET.UpperLimit) + const lowerLimit = readREAL(buf, OFFSET.LowerLimit) + const measuredValue = readREAL(buf, OFFSET.MeasuredValue) + const controlWord = readWORD(buf, OFFSET.ControlWord) + const bits = parseControlWord(controlWord) + + if (bits.dataReady) { + logger.info(TAG, `${plc.plcName} 工序${idx} DataReady=1, ProductID=${productID}, 开始采集`) + const data = { productID, upperLimit, lowerLimit, measuredValue, controlWord, ...bits } + handleDataCollection(plc, idx, data) + clearDataReady(plc, idx, controlWord) } - if (data.prevResultReq) { + if (bits.prevResultReq) { const stRow = db.prepare('SELECT StationName FROM Stations WHERE Id=?').get(stationIds[idx].Id) as { StationName: string } | undefined if (!stRow) continue - logger.info(TAG, `${stRow.StationName} PrevResultReq=1, ProductID=${data.productID}, 处理互锁`) - const result = handleInterlock(stRow.StationName, data.productID) - writePrevResult(plc, i, result.prevResult === 1) + logger.info(TAG, `${stRow.StationName} PrevResultReq=1, ProductID=${productID}, 处理互锁`) + const result = handleInterlock(stRow.StationName, productID) + writePrevResult(plc, idx, result.prevResult === 1) } } catch (err) { - logger.error(TAG, `PLC#${plc.id} 工序 ${i} 错误: ${err}`) + logger.error(TAG, `PLC#${plc.id} 工序${idx} 错误: ${err}`) } } } diff --git a/project/web/index.html b/project/web/index.html index 106d023..813c2a5 100644 --- a/project/web/index.html +++ b/project/web/index.html @@ -17,7 +17,7 @@