From c135b2adb55f470ca20b434ed71ae48d8874d6b0 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 11:05:06 +0800
Subject: [PATCH] 订单系统bug
---
src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 112 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 79 insertions(+), 33 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 e9ed33b..66cf080 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
@@ -32,22 +32,9 @@
}
- public void initLocFloor3() {
- //3妤� 1-33鎺� 1-14鍒� 8灞� ------> 1-33鎺� 1-17鍒� 8灞�
-// this.insertBatch(getLocMastList(1, 33, 1, 17, 1, 8, 3));
-//
-// //3妤� 1-27鎺� 15-34鍒� 8灞� ------> 1-26鎺� 18-25鍒� 8灞�
-// this.insertBatch(getLocMastList(1, 27, 18, 25, 1, 8, 3));
-//
-// //3妤� 1-25鎺� 35-46鍒� 8灞� ------> 1-25鎺� 26-35鍒� 8灞�
-// this.insertBatch(getLocMastList(1, 25, 26, 35, 1, 8, 3));
-//
-// //3妤� 3-25鎺� 47-60鍒� 8灞� ------> 1-23鎺� 36-70鍒� 8灞�
-// this.insertBatch(getLocMastList(1, 23, 36, 70, 1, 8, 3));
-
- //3妤� 3-23鎺� 71-72鍒� 8灞�
- this.insertBatch(getLocMastList(3, 23, 71, 72, 1, 8, 3));
-
+ public void initLocFloor2() {
+ //2妤� 1-25鎺� 1-33鍒� 1灞�
+ this.insertBatch(getLocMastList(1, 25, 1, 33, 1, 1, 2));
}
//鏍规嵁鎺掑垪灞傝幏鍙朅GV搴撲綅鍒楄〃
@@ -58,26 +45,15 @@
for (int bay = bayIndex; bay <= bayMax; bay++) {
for (int lev = levIndex; lev <= levMax; lev++) {
- if(!checkLocExist(row,bay,floor)){
+ if(!checkLocExistFloor2(row,bay)){
continue;
}
-// if(floor == 1 && (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;
- 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);
@@ -87,12 +63,62 @@
loc.setModiTime(now);
loc.setFirstTime(now);
loc.setAppeTime(now);
+ loc.setLocType1(initLocMastSts(row,bay));
agvLocMastList.add(loc);
}
}
}
return agvLocMastList;
+ }
+
+ private boolean checkLocExistFloor2(int row, int bay){
+ if(row <= 4 && bay >= 13){
+ return false;
+ }
+
+ if(row <= 7 && bay >= 25){
+ return false;
+ }
+
+ if(row >= 24 && bay >= 29){
+ return false;
+ }
+
+ if((row != 20 && row != 25) && (bay ==8 || bay ==22)){
+ return false;
+ }
+
+ if((row == 3 || row == 12 || row == 16 || row == 21) && (bay ==4 || bay ==9 || bay == 14 || bay == 20 || bay == 25 || bay ==30 || bay == 31)){
+ return false;
+ }
+
+ if(row == 21 && bay == 15){
+ return false;
+ }
+
+ if(row == 23 && bay == 29){
+ return false;
+ }
+
+ return true;
+ }
+
+ private short initLocMastSts(int row, int bay){
+
+ if(row <= 11 && bay <= 14){
+ return 1;
+ }
+
+ if(row <= 7){
+ return 1;
+ }
+
+ if(row >= 21){
+ return 3;
+ }
+
+ return 2;
}
private boolean checkLocExist(int row, int bay, int floor){
@@ -190,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);
}
@@ -208,4 +235,23 @@
//return this.agvLocMastMapper.selectLocByLevAndFloor(lev,floor);
}
+ @Override
+ public AgvLocMast selectEmptyZpallet(int type) {
+
+ return this.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_sts","D").eq("loc_type2",type));
+
+ }
+
+ @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