From 21357f1d42f995e11e99a12a5f225fe6442b9ad1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 08 一月 2025 13:05:09 +0800
Subject: [PATCH] 优化定时任务及日志输出，调整订单同步逻辑
---
src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 102 insertions(+), 13 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 ea016b6..2a91852 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocMastServiceImpl.java
@@ -26,9 +26,7 @@
}
public void initLocFloor1() {
- //1妤� 13鎺� 86鍒� 12灞�
- List<AgvLocMast> agvLocMastList = getLocMastList(1,45,1,33,1,1,1);
- this.insertBatch(agvLocMastList);
+ this.insertBatch(getLocMastList(1, 22, 1, 39, 2, 2, 1));
}
@@ -49,7 +47,7 @@
for (int bay = bayIndex; bay <= bayMax; bay++) {
for (int lev = levIndex; lev <= levMax; lev++) {
- if(!checkLocExistFloor3(row,bay)){
+ if(!checkLocExistFloor1_2(row,bay)){
continue;
}
@@ -67,13 +65,87 @@
loc.setModiTime(now);
loc.setFirstTime(now);
loc.setAppeTime(now);
- loc.setLocType1(initLocMastSts3(row,bay));
+ loc.setLocType1((short)3);
+ // loc.setLocType1(initLocMastSts3(row,bay));
agvLocMastList.add(loc);
}
}
}
return agvLocMastList;
+ }
+
+ private boolean checkLocExistFloor1_2(int row, int bay){
+ if(row == 4 && bay == 19){
+ return false;
+ }
+
+ if(row == 5 && (bay == 3 || bay == 8 || bay == 13 || bay == 18 || bay == 19 || bay == 24 || bay == 29)){
+ return false;
+ }
+
+ if((row == 6 || row == 7) && bay == 39){
+ return false;
+ }
+
+ if((row == 9 || row == 10 || row == 14 || row == 18) && (bay == 3 || bay == 8 || bay == 13 || bay == 14 || bay == 19 || bay == 24 || bay == 29 || bay == 30)){
+ return false;
+ }
+ if ((row == 10 || row == 11) && (bay == 7 || bay == 12 || bay == 23 || bay == 28 )) {
+ return false;
+ }
+ if ((row == 9 || row == 13) && bay == 35 ) {
+ return false;
+ }
+ if(row == 13 && (bay == 18 || bay == 19 || bay == 20)){
+ return false;
+ }
+ if(row == 9 && bay == 18){
+ return false;
+ }
+ if((row == 14 || row == 15) && bay > 37){
+ return false;
+ }
+ if(row >= 16 && bay >= 35){
+ return false;
+ }
+ if((row >= 2 && row <= 21) && bay == 17){
+ return false;
+ }
+
+ if(bay >= 33 && bay <= 34){
+ return false;
+ }
+
+ return true;
+ }
+ private boolean checkLocExistFloor1_1(int row, int bay){
+ if(row <= 2 && bay >= 20){
+ return false;
+ }
+ if ((row == 4 || row == 9 || row == 14 || row == 20 || row == 25 || row == 30) && (bay == 7 || bay == 11 || bay == 12 || bay == 16 )) {
+ return false;
+ }
+ if ((row == 7 || row == 13 || row == 21 || row == 26) && (bay == 12 || bay == 13 )) {
+ return false;
+ }
+ if (row >= 10 && bay == 1) {
+ return false;
+ }
+ if (row == 18 && bay <= 19) {
+ return false;
+ }
+ if (row == 25 && bay == 20) {
+ return false;
+ }
+ if ((row >= 26 && row <=27) && (bay >=18 && bay <= 19)) {
+ return false;
+ }
+ if (row >= 28 && bay == 20) {
+ return false;
+ }
+
+ return true;
}
private boolean checkLocExistFloor2(int row, int bay){
@@ -129,7 +201,7 @@
return false;
}
- if(row <= 6 && bay >= 29){
+ if(row <= 6 && bay >= 30){
return false;
}
@@ -140,13 +212,13 @@
return false;
}
- if(row <= 21 && bay >= 33){
+ if(row <= 21 && row != 7 && row != 8 && bay >= 33){
return false;
}
- if(row <= 24 && bay >= 34){
+ if((row <= 24 && row != 7 && row != 8) && bay >= 34){
return false;
}
- if(row <= 26 && bay >= 29){
+ if(row >= 25 && row <= 26 && bay >= 29){
return false;
}
@@ -155,7 +227,7 @@
return false;
}
- if((row != 22 && row != 23 && row != 24 && row != 25 ) && bay == 16){
+ if((row >= 22 && row != 26 ) && bay == 16){
return false;
}
@@ -183,7 +255,7 @@
return 2;
}
- if(row <= 18 && bay <= 8){
+ if(row <= 18 && bay >= 9){
return 2;
}
@@ -298,6 +370,17 @@
agvLocMast.setLocSts(locSts);
agvLocMast.setBarcode(barcode);
agvLocMast.setLocType2(containerType);
+ agvLocMast.setModiTime(new Date());
+ this.updateById(agvLocMast);
+ }
+ public void updateLocStsByLocNo(String locNo, String locSts, String barcode,Short containerType,String locType,Short locType3) {
+ AgvLocMast agvLocMast = this.selectById(locNo);
+ agvLocMast.setLocSts(locSts);
+ agvLocMast.setBarcode(barcode);
+ agvLocMast.setLocType2(containerType);
+ agvLocMast.setLocType(locType);
+ agvLocMast.setLocType3(locType3);
+ agvLocMast.setModiTime(new Date());
this.updateById(agvLocMast);
}
@@ -313,9 +396,9 @@
}
@Override
- public AgvLocMast selectEmptyZpallet(int type) {
+ public AgvLocMast selectEmptyZpallet(int type, int floor) {
- return this.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_sts","D").eq("loc_type2",type));
+ return this.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_sts","D").eq("loc_type2",type).eq("floor",floor));
}
@@ -331,4 +414,10 @@
return this.baseMapper.queryContainerTypeByLocType1(locType1);
}
+ @Override
+ public List<AgvLocMast> selectDistinctLocByLevAndFloor(int lev, int floor) {
+
+ return this.agvLocMastMapper.selectDistinctLocByLevAndFloor(lev,floor);
+ }
+
}
--
Gitblit v1.9.1