From 7068884725c81ea673cefd72c5d4d08ad7725028 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 05 十二月 2022 13:41:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 24 ++++++++++++++++++------
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 2 ++
src/main/resources/mapper/WrkMastMapper.xml | 15 +++++++++++++++
3 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index c13627a..415a87d 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -85,4 +85,6 @@
WrkMast selectPakout(@Param("crnNo")Integer crnNo, @Param("steNo")Integer steNo);
+ WrkMast selectWorkingByCrn(@Param("crnNo")Integer crnNo);
+
}
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 598e97e..39769f1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -39,7 +39,6 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -537,7 +536,6 @@
/**
* 鍫嗗灈鏈虹珯鍑哄簱鍒板嚭搴撶珯
*/
- @Async
public void crnStnToOutStn() {
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
// 閬嶅巻鍫嗗灈鏈哄嚭搴撶珯
@@ -1646,7 +1644,6 @@
/**
* 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
*/
- @Async
@Transactional
public void storeFinished() {
for (CrnSlave crn : slaveProperties.getCrn()) {
@@ -2312,7 +2309,6 @@
/**
* 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�
*/
- @Async
public void storeEmptyPlt(){
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻绌烘澘鍏ュ簱鍙�
@@ -2401,7 +2397,6 @@
/**
* 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
*/
- @Async
public void ledExecute() {
for (LedSlave led : slaveProperties.getLed()) {
// 鑾峰彇杈撻�佺嚎plc绾跨▼
@@ -2502,7 +2497,6 @@
/**
* 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
*/
- @Async
public void ledReset() {
for (LedSlave led : slaveProperties.getLed()) {
// 鑾峰彇杈撻�佺嚎plc绾跨▼
@@ -2712,6 +2706,11 @@
// 22.灏忚溅寰呮惉
if (wrkCharge.getWrkSts() == 22) {
+ // 鍏ュ嚭搴撲换鍔′紭鍏�
+ if (null != wrkMastMapper.selectWorkingByCrn(wrkCharge.getCrnNo())) {
+ return;
+ }
+
// 鎼皬杞﹁嚦灏忚溅璧板悜閫氶亾
List<String> channel = slaveProperties.getChannel();
for (String channelLocNo : channel) {
@@ -2787,6 +2786,11 @@
} else if (wrkCharge.getWrkSts() == 26) {
// 鍥哄畾鍫嗗灈鏈�
int crnNo = 1;
+ // 鍏ュ嚭搴撲换鍔′紭鍏�
+ if (null != wrkMastMapper.selectWorkingByCrn(crnNo)) {
+ return;
+ }
+
// 鍏呯數浣�
LocMast chargeLoc = locMastService.selectById(wrkCharge.getLocNo());
@@ -2942,6 +2946,10 @@
} else {
// 鍥哄畾鍫嗗灈鏈�
int crnNo = 1;
+ if (null != wrkMastMapper.selectWorkingByCrn(crnNo)) {
+ return;
+ }
+
LocMast channelLoc = locMastService.selectById(channelLocNo);
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnNo);
@@ -3006,6 +3014,10 @@
}
}
} else if (wrkCharge.getWrkSts() == 45L) {
+ if (null != wrkMastMapper.selectWorkingByCrn(wrkCharge.getCrnNo())) {
+ return;
+ }
+
LocMast idleLoc = locMastService.selectById(basSte.getIdleLoc());
Integer otherSte = existOtherSte(idleLoc.getLocNo(), wrkCharge.getSteNo());
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 4e74ad3..433363f 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -169,4 +169,19 @@
</if>
</select>
+ <select id="selectWorkingByCrn" resultMap="BaseResultMap">
+ select top 1 *
+ from dbo.asr_wrk_mast
+ where 1=1
+ and
+ (
+ (wrk_sts in (2,3,4,5,6,7))
+ or
+ (wrk_sts in (11,12,13,14,15,16))
+ )
+ <if test="crnNo != null">
+ and crn_no = #{crnNo}
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.9.1