From 9d2d63ee09e8bcf494fc3fd14a48d82731fac9ef Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 24 四月 2024 09:14:38 +0800
Subject: [PATCH] 根据楼层入库出库
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 2 +-
src/main/java/com/zy/common/service/AgvCommonService.java | 7 ++++---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/controller/OutController.java | 2 +-
src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java | 3 ++-
src/main/java/com/zy/asrs/service/AgvBasDevpService.java | 2 +-
7 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 1d81ae8..86c3006 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -126,7 +126,7 @@
}
AgvLocMast agvLocMast = agvLocMastService.selectById(locDto.getLocNo());
- List<String> staNoList = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1());
+ List<String> staNoList = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(),agvLocMast.getFloor());
if(!staNoList.contains(locDto.getAgvStaNo())){
return R.error(locDto.getStaNo()+"璇ョ珯鐐瑰凡鏈夊嚭搴撲换鍔★紝鏃犳硶閫夋嫨璇ョ珯鐐瑰嚭搴�");
diff --git a/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
index e17d619..6fcda28 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
@@ -33,8 +33,9 @@
"WHERE\n" +
"\tagv_wrk_mast.loc_no IS NULL \n" +
"\tAND agv_bas_devp.loc_type1 = #{locType} \n" +
+ "\tAND agv_bas_devp.floor = #{floor} \n" +
"\tAND agv_bas_devp.out_enable = 'Y'")
- List<String> selectCacheShelvesStationCodeByLocType(@Param("locType") Short locType);
+ List<String> selectCacheShelvesStationCodeByLocType(@Param("locType") Short locType, @Param("floor") int floor);
@Select("SELECT\n" +
"\tbas.dev_no,\n" +
diff --git a/src/main/java/com/zy/asrs/service/AgvBasDevpService.java b/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
index a55f78e..399593a 100644
--- a/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/AgvBasDevpService.java
@@ -25,7 +25,7 @@
List<AgvBasDevp> getBasDevpByNoCacheShelves();
List<String> selectCacheShelvesStationCodeByFloor(int floor);
- List<String> selectCacheShelvesStationCodeByLocType(short locType);
+ List<String> selectCacheShelvesStationCodeByLocType(short locType, int floor);
public List<Map<String,Object>> selectDevNoAndNumBystationCode(String stationCode);
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
index 7adeaaa..c398131 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -300,8 +300,8 @@
}
@Override
- public List<String> selectCacheShelvesStationCodeByLocType(short locType) {
- return this.baseMapper.selectCacheShelvesStationCodeByLocType(locType);
+ public List<String> selectCacheShelvesStationCodeByLocType(short locType, int floor) {
+ return this.baseMapper.selectCacheShelvesStationCodeByLocType(locType,floor);
}
public List<Map<String,Object>> selectDevNoAndNumBystationCode(String stationCode){
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index 9dc37f9..ed9acce 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -93,7 +93,7 @@
//褰撳墠搴撲綅鎵�澶勬ゼ灞�
int floor = Integer.parseInt(agvLocDetl.getLocNo().split("F")[1]);
//locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
- locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1()));
+ locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(),floor));
locDtoList.add(locDto);
issued -= anfme;
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 2d5de68..228e5a9 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -89,7 +89,7 @@
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", agvBasDevp.getBarcode()));
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1());
+ AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1(),agvBasDevp.getFloor());
//鐢熸垚宸ヤ綔妗�
AgvWrkMast wrkMast = createWrkMast(1,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),agvBasDevp.getBarcode(),now,userId, agvBasDevp.getLocType2());
//鏍囪鏄惁涓鸿緭閫佺嚎鍏ュ簱
@@ -333,7 +333,7 @@
}
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1());
+ AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1(),agvBasDevp.getFloor());
//鏌ヨ鍏ュ簱閫氱煡妗�
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectByContainerCode(containerCode);
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index b362b5b..ccf1f43 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -71,7 +71,7 @@
* 妫�绱㈠簱浣嶅彿
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public AgvLocMast getLocNo(int type) {
+ public AgvLocMast getLocNo(int type, int floor) {
// 鐩爣搴撲綅
AgvLocMast locMast = null;
// if(Cools.isEmpty(agvWaitPakinList)){
@@ -110,7 +110,7 @@
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
- locMast = getLocNoRule(type);
+ locMast = getLocNoRule(type,floor);
if (locMast != null) {
return locMast;
}
@@ -227,9 +227,10 @@
}
//闅忔満鍙栦竴涓揣浣�
- private AgvLocMast getLocNoRule(int type){
+ private AgvLocMast getLocNoRule(int type,int floor){
return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
.eq("loc_sts","O")
+ .eq("floor",floor)
.eq("loc_type1",type));
}
--
Gitblit v1.9.1