From 114657d034c80ca40f08d767a71d169c34bde0b5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 16 四月 2024 23:50:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/AgvLocDetlService.java | 2
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 4 +-
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 24 ++++++++++++
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 36 ++++++++++++++----
4 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 55ce92a..be57ed6 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -228,17 +228,22 @@
List<AgvLocDetl> listByLocNo = null;
List<AgvLocDetl> listByContainerCode = null;
-
if(!Cools.isEmpty(locNo)){
+ // 婧愬簱浣�
listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
}
if(!Cools.isEmpty(locNo)){
+ // 鐩爣搴撲綅
listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
}
AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
+ String locNo1 = listByContainerCode.get(0).getLocNo();
+ String suppCode = listByLocNo.get(0).getSuppCode();
+
+ List<AgvLocDetl> supp_codes = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", suppCode));
if((!Cools.eq("F",agvLocMastByContainerCode.getLocSts())
&& !Cools.eq("D",agvLocMastByContainerCode.getLocSts()))
|| (!Cools.eq("F",agvLocMastByLocNo.getLocSts())
@@ -252,8 +257,9 @@
if(Cools.isEmpty(listByLocNo) && !Cools.isEmpty(listByContainerCode)){
//鏇存柊璐ф灦淇℃伅鐨勫簱浣嶄负褰撳墠搴撲綅
listByContainerCode.forEach(agvLocDetl -> {
+ String sourceLoc = agvLocDetl.getLocNo();
agvLocDetl.setLocNo(locNo);
- agvLocDetlService.updateLocNo(locNo,agvLocDetl);
+ agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
});
agvLocMastByLocNo.setLocSts("F");
@@ -271,8 +277,9 @@
if(!Cools.isEmpty(listByLocNo) && Cools.isEmpty(listByContainerCode)){
//鏇存柊璐ф灦淇℃伅鐨勫簱浣嶄负褰撳墠搴撲綅
listByLocNo.forEach(agvLocDetl -> {
+ String sourceLoc = agvLocDetl.getLocNo();
agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
- agvLocDetlService.updateLocNo(locNo,agvLocDetl);
+ agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
});
agvLocMastByContainerCode.setLocSts("F");
@@ -288,16 +295,29 @@
return R.ok("璇ュ簱浣嶄笌瀹瑰櫒搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
}
+
+
listByContainerCode.forEach(agvLocDetl -> {
+ String sourceLoc = agvLocDetl.getLocNo();
agvLocDetl.setLocNo(agvLocMastByLocNo.getLocNo());
- agvLocDetlService.updateLocNo(locNo,agvLocDetl);
+ agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
});
- listByLocNo.forEach(agvLocDetl -> {
- agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
- agvLocDetlService.updateLocNo(locNo,agvLocDetl);
- });
+ supp_codes.forEach(agvLocDetl -> {
+ agvLocDetl.setLocNo(locNo1);
+ agvLocDetlService.updateLocNo(locNo1,locNo,agvLocDetl);
+ });
+// listByLocNo.forEach(agvLocDetl -> {
+// String sourceLoc = agvLocDetl.getLocNo();
+// agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
+// agvLocDetlService.updateLocNo(sourceLoc,locNo,agvLocDetl);
+// });
+ agvLocMastByContainerCode.setBarcode(agvLocMastByLocNo.getBarcode());
+ agvLocMastService.updateById(agvLocMastByContainerCode);
+
+ agvLocMastByLocNo.setBarcode(containerCode);
+ agvLocMastService.updateById(agvLocMastByLocNo);
return R.ok("缁存姢鎴愬姛");
diff --git a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
index 48be52e..5adb710 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
@@ -45,6 +45,6 @@
public void compareToEss(MultipartFile file) throws IOException;
- public void updateLocNo(String locNo, AgvLocDetl agvLocDetl);
+ public void updateLocNo(String locNo, String sourceLoc,AgvLocDetl agvLocDetl);
}
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 175d9e0..c41d8c3 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -254,7 +254,7 @@
}
@Override
- public void updateLocNo(String locNo, AgvLocDetl agvLocDetl) {
- this.baseMapper.updateLocNo(locNo,agvLocDetl.getLocNo(),agvLocDetl.getSuppCode());
+ public void updateLocNo(String locNo, String sourceLoc, AgvLocDetl agvLocDetl) {
+ this.baseMapper.updateLocNo(locNo,sourceLoc,agvLocDetl.getSuppCode());
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index dc2fe42..9fb31c8 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
@@ -55,6 +56,13 @@
int wrkNo = agvWrkMast.getWrkNo();
String barcode = agvWrkMast.getBarcode();
String orderNo = getOrderNoByWrkNo(wrkNo);
+ String agvBasDevp = "";
+ if (agvWrkMast.getIoType() > 100) {
+ agvBasDevp = agvWrkMast.getLocNo();
+ } else {
+ agvBasDevp = agvWrkMast.getSourceLocNo();
+ }
+
//淇敼宸ヤ綔妗ｇ姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
agvWrkMast.setWrkSts(207L);
@@ -100,6 +108,11 @@
orderService.checkComplete(o);
});
}
+ AgvBasDevp basDevp = agvBasDevpService.selectByDevNo(agvBasDevp);
+ basDevp.setLocSts("O");
+ basDevp.setBarcode("");
+ basDevp.setLocType2(null);
+ agvBasDevpService.updateById(basDevp);
return SUCCESS;
}
@@ -152,6 +165,12 @@
public ReturnT<String> completedCarryWrk2(AgvWrkMast agvWrkMast) {
int wrkNo = agvWrkMast.getWrkNo();
String orderNo = getOrderNoByWrkNo(wrkNo);
+ String agvBasDevp = "";
+ if (agvWrkMast.getIoType() > 100) {
+ agvBasDevp = agvWrkMast.getLocNo();
+ } else {
+ agvBasDevp = agvWrkMast.getSourceLocNo();
+ }
//淇敼宸ヤ綔妗ｇ姸鎬佷负207.搴撳瓨鏇存柊瀹屾垚
agvWrkMast.setWrkSts(207L);
agvWrkMastService.updateById(agvWrkMast);
@@ -180,6 +199,11 @@
orderService.checkComplete(o);
});
}
+ AgvBasDevp basDevp = agvBasDevpService.selectByDevNo(agvBasDevp);
+ basDevp.setLocSts("O");
+ basDevp.setBarcode("");
+ basDevp.setLocType2(null);
+ agvBasDevpService.updateById(basDevp);
return SUCCESS;
}
--
Gitblit v1.9.1