From 4693c6fa42d2cb72594b6b58e9fab9e0d4c224aa Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 08 十二月 2025 15:58:43 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 78 ++++++++++++++++++++++++++++++++------
1 files changed, 65 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index e26145d..f5b2ed2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1287,7 +1287,7 @@
/**鐢熸垚缂撳瓨鍖哄嚭搴撲换鍔�*/
generateCacheOutTask(station, locCaches, userId);
-// /**鐢熸垚绔嬪簱鍑哄簱浠诲姟*/
+ /**鐢熸垚绔嬪簱鍑哄簱浠诲姟*/
generateCRNOutTask(station, locCaches, userId);
return R.ok();
@@ -1303,7 +1303,7 @@
.eq("loc_sts", LocStsType.LOC_STS_TYPE_D.type)
.eq("area_id", basAreas.getId())
);
- if (locCaches.isEmpty()){
+ if (locCaches.isEmpty()) {
throw new CoolException("鏆傛棤绌烘澘搴撲綅");
}
@@ -1341,7 +1341,7 @@
}
List<Task> tasks = taskService.selectList(new EntityWrapper<Task>().eq("barcode", params.getBarcode()));
- if (!tasks.isEmpty()){
+ if (!tasks.isEmpty()) {
throw new CoolException("鎵樼洏鐮佸凡鐢熸垚浠诲姟");
}
@@ -1349,8 +1349,7 @@
List<LocCache> locCaches = locCacheService.selectList(new EntityWrapper<LocCache>()
.in("loc_sts", LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_D.type)
- .eq("area_id", basAreas.getId())
- );
+ .eq("area_id", basAreas.getId()));
if (locCaches.isEmpty()) {
throw new CoolException("褰撳墠鏆傛棤绌哄簱浣嶏紒锛�");
}
@@ -1361,10 +1360,58 @@
}
/**
+ * 缂撳瓨鍑哄簱缁勬墭涓婃灦
+ * @author Ryan
+ * @date 2025/12/8 13:47
+ * @param params
+ * @return com.core.common.R
+ */
+ @Override
+ public R combOutPub(AgvCallParams params) {
+
+ return R.ok();
+ }
+
+ /**
+ * 缂撳瓨缁勬墭鏁版嵁
+ * @author Ryan
+ * @date 2025/12/8 15:37
+ * @param params
+ * @return com.core.common.R
+ */
+ @Override
+ public R combCacehList(AgvCallParams params) {
+ if (Objects.isNull(params.getBarcode())) {
+ throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(params.getBsCode())) {
+ throw new CoolException("BS鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ Task task = taskService.selectOne(new EntityWrapper<Task>()
+ .eq("io_type", TaskIOType.PICK_OUT.type)
+ .eq("wrk_sts", 14)
+ .eq("barcode", params.getBarcode()));
+ if (Objects.isNull(task)) {
+ throw new CoolException("鏁版嵁閿欒锛氫换鍔′俊鎭瓨鍦紒锛�");
+ }
+
+ List<TaskDetl> taskDetl = taskDetlService.selectList(new EntityWrapper<TaskDetl>()
+ .eq("three_code", params.getBsCode())
+ .eq("zpallet", params.getBarcode()));
+
+ if (Objects.isNull(taskDetl) || taskDetl.isEmpty()) {
+ throw new CoolException("褰撳墠BS缂栫爜涓嶅瓨鍦紒锛�");
+ }
+
+ return R.ok().add(taskDetl);
+ }
+
+ /**
* 鐢熸垚绔嬪簱鍑哄簱浠诲姟
+ *
+ * @param locCaches
* @author Ryan
* @date 2025/12/3 8:06
- * @param locCaches
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -1456,9 +1503,10 @@
/**
* 鐢熸垚鍫嗗灈鏈哄嚭搴撲换鍔�
+ *
+ * @param locMasts
* @author Ryan
* @date 2025/12/6 14:44
- * @param locMasts
*/
@Transactional(rollbackFor = Exception.class)
public void generateOutTask(List<LocMast> locMasts, Integer ioType, BasDevp devp, Long userId) {
@@ -1544,7 +1592,7 @@
task.setWrkNo(workNo)
.setIoTime(new Date())
.setWrkSts(11L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- .setIoType(loc.getLocSts().equals("D") ? 110 : 101) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+ .setIoType(loc.getLocSts().equals("D") ? 110 : 103) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
.setTaskType("agv")
.setIoPri(10D)
.setFullPlt(loc.getLocSts().equals("D") ? "N" : "Y") // 婊℃澘锛歒
@@ -1562,7 +1610,9 @@
if (!taskService.insert(task)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_id", loc.getId()));
+
+ List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("loc_no", loc.getLocNo()));
if (!detls.isEmpty()) {
List<TaskDetl> taskDetls = new ArrayList<>();
detls.forEach(pakin -> {
@@ -1598,8 +1648,8 @@
}
// 淇敼鐩爣绔欑偣淇℃伅
- if (station.getLocSts().equals("O")) {
- station.setLocSts("S"); // S.鍏ュ簱棰勭害
+ if (station.getLocSts().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ station.setLocSts(LocStsType.LOC_STS_TYPE_S.type); // S.鍏ュ簱棰勭害
station.setModiTime(new Date());
station.setModiUser(userId);
if (!basStationService.updateById(station)) {
@@ -1673,7 +1723,9 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
- pakins.forEach(pakin -> {pakin.setIoStatus("Y");});
+ pakins.forEach(pakin -> {
+ pakin.setIoStatus("Y");
+ });
if (!waitPakinService.updateBatchById(pakins)) {
throw new CoolException("鏇存柊缁勬墭淇℃伅澶辫触");
@@ -1707,7 +1759,7 @@
}
- public HIKResultDTO sendAgvTask(HIKApiDTO haiKangApiDTO,String path){
+ public HIKResultDTO sendAgvTask(HIKApiDTO haiKangApiDTO, String path) {
HIKResultDTO result = new HIKResultDTO();
ForwardAGVTaskDTO forwardAGVTaskParam = new ForwardAGVTaskDTO();
--
Gitblit v1.9.1