From 19e6e3559842d23fc5bd4f28a688dd8c2c747d4b Mon Sep 17 00:00:00 2001 From: pjb <123456> Date: 星期四, 13 三月 2025 15:35:37 +0800 Subject: [PATCH] 联调agv完成 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 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 d595118..e0c0dbe 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,20 +1,26 @@ package com.zy.asrs.wms.apis.wcs.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zy.asrs.framework.common.R; import com.zy.asrs.framework.exception.CoolException; import com.zy.asrs.wms.apis.wcs.entity.request.ContainerArrivedParam; import com.zy.asrs.wms.apis.wcs.entity.request.RfidSingalRequest; import com.zy.asrs.wms.apis.wcs.entity.request.TasksStatusCallbackParam; 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.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.system.controller.BaseController; import io.netty.util.internal.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.Map; import java.util.Objects; @@ -28,6 +34,12 @@ @Autowired private PlatformService platformService; + + @Resource + private CacheSiteService cacheSiteService; + + @Resource + private TaskService taskService; /** @@ -72,6 +84,35 @@ } /** + * 鎾澧欐媿鐏紝ESS璋冪敤 + */ + @PostMapping("/light/off") + public R lightOff(@RequestBody Map<String, Object> request) { + if (Objects.isNull(request)) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + if (Objects.isNull(request.get("tagCode"))) { + throw new CoolException("鐢靛瓙鏍囩缂栧彿涓嶈兘涓虹┖锛侊紒"); + } + if (Objects.isNull(request.get("eventCode"))){ + throw new CoolException("浜嬩欢鍚嶇О涓嶈兘涓虹┖锛侊紒"); + } + + // 鏍规嵁绔欑偣缂栫爜鏌ユ挱绉嶇珯鐐逛俊鎭� + CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteNo, request.get("tagCode"))); + // 鏍规嵁鎾绔欑偣淇℃伅鏉$爜锛屾煡浠诲姟 + Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, cacheSite.getBarcode())); + + request.clear(); + request.put("taskNo", task.getTaskNo()); + request.put("orderNo",cacheSite.getOrderNo()); + + wcsApiService.slapLightLogic(request); + + return R.ok(); + } + + /** * 瀹瑰櫒娴佸姩閫氱煡锛堝綋鍓嶇墿鏂欐挱绉嶅畬鎴愶級 * //fixme 姝ゆ帴鍙e皢涓嶅啀鍗曠嫭璋冪敤 * 1. 鏇存柊褰撳墠浠诲姟鐗╂枡淇℃伅 -- Gitblit v1.9.1