From 9c3bbe178e4e152109161bf9ca98d78d175a9529 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 一月 2021 15:39:35 +0800
Subject: [PATCH] #test
---
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 ++++
3 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 70ca16b..3143f40 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -49,6 +49,8 @@
// @Select("select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and (io_type=11 or io_type=110) and crn_no=#{crnNo} order by io_time,wrk_no")
WrkMast selectLocMove(@Param("crnNo")Integer crnNo);
+ WrkMast selectLocMoving(@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 baf7952..96240c5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -663,6 +663,11 @@
return;
}
+ // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�
+ if (wrkMastMapper.selectLocMoving(slave.getId()) != null) {
+ return;
+ }
+
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index ec3741c..eee9397 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -111,4 +111,8 @@
select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
</select>
+ <select id="selectLocMoving" resultMap="BaseResultMap">
+ 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>
+
</mapper>
--
Gitblit v1.9.1