From 16b5ee9a6db2f21192d435dbf3dab71b5fad7804 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 14 四月 2024 19:34:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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 b34b3e9..66cf080 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
@@ -50,10 +50,10 @@
}
AgvLocMast loc = new AgvLocMast();
- String locRow = row < 10 ? "-00" + row : "-0" + row;
- String locBay = bay < 10 ? "-00" + bay : "-0" + bay;
- String locLev = lev < 10 ? "-0" + lev : "-" + lev;
- String locNo = "YZ" + locRow + locBay + locLev + "@" + floor;
+ String locRow = row < 10 ? "_00" + row : "_0" + row;
+ String locBay = bay < 10 ? "_00" + bay : "_0" + bay;
+ String locLev = lev < 10 ? "_0" + lev : "_" + lev;
+ String locNo = "YZ" + locRow + locBay + locLev + "F" + floor;
loc.setLocNo(locNo);
loc.setLocSts("O");
loc.setRow1(row);
@@ -73,11 +73,11 @@
}
private boolean checkLocExistFloor2(int row, int bay){
- if(row <= 4 && bay >= 17){
+ if(row <= 4 && bay >= 13){
return false;
}
- if(row <= 7 && bay >= 26){
+ if(row <= 7 && bay >= 25){
return false;
}
@@ -94,6 +94,10 @@
}
if(row == 21 && bay == 15){
+ return false;
+ }
+
+ if(row == 23 && bay == 29){
return false;
}
@@ -212,10 +216,11 @@
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, String barcode) {
+ public void updateLocStsByLocNo(String locNo, String locSts, String barcode,Short containerType) {
AgvLocMast agvLocMast = this.selectById(locNo);
agvLocMast.setLocSts(locSts);
agvLocMast.setBarcode(barcode);
+ agvLocMast.setLocType2(containerType);
this.updateById(agvLocMast);
}
@@ -237,4 +242,16 @@
}
+ @Override
+ public AgvLocMast selectEmptyZpalletByLocType1(int type) {
+
+ return this.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_sts","D").eq("loc_type1",type));
+
+ }
+
+ @Override
+ public List<String> queryContainerTypeByLocType1(Short locType1) {
+ return this.baseMapper.queryContainerTypeByLocType1(locType1);
+ }
+
}
--
Gitblit v1.9.1