From b5768fb9a6bf4216aba11d7f784e8cefc8fdaf9b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 27 三月 2024 14:54:48 +0800
Subject: [PATCH] 定时任务完成
---
src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 177 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 149 insertions(+), 28 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 57250ad..43c140a 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
@@ -27,27 +27,14 @@
public void initLocFloor1() {
//1妤� 13鎺� 86鍒� 12灞�
- List<AgvLocMast> agvLocMastList = getLocMastList(1,13,1,86,1,12,1);
+ List<AgvLocMast> agvLocMastList = getLocMastList(1,45,1,33,1,1,1);
this.insertBatch(agvLocMastList);
}
- public void initLocFloor3() {
- //3妤� 1-33鎺� 1-14鍒� 8灞�
- this.insertBatch(getLocMastList(1, 33, 1, 14, 1, 8, 3));
-
- //3妤� 1-27鎺� 15-34鍒� 8灞�
- this.insertBatch(getLocMastList(1, 27, 15, 34, 1, 8, 3));
-
- //3妤� 1-25鎺� 35-46鍒� 8灞�
- this.insertBatch(getLocMastList(1, 25, 35, 46, 1, 8, 3));
-
- //3妤� 3-25鎺� 47-60鍒� 8灞�
- this.insertBatch(getLocMastList(3, 25, 47, 60, 1, 8, 3));
-
- //3妤� 4-25鎺� 61-70鍒� 8灞�
- this.insertBatch(getLocMastList(4, 25, 61, 70, 1, 8, 3));
-
+ public void initLocFloor2() {
+ //2妤� 1-25鎺� 1-33鍒� 1灞�
+ this.insertBatch(getLocMastList(1, 25, 1, 33, 1, 1, 2));
}
//鏍规嵁鎺掑垪灞傝幏鍙朅GV搴撲綅鍒楄〃
@@ -57,22 +44,16 @@
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;
- }
+
+ if(!checkLocExistFloor2(row,bay)){
+ 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 = "SK" + locRow + locBay + locLev + "@" + floor;
+ String locNo = "YZ" + locRow + locBay + locLev + "@" + floor;
loc.setLocNo(locNo);
loc.setLocSts("O");
loc.setRow1(row);
@@ -82,12 +63,143 @@
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 >= 17){
+ return false;
+ }
+
+ if(row <= 7 && bay >= 26){
+ 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;
+ }
+
+ 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){
+ //if(floor == 1 && (row == 2)){
+ // 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)){
+ // return false;
+ // }
+ //}
+ if (floor == 1) {
+ if (row == 2 || row == 5 || row == 8 || row == 11
+ || row == 14 || row == 17 || row == 19 || row == 22 || row == 25
+ || row == 28 || (row >29 && row <39)|| row == 41|| row == 44) {
+ return false;
+ } else if (row == 1) {
+ if (bay < 19) {
+ return false;
+ }
+ } else if (row == 3 || row == 4) {
+ if (bay < 19 || bay == 26) {
+ return false;
+ }
+ } else if (row == 6) {
+ if (bay < 20 || bay == 26 || bay == 30) {
+ return false;
+ }
+ } else if (row == 7) {
+ if (bay < 4 || bay == 26) {
+ return false;
+ }
+ } else if (row == 9 || row ==10 ) {
+ if (bay < 4 || bay == 12 || bay == 26) {
+ return false;
+ }
+ } else if (row == 12) {
+ if (bay < 4) {
+ return false;
+ }
+ } else if (row == 15 || row == 18 || row == 20 || row == 21 || row == 24 || row == 26 || row == 27 || row == 40) {
+ if (bay == 12 || bay == 26) {
+ return false;
+ }
+ } else if (row == 16 || row == 23 || row == 39) {
+ if (bay == 3 || bay == 4 || bay == 9 || bay == 12 || bay == 14 || bay == 20 || bay == 25 || bay == 26) {
+ return false;
+ }
+ } else if (row == 42) {
+ if (bay == 5 || bay == 12 || bay == 26) {
+ return false;
+ }
+ } else if (row == 43) {
+ if (bay < 6 || bay == 12 || bay == 26) {
+ return false;
+ }
+ } else if (row == 45) {
+ if (bay < 6) {
+ return false;
+ }
+ } else {
+ return true;
+ }
+ }
+
+ if(floor == 3){
+ if(row == 1 && bay > 63){
+ return false;
+ }
+ if(row == 2 && bay > 65){
+ return false;
+ }
+ if(row > 23 && bay == 1){
+ return false;
+ }
+
+ if(bay > 35 && bay < 39){
+ if(row == 4 || row == 5 || row == 10 || row == 11 || row == 17 || row == 18){
+ return false;
+ }
+ }
+ }
+ return true;
}
@Override
@@ -100,9 +212,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) {
+ 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);
}
@@ -117,4 +231,11 @@
//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));
+
+ }
+
}
--
Gitblit v1.9.1