From 167d58392c667c7ab02de2d5a9f86c8a7842520f Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 28 八月 2023 15:50:18 +0800
Subject: [PATCH] 消防报警移库改出库
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/resources/application.yml | 11 ++++++++++-
2 files changed, 11 insertions(+), 2 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 000c375..35386cf 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -849,7 +849,7 @@
if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() !=null && staDetl.getCanouting().equals("Y")
&& staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
//娴嬭瘯搴撲綅鍑哄簱蹇呴』瑕佹寜鍚姩鎸夐挳鎵嶈兘鍑哄簱
- if(wrkMast.getStaNo()==206 && locMast.getCtnKind()==0){
+ if((wrkMast.getStaNo()==206 || wrkMast.getStaNo()==1000)&& locMast.getCtnKind()==0){
log.error("鍑哄簱 ===>> 绛夊緟鍚姩鍑哄簱鎸夐挳",wrkMast);
continue;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5272dec..5db0b6b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,7 +9,6 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs
-
username: sa
password: sa@123
mvc:
@@ -69,6 +68,13 @@
row: 2
bay: 0
lev: 1
+ # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]:
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staNo: 1000
+ row: 1
+ bay: 25
+ lev: 1
# 鍫嗗灈鏈�2
crn[1]:
id: 2
@@ -124,6 +130,9 @@
# 鍑哄簱鍙�3
outSta[2]:
staNo: 205
+ # 鍑哄簱鍙�4
+ outSta[3]:
+ staNo: 1000
# 鏉＄爜鎵弿浠�1
barcode[0]:
id: 1
--
Gitblit v1.9.1