From ffc4d0526bf02e7e00a7872d05a1e67e520e59d6 Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期一, 02 六月 2025 12:06:40 +0800
Subject: [PATCH] 新增自动盘点功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 72 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 3 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 022198e..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,18 +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;
@@ -23,6 +31,16 @@
@Autowired
private WcsApiService wcsApiService;
+
+ @Autowired
+ private PlatformService platformService;
+
+ @Resource
+ private CacheSiteService cacheSiteService;
+
+ @Resource
+ private TaskService taskService;
+
/**
* 鍑哄簱浠诲姟-鎺ユ敹鍥炶皟鐘舵�佹帴鍙�
@@ -66,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 姝ゆ帴鍙ｅ皢涓嶅啀鍗曠嫭璋冪敤
* 1. 鏇存柊褰撳墠浠诲姟鐗╂枡淇℃伅
@@ -99,7 +146,7 @@
if (Objects.isNull(request.get("taskNo"))) {
throw new CoolException("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
}
- if (Objects.isNull(request.get("orderNO"))){
+ if (Objects.isNull(request.get("orderNo"))){
throw new CoolException("褰撳墠浠诲姟璁㈠崟鍙蜂笉鑳戒负绌猴紒锛�");
}
@@ -113,12 +160,11 @@
/**
* 淇″彿鍥炰紶鎺ュ彛锛屽洖浼犵數瀛愭爣绛剧姸鎬佸彉鍖栧唴瀹圭粰涓婃父绯荤粺銆�
* 褰撲汉涓烘搷浣滐紙姣斿鎷嶇伅锛屾洿鏀规暟瀛楋紝鏀剧绛夛級瀵艰嚧鐢靛瓙鏍囩鐨勭姸鎬佸拰淇″彿绛夊彂鐢熷彉鍖栥�佹垨璁惧鏈韩鍙戠敓寮傚父鏃讹紝ESS鎺ユ敹鍒颁俊鍙峰悗锛岄�氳繃璇ユ帴鍙ｅ皢淇″彿鍥炰紶缁欎笂娓哥郴缁熴��
- *
* RFID鍥炶皟鎺ュ彛
- *
* @param request
* @return
*/
+ @PostMapping("/")
public R rfidCallback(@RequestBody RfidSingalRequest request) {
if (Objects.isNull(request)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -127,5 +173,25 @@
}
+ /**
+ * 鑾峰彇鎵�鏈夐泦璐у尯
+ * @return
+ */
+ @GetMapping("/all/platforms")
+ public R getPlatforms() {
+ return wcsApiService.getPlatforms();
+ }
+
+// /**
+// * 缁戝畾璁㈠崟涓庨泦璐у尯鍏崇郴
+// * @param platform
+// * @return
+// */
+// @PostMapping("/bind/shipping/platform")
+// public R bindShippingAndPlatform(@RequestBody BindPlatformParam platform) {
+// return platformService.bindShippingPlatform(platform);
+// }
+//
+
}
--
Gitblit v1.9.1