From 626deed5a6d673ea417fa50b7e61d23aec09a247 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 七月 2025 14:13:24 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
index e0c0dbe..7d7c5e2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wms.apis.wcs.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
@@ -10,10 +11,13 @@
import com.zy.asrs.wms.apis.wcs.services.WcsApiService;
import com.zy.asrs.wms.asrs.entity.CacheSite;
import com.zy.asrs.wms.asrs.entity.Task;
+import com.zy.asrs.wms.asrs.entity.WaveSeed;
import com.zy.asrs.wms.asrs.entity.param.BindPlatformParam;
import com.zy.asrs.wms.asrs.service.CacheSiteService;
import com.zy.asrs.wms.asrs.service.PlatformService;
import com.zy.asrs.wms.asrs.service.TaskService;
+import com.zy.asrs.wms.asrs.service.WaveSeedService;
+import com.zy.asrs.wms.asrs.service.impl.WaveSeedServiceImpl;
import com.zy.asrs.wms.system.controller.BaseController;
import io.netty.util.internal.StringUtil;
import lombok.extern.slf4j.Slf4j;
@@ -21,8 +25,11 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
@Slf4j
@RestController
@@ -40,6 +47,9 @@
@Resource
private TaskService taskService;
+
+ @Autowired
+ private WaveSeedService waveSeedService;
/**
@@ -84,6 +94,7 @@
}
/**
+ * ESS 鎾澧欐媿鐏洖璋�
* 鎾澧欐媿鐏紝ESS璋冪敤
*/
@PostMapping("/light/off")
@@ -98,18 +109,35 @@
throw new CoolException("浜嬩欢鍚嶇О涓嶈兘涓虹┖锛侊紒");
}
+ log.info("鎾澧欐媿鐏紝璇锋眰鍙傛暟锛歿}", JSONObject.toJSONString(request));
+
// 鏍规嵁绔欑偣缂栫爜鏌ユ挱绉嶇珯鐐逛俊鎭�
CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteNo, request.get("tagCode")));
+ if (Objects.isNull(cacheSite)) {
+ throw new CoolException("褰撳墠绔欑偣涓嶅瓨鍦紒锛�");
+ }
+
+ List<WaveSeed> waveSeed = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getSiteNo, request.get("tagCode").toString()));
+ if (Objects.isNull(waveSeed)) {
+ throw new CoolException("鎾澧欏湴鏍囨湭缁戝畾锛侊紒");
+ }
+
+ List<Long> taskIds = waveSeed.stream().map(WaveSeed::getTaskId).collect(Collectors.toList());
+
// 鏍规嵁鎾绔欑偣淇℃伅鏉＄爜锛屾煡浠诲姟
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, cacheSite.getBarcode()));
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, taskIds));
+ if (tasks.isEmpty()) {
+ throw new CoolException("褰撳墠绔欑偣浠诲姟涓嶅瓨鍦紒锛�");
+ }
- request.clear();
- request.put("taskNo", task.getTaskNo());
- request.put("orderNo",cacheSite.getOrderNo());
+ List<String> taskNos = tasks.stream().map(Task::getTaskNo).collect(Collectors.toList());
- wcsApiService.slapLightLogic(request);
+ Map<String, Object> param = new HashMap<>();
+ param.put("taskNo", taskNos);
+ param.put("siteNo", cacheSite.getSiteNo());
+ param.put("orderNo",cacheSite.getOrderNo());
- return R.ok();
+ return wcsApiService.slapLightLogic(param);
}
/**
@@ -121,7 +149,7 @@
* @return
*/
@GetMapping("/container/converyor/{code}")
- public R containerConveyor(@PathVariable String code) {
+ public R containerConveyor(@PathVariable String code) throws Exception {
if (StringUtil.isNullOrEmpty(code)) {
return R.error("瀹瑰櫒缂栫爜涓嶈兘涓虹┖锛侊紒锛�");
}
@@ -150,9 +178,7 @@
throw new CoolException("褰撳墠浠诲姟璁㈠崟鍙蜂笉鑳戒负绌猴紒锛�");
}
- wcsApiService.slapLightLogic(request);
-
- return R.ok();
+ return wcsApiService.slapLightLogic(request);
}
--
Gitblit v1.9.1