From 3d61ab52a458045d499a8ad62ed9033a64be8792 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 17 六月 2025 18:24:22 +0800
Subject: [PATCH] 库位添加逻辑删除
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 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..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,19 +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;
@@ -24,6 +31,15 @@
@Autowired
private WcsApiService wcsApiService;
+
+ @Autowired
+ private PlatformService platformService;
+
+ @Resource
+ private CacheSiteService cacheSiteService;
+
+ @Resource
+ private TaskService taskService;
/**
@@ -65,6 +81,35 @@
return wcsApiService.containerArrivedNotify(arrivedParam, "outStock", getHostId());
+ }
+
+ /**
+ * 鎾澧欐媿鐏紝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();
}
/**
@@ -137,7 +182,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