From 577ba7f365c4dcb94053618681280150086d3c17 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 19 七月 2024 22:27:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 11 +++++++++++
src/main/resources/application.yml | 8 ++++----
2 files changed, 15 insertions(+), 4 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 b6ce937..0583f34 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4958,6 +4958,17 @@
if (basJarMastList.size()!=integer){
log.error("{}鍙风～鍖栫綈纭寲瀹屾垚鍚庡紑闂ㄥ畬鎴愪慨鏀圭～鍖栨。妗堢姸鎬佺粨鏋滄暟閲忎笉涓�鑷达紒锛侊紒鏌ヨ璧勬枡鏁伴噺={}锛屾洿鏂拌繑鍥炴暟閲�={}",jarMastByWrkNo.getJarId(),basJarMastList.size(),integer);
}
+ } else if (wrkMastExecute.getIoType()==2 && jarMastByWrkNo.getStatus()==5){
+ List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarMastByWrkNo.getJarId(), new ArrayList<Integer>() {{
+ add(4);//纭寲瀹屾垚
+ }});
+ if (basJarMastList.isEmpty()){
+ continue;
+ }
+ Integer integer = basJarMastService.updateStatus(jarMastByWrkNo.getJarId(), 4, 5);
+ if (basJarMastList.size()!=integer){
+ log.error("{}鍙风～鍖栫綈纭寲瀹屾垚鍚庡紑闂ㄥ畬鎴愪慨鏀圭～鍖栨。妗堢姸鎬佺粨鏋滄暟閲忎笉涓�鑷达紒锛侊紒鏌ヨ璧勬枡鏁伴噺={}锛屾洿鏂拌繑鍥炴暟閲�={}",jarMastByWrkNo.getJarId(),basJarMastList.size(),integer);
+ }
} else {
if (!basJarMastService.updateById(jarMastByWrkNo)){
log.error("纭寲鍖哄煙鍒嗘浠诲姟瀹屾垚寮傚父,BasJarMast={},寮傚父淇℃伅={}",JSON.toJSONString(jarMastByWrkNo),"鏇存柊basJarMast澶辫触");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f4252a0..6927122 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -671,24 +671,24 @@
# 纾呯Г
scale[0]:
id: 1
- ip: 10.10.10.211
+ ip: 10.10.10.206
port: 5005
staNo: 281
# 纾呯Г
scale[1]:
id: 2
- ip: 10.10.10.212
+ ip: 10.10.10.207
port: 5005
staNo: 292
# 纾呯Г
scale[2]:
id: 3
- ip: 10.10.10.213
+ ip: 10.10.10.208
port: 5005
staNo: 453
# 纾呯Г
scale[3]:
id: 4
- ip: 10.10.10.214
+ ip: 10.10.10.209
port: 5005
staNo: 460
\ No newline at end of file
--
Gitblit v1.9.1