From c6c9b7d3baa822765768c110304d27623f946286 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 15 七月 2025 14:29:09 +0800
Subject: [PATCH] `1`
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 96 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 91 insertions(+), 5 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 0da930a..96fd17d 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,21 +1,36 @@
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;
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.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;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
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
@@ -24,6 +39,18 @@
@Autowired
private WcsApiService wcsApiService;
+
+ @Autowired
+ private PlatformService platformService;
+
+ @Resource
+ private CacheSiteService cacheSiteService;
+
+ @Resource
+ private TaskService taskService;
+
+ @Autowired
+ private WaveSeedService waveSeedService;
/**
@@ -68,6 +95,58 @@
}
/**
+ * ESS 鎾澧欐媿鐏洖璋�
+ * 鎾澧欐媿鐏紝ESS璋冪敤
+ */
+ @PostMapping("/light/off")
+ @Transactional(rollbackFor = Exception.class)
+ 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("浜嬩欢鍚嶇О涓嶈兘涓虹┖锛侊紒");
+ }
+
+ 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("褰撳墠绔欑偣涓嶅瓨鍦紒锛�");
+ }
+
+ WaveSeed waveSeed = waveSeedService.getOne(new LambdaQueryWrapper<WaveSeed>()
+ .eq(WaveSeed::getExceStatus, 1)
+ .eq(WaveSeed::getSiteNo, request.get("tagCode").toString()), false);
+ if (Objects.isNull(waveSeed)) {
+ throw new CoolException("鎾澧欏湴鏍囨湭缁戝畾锛侊紒");
+ }
+
+ // 鏍规嵁鎾绔欑偣淇℃伅鏉＄爜锛屾煡浠诲姟
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, waveSeed.getTaskId()));
+ if (Objects.isNull(task)) {
+ throw new CoolException("褰撳墠绔欑偣浠诲姟涓嶅瓨鍦紒锛�");
+ }
+
+ Map<String, Object> param = new HashMap<>();
+ param.put("taskNo", task.getTaskNo());
+ param.put("siteNo", cacheSite.getSiteNo());
+ param.put("weedId", waveSeed.getId());
+ param.put("orderNo",cacheSite.getOrderNo());
+
+ waveSeed.setExceStatus(0);
+ if (!waveSeedService.updateById(waveSeed)) {
+ throw new CoolException("鎾鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ return wcsApiService.slapLightLogic(param);
+ }
+
+ /**
* 瀹瑰櫒娴佸姩閫氱煡锛堝綋鍓嶇墿鏂欐挱绉嶅畬鎴愶級
* //fixme 姝ゆ帴鍙ｅ皢涓嶅啀鍗曠嫭璋冪敤
* 1. 鏇存柊褰撳墠浠诲姟鐗╂枡淇℃伅
@@ -76,7 +155,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("瀹瑰櫒缂栫爜涓嶈兘涓虹┖锛侊紒锛�");
}
@@ -105,9 +184,7 @@
throw new CoolException("褰撳墠浠诲姟璁㈠崟鍙蜂笉鑳戒负绌猴紒锛�");
}
- wcsApiService.slapLightLogic(request);
-
- return R.ok();
+ return wcsApiService.slapLightLogic(request);
}
@@ -137,7 +214,16 @@
return wcsApiService.getPlatforms();
}
-
+// /**
+// * 缁戝畾璁㈠崟涓庨泦璐у尯鍏崇郴
+// * @param platform
+// * @return
+// */
+// @PostMapping("/bind/shipping/platform")
+// public R bindShippingAndPlatform(@RequestBody BindPlatformParam platform) {
+// return platformService.bindShippingPlatform(platform);
+// }
+//
}
--
Gitblit v1.9.1