From d17a7346759fbb432cea1c83de63d29c6a3d330d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 24 五月 2024 10:14:06 +0800
Subject: [PATCH] # 自动回流取消任务更改源库位为D
---
src/main/java/com/zy/common/service/AgvCommonService.java | 28 ++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 7 ++++++-
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 2 +-
3 files changed, 35 insertions(+), 2 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 1e9004f..fa57596 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -599,6 +599,7 @@
agvLocMastService.updateLocStsByLocNo(locNo,"O","",null);
agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"F",wrkMast.getBarcode(),wrkMast.getWhsType().shortValue());
+
// 绉诲簱鍙栨秷
} else if( wrkMast.getIoType() == 11 || wrkMast.getIoType() == 12) {
//婧愬簱浣�
@@ -640,7 +641,11 @@
String locNo = wrkMast.getSourceLocNo();
//鐩爣绔欑偣
String devNo = wrkMast.getLocNo();
- agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
+ if (wrkMast.getIoType() == 110 || wrkMast.getIoType() == 109) {
+ agvLocMastService.updateLocStsByLocNo(locNo,"D",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
+ } else {
+ agvLocMastService.updateLocStsByLocNo(locNo,"F",wrkMast.getBarcode(),(short)getContainerTypeByloc(locNo));
+ }
agvBasDevpService.updateLocStsAndBarcodeByDevNo(devNo,"O","",null);
}
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
index d48bf52..8fd6638 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -238,7 +238,7 @@
throw new CoolException("褰撳墠"+agvLocMast.getBarcode()+"璐ф灦鐮佸凡鍦ㄥ伐浣滄。涓�");
}
//妫�绱㈢┖闂叉帴椹充綅锛岄�夋嫨鍚堥�傜殑鎺ラ┏浣�
- AgvBasDevp devpNo = agvCommonService.getDevpNo(3, agvLocMast.getFloor());
+ AgvBasDevp devpNo = agvCommonService.getDevpNoisAuto(3, agvLocMast.getFloor(),"Y");
//鐢熸垚宸ヤ綔妗�
AgvWrkMast mast = new AgvWrkMast();
//宸ヤ綔鐘舵��
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index f8c55c2..20789e2 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -253,6 +253,24 @@
throw new CoolException("璇ユゼ灞傛病鏈夌┖鎺ラ┏浣�");
}
+ /**
+ * 妫�绱㈠簱浣嶅彿
+ * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+ */
+ public AgvBasDevp getDevpNoisAuto(int type, int floor, String auto) {
+ // 鐩爣搴撲綅
+ AgvBasDevp basDevp = null;
+
+ // 寮�濮嬫煡鎵惧簱浣� ==============================>>
+ basDevp = getDevpNoAuto(type,floor,auto);
+ if (basDevp != null) {
+ return basDevp;
+ }
+
+ //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
+ throw new CoolException("璇ユゼ灞傛病鏈夌┖鎺ラ┏浣�");
+ }
+
//闅忔満鍙栦竴涓揣浣�
private AgvBasDevp getDevpNoRule(int type,int floor){
return agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>()
@@ -262,4 +280,14 @@
.like("dev_no","DB"));
}
+ //闅忔満鍙栦竴涓揣浣�
+ private AgvBasDevp getDevpNoAuto(int type,int floor,String auto){
+ return agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>()
+ .eq("loc_sts","O")
+ .eq("floor",floor)
+ .eq("loc_type1",type)
+ .eq("autoing",auto)
+ .like("dev_no","DB"));
+ }
+
}
--
Gitblit v1.9.1