From e72f4946b1696a570022d6ae715fa07656ab89f7 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 27 九月 2023 13:07:43 +0800
Subject: [PATCH] Merge branch 'tzskasrs' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs
---
src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
index 0303c56..e67221b 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.AgvLocRule;
@@ -18,10 +19,10 @@
public class AgvLocMastServiceImpl extends ServiceImpl<AgvLocMastMapper, AgvLocMast> implements AgvLocMastService {
@Autowired
- AgvLocMastMapper agvLockMastMapper;
+ AgvLocMastMapper agvLocMastMapper;
public void clearLoc(){
- agvLockMastMapper.deleteAll();
+ agvLocMastMapper.deleteAll();
}
public void initLocFloor1() {
@@ -88,4 +89,21 @@
this.baseMapper.updateLocType2(locType2,locRule.getRowBeg(),locRule.getRowEnd(),locRule.getBayBeg(),locRule.getBayEnd(),locRule.getLevBeg(),locRule.getLevEnd(),locRule.getFloor());
}
+ public void updateLocStsByLocNo(String locNo, String locSts) {
+ AgvLocMast agvLocMast = this.selectById(locNo);
+ agvLocMast.setLocSts(locSts);
+ this.updateById(agvLocMast);
+ }
+
+ public List<String> queryGroupEmptyStock(int floor) {
+ return this.baseMapper.queryGroupEmptyStock(floor);
+ }
+
+ public List<AgvLocMast> selectLocByLevAndFloor(int lev, int floor) {
+
+ List<AgvLocMast> agvLocMastList = this.selectList(new EntityWrapper<AgvLocMast>().eq("lev1", lev).eq("floor", floor));
+ return agvLocMastList;
+ //return this.agvLocMastMapper.selectLocByLevAndFloor(lev,floor);
+ }
+
}
--
Gitblit v1.9.1