From 3c9e4d85af794e00e94de44d934f806da40f5db2 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期一, 30 六月 2025 09:17:20 +0800
Subject: [PATCH] #改造
---
src/main/webapp/static/wms/js/basPlcerrorLog/basPlcerrorLog.js | 42 +++++-----
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 128 ++++++++++++++++++++++++++++++++
src/main/java/com/zy/core/MainProcess.java | 2
src/main/resources/application.yml | 12 +-
4 files changed, 157 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index cf13d45..402ba7e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -104,6 +104,8 @@
private Long avoidDistance;
@Autowired
private TaskWrkLogServiceImpl taskWrkLogService;
+ @Autowired
+ private BasPlcerrorLogServiceImpl basPlcerrorLogService;
public void generateStoreWrkFile() {
try {
@@ -1500,6 +1502,132 @@
}
}
+ /**
+ * 鍫嗗灈鏈哄紓甯镐俊鎭褰�
+ */
+ public void recDevErr() {
+ Date now = new Date();
+ for (DevpSlave devpSlave : slaveProperties.getDevp()) {
+ try{
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devpSlave.getId());
+ Map<Integer, StaProtocol> station = devpThread.getStation();
+ for (StaProtocol staProtocol : station.values()){
+ try{
+ if (staProtocol == null) {
+ continue;
+ }
+// if (staProtocol.isAutoing() != CrnModeType.STOP) {
+// // 鏈変换鍔�
+// if (crnProtocol.getTaskNo() != 0) {
+// BasErrLog latest = basPlcerrorLogService.findLatestByTaskNo(crn.getId(), crnProtocol.getTaskNo().intValue());
+// // 鏈夊紓甯�
+// if (latest == null) {
+// if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
+// TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(crnProtocol.getTaskNo()));
+// if (taskWrk == null) {
+// continue;
+// }
+// BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm().intValue());
+// String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
+// BasErrLog basErrLog = new BasErrLog(
+// null, // 缂栧彿
+// taskWrk.getWrkNo(), // 宸ヤ綔鍙�
+// now, // 鍙戠敓鏃堕棿
+// null, // 缁撴潫鏃堕棿
+// taskWrk.getWrkSts().longValue(), // 宸ヤ綔鐘舵��
+// taskWrk.getIoType(), // 鍏ュ嚭搴撶被鍨�
+// crn.getId(), // 鍫嗗灈鏈�
+// null, // plc
+// taskWrk.getTargetPoint(), // 鐩爣搴撲綅
+// 0, // 鐩爣绔�
+// 0, // 婧愮珯
+// taskWrk.getStartPoint(), // 婧愬簱浣�
+// taskWrk.getBarcode(), // 鏉＄爜
+// (int) crnProtocol.getAlarm(), // 寮傚父鐮�
+// errName, // 寮傚父
+// 1, // 寮傚父鎯呭喌
+// taskWrk.getCreateTime(), // 浠诲姟鏃堕棿(鎺ユ敹鏃堕棿)
+// null, // 娣诲姞浜哄憳
+// now, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// "浠诲姟涓紓甯�" // 澶囨敞
+// );
+// if (!basErrLogService.insert(basErrLog)) {
+// log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", crn.getId(), errName);
+// }
+// }
+// } else {
+// // 寮傚父淇
+// if (crnProtocol.getAlarm() == null || crnProtocol.getAlarm() == 0) {
+// latest.setEndTime(now);
+// latest.setUpdateTime(now);
+// latest.setStatus(2);
+// if (!basErrLogService.updateById(latest)) {
+// log.error("鍫嗗灈鏈簆lc寮傚父璁板綍淇澶辫触 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
+// }
+// }
+// }
+// // 鏃犱换鍔�
+// } else {
+// BasErrLog latest = basErrLogService.findLatest(crn.getId());
+// // 鏈夊紓甯�
+// if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
+// // 璁板綍鏂板紓甯�
+// if (latest == null || (latest.getErrCode() != crnProtocol.getAlarm().intValue())) {
+// BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
+// String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
+// BasErrLog basErrLog = new BasErrLog(
+// null, // 缂栧彿
+// null, // 宸ヤ綔鍙�
+// now, // 鍙戠敓鏃堕棿
+// null, // 缁撴潫鏃堕棿
+// null, // 宸ヤ綔鐘舵��
+// null, // 鍏ュ嚭搴撶被鍨�
+// crn.getId(), // 鍫嗗灈鏈�
+// null, // plc
+// null, // 鐩爣搴撲綅
+// null, // 鐩爣绔�
+// null, // 婧愮珯
+// null, // 婧愬簱浣�
+// null, // 鏉＄爜
+// (int) crnProtocol.getAlarm(), // 寮傚父鐮�
+// errName, // 寮傚父
+// 1, // 寮傚父鎯呭喌
+// now, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// now, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// "鏃犱换鍔″紓甯�" // 澶囨敞
+// );
+// if (!basErrLogService.insert(basErrLog)) {
+// log.error("鍫嗗灈鏈簆lc寮傚父璁板綍澶辫触 ===>> [id:{}] [error:{}]", crn.getId(), errName);
+// }
+// }
+// // 鏃犲紓甯�
+// } else {
+// // 寮傚父淇
+// if (latest != null && latest.getStatus() == 1) {
+// latest.setEndTime(now);
+// latest.setUpdateTime(now);
+// latest.setStatus(2);
+// if (!basErrLogService.updateById(latest)) {
+// log.error("鍫嗗灈鏈簆lc寮傚父璁板綍淇澶辫触 ===>> [id:{}] [errLogId:{}]", crn.getId(), latest.getId());
+// }
+// }
+// }
+// }
+// }
+ } catch (Exception devErr){
+ log.error("杈撻�佺嚎绔欑偣寮傚父淇℃伅璁板綍澶辫触 ===>> [id:{}] [error:{}]", staProtocol.getStaNo(), devErr.getMessage());
+ }
+ }
+ } catch (Exception e){
+ log.error("杈撻�佺嚎寮傚父淇℃伅璁板綍澶辫触 ===>> [id:{}] [error:{}]", devpSlave.getId(), e.getMessage());
+ }
+ }
+ }
+
private TaskWrk createTask(GetWmsDto dto, String barcode) {
String wcsLocNo = dto.getLocNo();
if (Cools.isEmpty(wcsLocNo)) {
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index cf57af9..cc301ec 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -67,6 +67,8 @@
mainService.crnStnToOutStn();
// 鍫嗗灈鏈哄紓甯镐俊鎭褰�
mainService.recCrnErr();
+ // 杈撻�佺嚎寮傚父淇℃伅璁板綍
+// mainService.recDevErr();
// 鍑哄簱 ===>> 鍫嗗灈鏈�5鍒嗛挓鏃犱换鍔″垯鍥炲埌婧愮偣
// mainService.crnStnToOutStnSou();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2730672..0841441 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,13 +14,13 @@
driver-class-name: dm.jdbc.driver.DmDriver
# url: jdbc:dm://27.172.2.102:5236/SOURCE
# url: jdbc:dm://27.172.1.130:5236/SOURCE
- url: jdbc:dm://27.172.1.129:5236/SOURCE
+# url: jdbc:dm://27.172.1.129:5236/SOURCE
# url: jdbc:dm://27.172.1.131/dm?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=GB18030
-# url: jdbc:dm://127.0.0.1:5236/SOURCE
-# username: SYSDBA
-# password: Zy@12345
- username: ZOS_ZEMIC
- password: k3Mq6xRv9frOxb7n
+ url: jdbc:dm://127.0.0.1:5236/SOURCE
+ username: SYSDBA
+ password: Zy@12345
+# username: ZOS_ZEMIC
+# password: k3Mq6xRv9frOxb7n
# username: ENC(++MryJD2j+X3rpmocG4vPH5vxXbpJNrF)
# password: ENC(zOcPLHRUpllsRBQRlRrtQmljC8cKAoSzrGQaBST81MY=)
mvc:
diff --git a/src/main/webapp/static/wms/js/basPlcerrorLog/basPlcerrorLog.js b/src/main/webapp/static/wms/js/basPlcerrorLog/basPlcerrorLog.js
index 222ae39..5ac8351 100644
--- a/src/main/webapp/static/wms/js/basPlcerrorLog/basPlcerrorLog.js
+++ b/src/main/webapp/static/wms/js/basPlcerrorLog/basPlcerrorLog.js
@@ -22,28 +22,28 @@
height: 'full-120',
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: ''}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'startTime$', align: 'center',title: '寮�濮嬫椂闂�'}
- ,{field: 'endTime$', align: 'center',title: '缁撴潫鏃堕棿'}
- ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
- ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
- ,{field: 'plcNo', align: 'center',title: 'plc'}
- ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'staNo', align: 'center',title: '鐩爣绔�'}
- ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯'}
- ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
- ,{field: 'errCode', align: 'center',title: '寮傚父缂栧彿'}
- ,{field: 'err', align: 'center',title: '寮傚父鎻忚堪'}
- ,{field: 'status$', align: 'center',title: '寮傚父鎯呭喌'}
- ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
- ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'id', align: 'center',title: 'ID',hide : true}
+ ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',hide : false}
+ ,{field: 'startTime$', align: 'center',title: '寮�濮嬫椂闂�',hide : false}
+ ,{field: 'endTime$', align: 'center',title: '缁撴潫鏃堕棿',hide : false}
+ ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��',hide : false}
+ ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�',hide : false}
+ ,{field: 'plcNo', align: 'center',title: 'plc',hide : true}
+ ,{field: 'locNo', align: 'center',title: '鐩殑鍦�',hide : false}
+ ,{field: 'staNo', align: 'center',title: '鐩爣绔�',hide : true}
+ ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯',hide : true}
+ ,{field: 'sourceLocNo', align: 'center',title: '璧风偣',hide : false}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜',hide : false}
+ ,{field: 'errCode', align: 'center',title: '寮傚父缂栧彿',hide : true}
+ ,{field: 'err', align: 'center',title: '寮傚父鎻忚堪',hide : false}
+ ,{field: 'status$', align: 'center',title: '寮傚父鎯呭喌',hide : false}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿',hide : true}
+ ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳',hide : true}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿',hide : true}
+ ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳',hide : true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞',hide : false}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120,hide : false}
]],
request: {
pageName: 'curr',
--
Gitblit v1.9.1