From 4812f5c3d98928c45f0d3cad6a60045e986fa7c1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 22 二月 2022 16:54:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3 +--
src/main/resources/application.yml | 2 +-
2 files changed, 2 insertions(+), 3 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 a0c3c1e..4b2bef2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -298,8 +298,7 @@
/**
* 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
*/
- @Async
- public void stnToCrnStnPick(){
+ public synchronized void stnToCrnStnPick(){
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鎷ｆ枡鍏ュ簱鍙�
for (DevpSlave.Sta pickSta : devp.getPickSta()) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3c687bd..1af7423 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -180,7 +180,7 @@
staNo: 182
# 鎷ｆ枡鍏ュ簱鍙�
pickSta[0]:
- staNo: 173
+ staNo: 176
barcode: ${wcs-slave.barcode[0].id}
# 鏉＄爜鎵弿浠�
barcode[0]:
--
Gitblit v1.9.1