From dcf8384b4a7604e6b4e3b68f2fe76571c0d00d41 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 02 三月 2026 08:13:59 +0800
Subject: [PATCH] 1
---
open-rcs/components/content/content-interface-word.html | 126 ++++++++++++++
open-rcs/pages/接口文档.html | 216 +++++++++++++++++++++++
zy-acs-cv/src/main/java/com/zy/asrs/controller/WmsController.java | 32 +-
open-rcs/components/sidebar/sidebar-interface-word.html | 24 ++
zy-acs-cv/src/main/java/com/zy/asrs/controller/SiteController.java | 128 --------------
5 files changed, 381 insertions(+), 145 deletions(-)
diff --git a/open-rcs/components/content/content-interface-word.html b/open-rcs/components/content/content-interface-word.html
index a3a0e67..32db755 100644
--- a/open-rcs/components/content/content-interface-word.html
+++ b/open-rcs/components/content/content-interface-word.html
@@ -1387,6 +1387,132 @@
"timestamp": 1671526800000
}
}
+ },
+ {
+ "apiId": "api-cv-getError",
+ "name": "杈撻�佺嚎寮傚父淇℃伅鎺ュ彛",
+ "description": "杈撻�佺嚎寮傚父淇℃伅鎺ュ彛",
+ "isCommon": false,
+ "method": "POST",
+ "url": "/station/getError",
+ "menu": {
+ "category": "杈撻�佺嚎寮傚父淇℃伅鎺ュ彛",
+ "order": 6
+ },
+ "request": {
+ "parameters": [
+ {
+ "name": "staNo",
+ "type": "string",
+ "required": true,
+ "description": "绔欑偣缂栧彿",
+ "default": "1001"
+ }
+ ],
+ "example": {
+ "staNo": "1001"
+ }
+ },
+ "response": {
+ "parameters": [
+ {
+ "name": "code",
+ "type": "integer",
+ "description": "杩斿洖缂栧彿锛�200琛ㄧず鎴愬姛锛�1~N琛ㄧず澶辫触"
+ },
+ {
+ "name": "message",
+ "type": "string",
+ "description": "杩斿洖娑堟伅锛岃姹傛垚鍔熻〃绀烘垚鍔燂紝鍐呭涓鸿缁嗙殑閿欒鎻忚堪"
+ },
+ {
+ "name": "data",
+ "type": "object",
+ "description": "杩斿洖鐨勬暟鎹粨鏋�"
+ },
+ {
+ "name": "timestamp",
+ "type": "integer",
+ "description": "鏃堕棿鎴�"
+ }
+ ],
+ "example": {
+ "code": 200,
+ "message": "璇锋眰鎴愬姛",
+ "timestamp": 1671526800000,
+ "data": [
+ {
+ "staNo": "1001",
+ "plcDesc": "鏈変换鍔℃棤璐ф晠闅�",
+ "error": "鏈変换鍔℃棤璐ф晠闅�"
+ },
+ {
+ "staNo": "1001",
+ "plcDesc": "鍗犱綅瓒呮椂",
+ "error": "鍗犱綅瓒呮椂"
+ }
+ ]
+ }
+ }
+ },
+ {
+ "apiId": "api-cv-getTaskNo",
+ "name": "杈撻�佺嚎鐨勪换鍔″彿鏌ヨ鎺ュ彛",
+ "description": "杈撻�佺嚎鐨勪换鍔″彿鏌ヨ鎺ュ彛",
+ "isCommon": false,
+ "method": "POST",
+ "url": "/station/getTaskNo",
+ "menu": {
+ "category": "杈撻�佺嚎鐨勪换鍔″彿鏌ヨ鎺ュ彛",
+ "order": 7
+ },
+ "request": {
+ "parameters": [
+ {
+ "name": "staNo",
+ "type": "string",
+ "required": true,
+ "description": "绔欑偣缂栧彿",
+ "default": "1001"
+ }
+ ],
+ "example": {
+ "staNo": "1001"
+ }
+ },
+ "response": {
+ "parameters": [
+ {
+ "name": "code",
+ "type": "integer",
+ "description": "杩斿洖缂栧彿锛�200琛ㄧず鎴愬姛锛�1~N琛ㄧず澶辫触"
+ },
+ {
+ "name": "message",
+ "type": "string",
+ "description": "杩斿洖娑堟伅锛岃姹傛垚鍔熻〃绀烘垚鍔燂紝鍐呭涓鸿缁嗙殑閿欒鎻忚堪"
+ },
+ {
+ "name": "data",
+ "type": "object",
+ "description": "杩斿洖鐨勬暟鎹粨鏋�"
+ },
+ {
+ "name": "timestamp",
+ "type": "integer",
+ "description": "鏃堕棿鎴�"
+ }
+ ],
+ "example": {
+ "code": 200,
+ "message": "璇锋眰鎴愬姛",
+ "timestamp": 1671526800000,
+ "data": {
+ "taskNo": "2121swasasas"
+ }
+
+ }
+ }
}
];
diff --git a/open-rcs/components/sidebar/sidebar-interface-word.html b/open-rcs/components/sidebar/sidebar-interface-word.html
index c3f1d7f..d7c3add 100644
--- a/open-rcs/components/sidebar/sidebar-interface-word.html
+++ b/open-rcs/components/sidebar/sidebar-interface-word.html
@@ -340,6 +340,30 @@
"category": "浠诲姟绠＄悊",
"order": 5
}
+ },
+ {
+ "apiId": "api-cv-getError",
+ "name": "杈撻�佺嚎寮傚父淇℃伅",
+ "description": "杈撻�佺嚎寮傚父淇℃伅",
+ "isCommon": false,
+ "method": "POST",
+ "url": "/cv/station/getError",
+ "menu": {
+ "category": "浠诲姟绠＄悊",
+ "order": 6
+ }
+ },
+ {
+ "apiId": "api-cv-getTaskNo",
+ "name": "杈撻�佺嚎鐨勪换鍔″彿鏌ヨ",
+ "description": "杈撻�佺嚎鐨勪换鍔″彿鏌ヨ",
+ "isCommon": false,
+ "method": "POST",
+ "url": "/cv/station/getTaskNo",
+ "menu": {
+ "category": "浠诲姟绠＄悊",
+ "order": 7
+ }
}
];
diff --git "a/open-rcs/pages/\346\216\245\345\217\243\346\226\207\346\241\243.html" "b/open-rcs/pages/\346\216\245\345\217\243\346\226\207\346\241\243.html"
index 85ba237..948b40f 100644
--- "a/open-rcs/pages/\346\216\245\345\217\243\346\226\207\346\241\243.html"
+++ "b/open-rcs/pages/\346\216\245\345\217\243\346\226\207\346\241\243.html"
@@ -4,6 +4,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>涓壃RCS寮�鏀惧钩鍙�</title>
+ <script src="https://cdn.jsdelivr.net/npm/jszip@3.10.1/dist/jszip.min.js"></script>
<style>
* {
margin: 0;
@@ -74,7 +75,6 @@
border: none;
display: block;
}
-
/* 搴曢儴 */
@@ -269,6 +269,8 @@
<div class="fixed-nav">
<div>鈯�<br>鍚堜綔</div>
<div>馃摟<br>鍜ㄨ</div>
+ <div onclick="exportToWord()">馃搫<br>瀵煎嚭Word</div>
+ <div onclick="exportToMarkdown()">馃摑<br>瀵煎嚭MD</div>
<div onclick="scrollToTop()">鈫�</div>
</div>
@@ -343,6 +345,218 @@
});
}
+ // 瀵煎嚭涓篧ord (docx鏍煎紡)
+ function exportToWord() {
+ const contentFrame = document.getElementById('content-frame');
+ if (contentFrame && contentFrame.contentWindow) {
+ try {
+ console.log('寮�濮嬪鍑篧ord');
+
+ const contentDoc = contentFrame.contentDocument;
+ const content = contentDoc.body.innerHTML;
+ console.log('鑾峰彇鍒板唴瀹癸紝闀垮害:', content.length);
+
+ // 鎻愬彇鎺ュ彛鏍稿績鍐呭锛岃繃婊ゆ帀鎵�鏈夋爣棰樺拰鍏冧俊鎭�
+ let coreContent = content;
+
+ // 绉婚櫎鏍囬鍜屽厓淇℃伅
+ coreContent = coreContent.replace(/RCS鎺ュ彛鏂囨。[\s\S]*?鏇存柊鏃堕棿锛歔\s\S]*?\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/g, '');
+ coreContent = coreContent.replace(/<h1[^>]*>.*?<\/h1>/g, '');
+ coreContent = coreContent.replace(/<h2[^>]*>.*?<\/h2>/g, '');
+ coreContent = coreContent.replace(/<h3[^>]*>.*?<\/h3>/g, '');
+ coreContent = coreContent.replace(/<h4[^>]*>.*?<\/h4>/g, '');
+ coreContent = coreContent.replace(/<h5[^>]*>.*?<\/h5>/g, '');
+ coreContent = coreContent.replace(/<h6[^>]*>.*?<\/h6>/g, '');
+ coreContent = coreContent.replace(/鏇存柊鏃堕棿锛�.*?<\/p>/g, '');
+
+ // 鍒涘缓HTML鏍煎紡鐨刉ord鏂囨。
+ const htmlContent = `
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="UTF-8">
+ <title>鎺ュ彛鏂囨。</title>
+ <style>
+ body {
+ font-family: 'Microsoft YaHei', Arial, sans-serif;
+ margin: 40px;
+ line-height: 1.6;
+ }
+ p {
+ margin-bottom: 15px;
+ text-align: justify;
+ }
+ pre {
+ background-color: #f8f9fa;
+ padding: 15px;
+ border-radius: 4px;
+ border: 1px solid #e9ecef;
+ margin: 20px 0;
+ font-family: 'Consolas', 'Monaco', monospace;
+ white-space: pre-wrap;
+ }
+ table {
+ border-collapse: collapse;
+ width: 100%;
+ margin: 20px 0;
+ box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+ }
+ th {
+ background-color: #3498db;
+ color: white;
+ font-weight: bold;
+ padding: 12px 15px;
+ text-align: left;
+ }
+ td {
+ border: 1px solid #ddd;
+ padding: 10px 15px;
+ text-align: left;
+ }
+ tr:nth-child(even) {
+ background-color: #f8f9fa;
+ }
+ ul, ol {
+ margin: 15px 0;
+ padding-left: 30px;
+ }
+ li {
+ margin-bottom: 8px;
+ }
+ </style>
+</head>
+<body>
+ ${coreContent}
+</body>
+</html>
+ `;
+
+ // 鍒涘缓Blob瀵硅薄
+ const blob = new Blob([htmlContent], { type: 'application/msword' });
+ const url = URL.createObjectURL(blob);
+
+ // 鍒涘缓涓嬭浇閾炬帴
+ const link = document.createElement('a');
+ link.href = url;
+ link.download = '鎺ュ彛鏂囨。.doc';
+ link.click();
+
+ // 閲婃斁URL瀵硅薄
+ setTimeout(() => URL.revokeObjectURL(url), 100);
+ console.log('涓嬭浇瀹屾垚');
+ } catch (e) {
+ console.error('瀵煎嚭Word澶辫触:', e);
+ alert('瀵煎嚭Word澶辫触锛岃閲嶈瘯锛�' + e.message);
+ }
+ } else {
+ console.error('鏃犳硶鑾峰彇鍐呭妗嗘灦');
+ alert('瀵煎嚭Word澶辫触锛氭棤娉曡幏鍙栧唴瀹规鏋�');
+ }
+ }
+
+ // 瀵煎嚭涓篗arkdown
+ function exportToMarkdown() {
+ const contentFrame = document.getElementById('content-frame');
+ if (contentFrame && contentFrame.contentWindow) {
+ try {
+ const contentDoc = contentFrame.contentDocument;
+ const content = contentDoc.body;
+
+ // 杞崲HTML涓篗arkdown
+ let markdown = '';
+
+ // 鎸夋枃妗ｉ『搴忓鐞嗘墍鏈夊厓绱�
+ const processElement = (element) => {
+ // 杩囨护鎺変笉闇�瑕佺殑鍏冪礌
+ if (element.textContent.includes('RCS鎺ュ彛鏂囨。') ||
+ element.textContent.includes('鎺ュ彛璇︽儏') ||
+ element.textContent.includes('鏇存柊鏃堕棿锛�') ||
+ element.textContent.match(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
+ return;
+ }
+
+ const tagName = element.tagName;
+
+ if (['H1', 'H2', 'H3', 'H4', 'H5', 'H6'].includes(tagName)) {
+ // 澶勭悊鏍囬
+ const level = parseInt(tagName.substring(1));
+ const hashes = '#'.repeat(level);
+ markdown += `${hashes} ${element.textContent}\n\n`;
+ } else if (tagName === 'P') {
+ // 澶勭悊娈佃惤
+ markdown += `${element.textContent}\n\n`;
+ } else if (tagName === 'PRE') {
+ // 澶勭悊浠ｇ爜鍧�
+ markdown += '```\n';
+ markdown += element.textContent;
+ markdown += '\n```\n\n';
+ } else if (tagName === 'UL' || tagName === 'OL') {
+ // 澶勭悊鍒楄〃
+ const items = element.querySelectorAll('li');
+ items.forEach(item => {
+ const prefix = tagName === 'UL' ? '- ' : '1. ';
+ markdown += `${prefix}${item.textContent}\n`;
+ });
+ markdown += '\n';
+ } else if (tagName === 'TABLE') {
+ // 澶勭悊琛ㄦ牸
+ const headers = element.querySelectorAll('th');
+ if (headers.length > 0) {
+ markdown += '| ';
+ headers.forEach(header => {
+ markdown += `${header.textContent} | `;
+ });
+ markdown += '\n';
+
+ // 鍒嗛殧绾�
+ markdown += '| ';
+ headers.forEach(() => {
+ markdown += '--- | ';
+ });
+ markdown += '\n';
+ }
+
+ // 澶勭悊琛ㄦ牸琛�
+ const rows = element.querySelectorAll('tr');
+ rows.forEach(row => {
+ const cells = row.querySelectorAll('td');
+ if (cells.length > 0) {
+ markdown += '| ';
+ cells.forEach(cell => {
+ markdown += `${cell.textContent} | `;
+ });
+ markdown += '\n';
+ }
+ });
+ markdown += '\n';
+ } else if (element.children && element.children.length > 0) {
+ // 澶勭悊瀹瑰櫒鍏冪礌锛岄�掑綊澶勭悊瀛愬厓绱�
+ Array.from(element.children).forEach(child => processElement(child));
+ }
+ };
+
+ // 鎸夐『搴忓鐞嗘墍鏈夊瓙鍏冪礌
+ Array.from(content.children).forEach(child => processElement(child));
+
+ // 鍒涘缓Blob瀵硅薄
+ const blob = new Blob([markdown], {type: 'text/markdown'});
+ const url = URL.createObjectURL(blob);
+
+ // 鍒涘缓涓嬭浇閾炬帴
+ const link = document.createElement('a');
+ link.href = url;
+ link.download = '鎺ュ彛鏂囨。.md';
+ link.click();
+
+ // 閲婃斁URL瀵硅薄
+ setTimeout(() => URL.revokeObjectURL(url), 100);
+ } catch (e) {
+ console.error('瀵煎嚭Markdown澶辫触:', e);
+ alert('瀵煎嚭Markdown澶辫触锛岃閲嶈瘯');
+ }
+ }
+ }
+
// 鐩戝惉iframe鍔犺浇瀹屾垚
window.addEventListener('load', function () {
console.log('椤甸潰鍔犺浇瀹屾垚');
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/controller/SiteController.java b/zy-acs-cv/src/main/java/com/zy/asrs/controller/SiteController.java
index 0c5e9a4..e613f12 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -76,23 +76,7 @@
return R.ok().add(list);
}
- @PostMapping("/table/plc/errors")
- @ManagerAuth(memo = "杈撻�佽澶噋lc寮傚父淇℃伅琛�")
- public R plcErrorTable() {
- List<PlcErrorTableVo> list = new ArrayList<>();
- for (DevpSlave devp : slaveProperties.getDevp()) {
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- Map<Integer, StaProtocol> station = devpThread.getStation();
- for (Map.Entry<Integer, StaProtocol> entry : station.entrySet()) {
- if (!Cools.isEmpty(staPlcErr(entry))) {
- list.add(staPlcErr(entry).get(0));
- }
-
- }
- }
- return R.ok().add(list);
- }
@PostMapping("/output/site")
@ManagerAuth(memo = "绔欑偣璁惧鎶ユ枃鏃ュ織杈撳嚭")
@@ -173,118 +157,6 @@
}
}
return R.error("plc宸叉帀绾�");
- }
-
- public List<PlcErrorTableVo> staPlcErr(Map.Entry<Integer, StaProtocol> entry) {
- List<PlcErrorTableVo> list = new ArrayList<>();
- StaProtocol staProtocol = entry.getValue();
- if (staProtocol.getBreakerErr()) {
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("鏂矾鍣ㄦ晠闅�");
- vo.setError("鏂矾鍣ㄦ晠闅�");
- list.add(vo);
- }
- if (staProtocol.getInfraredErr()) {
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("鍏夌數寮傚父");
- vo.setError("鍏夌數寮傚父");
- list.add(vo);
- }
- if (staProtocol.getOutTimeErr()) {
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
-
- vo.setPlcDesc("杩愯瓒呮椂");
- vo.setError("杩愯瓒呮椂");
- list.add(vo);
- }
- if (staProtocol.getSeizeSeatErr()) {
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
-
- vo.setPlcDesc("鍗犱綅瓒呮椂");
- vo.setError("鍗犱綅瓒呮椂");
- list.add(vo);
- }
- if (staProtocol.getWrkYgoodsN()) {
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
-
- vo.setPlcDesc("鏈変换鍔℃棤璐ф晠闅�");
- vo.setError("鏈変换鍔℃棤璐ф晠闅�");
- list.add(vo);
- }
- if (staProtocol.getInverterErr()) {
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
-
- vo.setPlcDesc("鍙橀鍣ㄦ晠闅�");
- vo.setError("鍙橀鍣ㄦ晠闅�");
- list.add(vo);
- }
- if (staProtocol.getContactErr()) {
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
-
- vo.setPlcDesc("鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
- vo.setError("鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
- list.add(vo);
- }
- if (staProtocol.getUpcontactErr()) {
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
-
- vo.setPlcDesc("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
- vo.setError("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
- list.add(vo);
- }
- if (staProtocol.isFrontErr()) {
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("鍓嶈秴闄�");
- vo.setError("鍓嶈秴闄�");
- list.add(vo);
- }
- if (staProtocol.isBackErr()) {
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("鍚庤秴闄�");
- vo.setError("鍚庤秴闄�");
- list.add(vo);
- }
- if (staProtocol.isHighErr()) {
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("楂樿秴闄�");
- vo.setError("楂樿秴闄�");
- list.add(vo);
- }
- if (staProtocol.isLeftErr()) {
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("宸﹁秴闄�");
- vo.setError("宸﹁秴闄�");
- list.add(vo);
- }
- if (staProtocol.isRightErr()) {
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("鍙宠秴闄�");
- vo.setError("鍙宠秴闄�");
- list.add(vo);
- }
- if (staProtocol.isBarcodeErr()) {
- PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setNo(entry.getKey()); // 搴忓彿
- vo.setPlcDesc("鎵爜澶辫触");
- vo.setError("鎵爜澶辫触");
- list.add(vo);
- }
-
-
- return list;
}
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/controller/WmsController.java b/zy-acs-cv/src/main/java/com/zy/asrs/controller/WmsController.java
index 1fc4c38..f0ea305 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/controller/WmsController.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/controller/WmsController.java
@@ -49,10 +49,10 @@
if (workNo != null) {
Job jobByJobNo = jobService.getJobByJobNo(workNo);
if (jobByJobNo != null) {
- return R.ok(jobByJobNo.getJobNo());
+ return R.ok(jobByJobNo);
}
}
- return R.ok(list);
+ return R.ok();
}
@@ -78,98 +78,98 @@
List<PlcErrorTableVo> list = new ArrayList<>();
if (staProtocol.getBreakerErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setStaNo(staProtocol.getSiteId()); // 搴忓彿
+ vo.setStaNo(staProtocol.getSiteId());
vo.setPlcDesc("鏂矾鍣ㄦ晠闅�");
vo.setError("鏂矾鍣ㄦ晠闅�");
list.add(vo);
}
if (staProtocol.getInfraredErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setStaNo(staProtocol.getSiteId()); // 搴忓彿
+ vo.setStaNo(staProtocol.getSiteId());
vo.setPlcDesc("鍏夌數寮傚父");
vo.setError("鍏夌數寮傚父");
list.add(vo);
}
if (staProtocol.getOutTimeErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setStaNo(staProtocol.getSiteId()); // 搴忓彿
+ vo.setStaNo(staProtocol.getSiteId());
vo.setPlcDesc("杩愯瓒呮椂");
vo.setError("杩愯瓒呮椂");
list.add(vo);
}
if (staProtocol.getSeizeSeatErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setStaNo(staProtocol.getSiteId()); // 搴忓彿
+ vo.setStaNo(staProtocol.getSiteId());
vo.setPlcDesc("鍗犱綅瓒呮椂");
vo.setError("鍗犱綅瓒呮椂");
list.add(vo);
}
if (staProtocol.getWrkYgoodsN()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setStaNo(staProtocol.getSiteId()); // 搴忓彿
+ vo.setStaNo(staProtocol.getSiteId());
vo.setPlcDesc("鏈変换鍔℃棤璐ф晠闅�");
vo.setError("鏈変换鍔℃棤璐ф晠闅�");
list.add(vo);
}
if (staProtocol.getInverterErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setStaNo(staProtocol.getSiteId()); // 搴忓彿
+ vo.setStaNo(staProtocol.getSiteId());
vo.setPlcDesc("鍙橀鍣ㄦ晠闅�");
vo.setError("鍙橀鍣ㄦ晠闅�");
list.add(vo);
}
if (staProtocol.getContactErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setStaNo(staProtocol.getSiteId()); // 搴忓彿
+ vo.setStaNo(staProtocol.getSiteId());
vo.setPlcDesc("鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
vo.setError("鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
list.add(vo);
}
if (staProtocol.getUpcontactErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setStaNo(staProtocol.getSiteId()); // 搴忓彿
+ vo.setStaNo(staProtocol.getSiteId());
vo.setPlcDesc("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
vo.setError("椤跺崌鐢垫満鎺ヨЕ鍣ㄦ晠闅�");
list.add(vo);
}
if (staProtocol.isFrontErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setStaNo(staProtocol.getSiteId()); // 搴忓彿
+ vo.setStaNo(staProtocol.getSiteId());
vo.setPlcDesc("鍓嶈秴闄�");
vo.setError("鍓嶈秴闄�");
list.add(vo);
}
if (staProtocol.isBackErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setStaNo(staProtocol.getSiteId()); // 搴忓彿
+ vo.setStaNo(staProtocol.getSiteId());
vo.setPlcDesc("鍚庤秴闄�");
vo.setError("鍚庤秴闄�");
list.add(vo);
}
if (staProtocol.isHighErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setStaNo(staProtocol.getSiteId()); // 搴忓彿
+ vo.setStaNo(staProtocol.getSiteId());
vo.setPlcDesc("楂樿秴闄�");
vo.setError("楂樿秴闄�");
list.add(vo);
}
if (staProtocol.isLeftErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setStaNo(staProtocol.getSiteId()); // 搴忓彿
+ vo.setStaNo(staProtocol.getSiteId());
vo.setPlcDesc("宸﹁秴闄�");
vo.setError("宸﹁秴闄�");
list.add(vo);
}
if (staProtocol.isRightErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setStaNo(staProtocol.getSiteId()); // 搴忓彿
+ vo.setStaNo(staProtocol.getSiteId());
vo.setPlcDesc("鍙宠秴闄�");
vo.setError("鍙宠秴闄�");
list.add(vo);
}
if (staProtocol.isBarcodeErr()) {
PlcErrorTableVo vo = new PlcErrorTableVo();
- vo.setStaNo(staProtocol.getSiteId()); // 搴忓彿
+ vo.setStaNo(staProtocol.getSiteId());
vo.setPlcDesc("鎵爜澶辫触");
vo.setError("鎵爜澶辫触");
list.add(vo);
--
Gitblit v1.9.1