From 525047977e8e9074a21567ae9eb5b9f6ac0c07fd Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 14 十月 2023 12:49:07 +0800
Subject: [PATCH] #拣料回库
---
src/main/java/com/zy/asrs/service/BasLiftOptService.java | 2 ++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++++++-
src/main/resources/mapper/BasLiftOptMapper.xml | 6 ++++++
src/main/java/com/zy/asrs/mapper/BasLiftOptMapper.java | 2 ++
src/main/java/com/zy/asrs/service/impl/BasLiftOptServiceImpl.java | 4 ++++
5 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/BasLiftOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasLiftOptMapper.java
index 0acb88d..9c08342 100644
--- a/src/main/java/com/zy/asrs/mapper/BasLiftOptMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasLiftOptMapper.java
@@ -9,4 +9,6 @@
@Repository
public interface BasLiftOptMapper extends BaseMapper<BasLiftOpt> {
+ BasLiftOpt selectByDeviceWrk(String deviceWrk);
+
}
diff --git a/src/main/java/com/zy/asrs/service/BasLiftOptService.java b/src/main/java/com/zy/asrs/service/BasLiftOptService.java
index 40961e0..1f00488 100644
--- a/src/main/java/com/zy/asrs/service/BasLiftOptService.java
+++ b/src/main/java/com/zy/asrs/service/BasLiftOptService.java
@@ -5,4 +5,6 @@
public interface BasLiftOptService extends IService<BasLiftOpt> {
+ BasLiftOpt selectByDeviceWrk(String deviceWrk);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasLiftOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasLiftOptServiceImpl.java
index a581c4b..8761a1d 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasLiftOptServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasLiftOptServiceImpl.java
@@ -9,4 +9,8 @@
@Service("basLiftOptService")
public class BasLiftOptServiceImpl extends ServiceImpl<BasLiftOptMapper, BasLiftOpt> implements BasLiftOptService {
+ @Override
+ public BasLiftOpt selectByDeviceWrk(String deviceWrk) {
+ return this.baseMapper.selectByDeviceWrk(deviceWrk);
+ }
}
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 c8a8972..ae6182d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -102,6 +102,8 @@
private RedisUtil redisUtil;
@Autowired
private WrkMastLocMapper wrkMastLocMapper;
+ @Autowired
+ private BasLiftOptService basLiftOptService;
/**
@@ -1295,8 +1297,14 @@
&& liftProtocol.getTaskNo() != 0
&& !liftProtocol.getBusy()
) {
+ BasLiftOpt basLiftOpt = basLiftOptService.selectByDeviceWrk(liftProtocol.getTaskNo().toString());
+ int taskNo = liftProtocol.getTaskNo().intValue();
+ if (basLiftOpt != null) {
+ taskNo = basLiftOpt.getWrkNo();
+ }
+
//灏嗕换鍔℃。鏍囪涓哄畬鎴�
- WrkMast wrkMast = wrkMastMapper.selectByWorkNo324104(liftProtocol.getTaskNo().intValue());
+ WrkMast wrkMast = wrkMastMapper.selectByWorkNo324104(taskNo);
if (wrkMast != null) {
switch (wrkMast.getWrkSts().intValue()) {
case 3://3.鎻愬崌鏈烘惉杩愪腑 ==> 4.鎻愬崌鏈烘惉杩愬畬鎴�
diff --git a/src/main/resources/mapper/BasLiftOptMapper.xml b/src/main/resources/mapper/BasLiftOptMapper.xml
index 64d0ae3..5436fd3 100644
--- a/src/main/resources/mapper/BasLiftOptMapper.xml
+++ b/src/main/resources/mapper/BasLiftOptMapper.xml
@@ -17,4 +17,10 @@
</resultMap>
+ <select id="selectByDeviceWrk" resultMap="BaseResultMap">
+ select top 1 * from asr_bas_lift_opt
+ where device_wrk = #{deviceWrk}
+ order by send_time desc
+ </select>
+
</mapper>
--
Gitblit v1.9.1