From 368061fade130fab3a1df1cb1ab5e50d6f20a112 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 十月 2023 10:58:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 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 8f3d445..57250ad 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() {
@@ -56,6 +57,17 @@
for(int row=rowIndex; row<=rowMax; row++) {
for (int bay = bayIndex; bay <= bayMax; bay++) {
for (int lev = levIndex; lev <= levMax; lev++) {
+ if(row == 8 || row == 9){
+ if((bay >=8 && bay <=11)
+ || (bay >= 20 && bay <=23)
+ || (bay>=37 && bay <=39)
+ || (bay>=50 && bay <=52)
+ || (bay>=63 && bay <=64)
+ || (bay>=79 && bay <=80)){
+ continue;
+ }
+ }
+
AgvLocMast loc = new AgvLocMast();
String locRow = row < 10 ? "-00" + row : "-0" + row;
String locBay = bay < 10 ? "-00" + bay : "-0" + bay;
@@ -94,4 +106,15 @@
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