From 8d589bc8baeadc9d29c2523cf766040a5f5e5995 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 07 五月 2024 00:30:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
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 1cf3101..2be82e0 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());
//鏍囪鏄惁涓鸿緭閫佺嚎鍏ュ簱
@@ -320,7 +320,19 @@
Date now = new Date();
+ Short locType = 0;
+
AgvBasDevp agvBasDevp = agvBasDevpService.selectById(station);
+ if (Cools.isEmpty(agvBasDevp)) {
+ throw new CoolException("鏆傛棤"+ station + "绔欑偣");
+ }
+ if (containerType == 21 && agvBasDevp.getFloor() == 3) {
+ locType = 4;
+ } else if (containerType == 20 && agvBasDevp.getFloor() == 3) {
+ locType = 2;
+ } else {
+ locType = agvBasDevp.getLocType1();
+ }
if(!Cools.eq(agvBasDevp.getBarcode(),containerCode) && !agvBasDevp.getLocSts().equals("O") && !emptyAutoIn){
throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts()+",鏃犳硶杩涜绌烘澘鍏ュ簱");
@@ -333,7 +345,7 @@
}
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
- AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1());
+ AgvLocMast agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor());
//鏌ヨ鍏ュ簱閫氱煡妗�
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectByContainerCode(containerCode);
@@ -379,7 +391,7 @@
}
//瀵绘壘鐩稿簲绫诲瀷鐨勭┖鎵樼洏
- AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType);
+ AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType,agvBasDevp.getFloor());
if(containerType == 0){
//绌烘澘鑷姩鍑哄簱锛屾牴鎹珯鐐圭被鍨嬮�夋嫨
agvLocMastService.selectEmptyZpalletByLocType1(agvBasDevp.getLocType1());
@@ -492,6 +504,7 @@
locDetl.setModiTime(now);
locDetl.setAppeUser(userId);
locDetl.setAppeTime(now);
+ locDetl.setOrderNo(adjust.getOrderNo());
locDetl.setThreeCode(adjust.getThreeCode());
locDetl.setDeadTime(adjust.getDeadTime());
locDetl.setSuppCode(adjust.getSuppCode());
--
Gitblit v1.9.1