From 29377e64aa049612af1ea511cbbc451e884952fc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 16 一月 2021 14:42:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 +++++
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 2 ++
src/main/resources/mapper/WrkMastMapper.xml | 4 ++++
src/main/resources/application.yml | 2 +-
4 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 3143f40..c236c59 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -51,6 +51,8 @@
WrkMast selectLocMoving(@Param("crnNo")Integer crnNo);
+ WrkMast selectWorking(@Param("crnNo")Integer crnNo);
+
// work log -------------------------------------------------------
@Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
int saveWrkMastLog(Integer workNo);
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 adcbd92..f9519b3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -599,6 +599,11 @@
}
}
+ // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+ if (wrkMastMapper.selectWorking(slave.getId()) != null) {
+ return;
+ }
+
// 1.鍫嗗灈鏈哄紑濮嬬Щ鍔�
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7de841f..164f7b7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -137,7 +137,7 @@
staNo: 205
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[1]:
- staNo: 205
+ staNo: 202
# 鍑哄簱鍙�1
outSta[0]:
staNo: 200
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index eee9397..df7ccb9 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -115,4 +115,8 @@
select top 1 * from dbo.asr_wrk_mast where wrk_sts=12 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
</select>
+ <select id="selectWorking" resultMap="BaseResultMap">
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts=12 and crn_no=#{crnNo} order by io_time,wrk_no
+ </select>
+
</mapper>
--
Gitblit v1.9.1