From 875a183c5d5a12a4ba5c8d37559295ac1ce6cce3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 09 七月 2025 21:13:11 +0800
Subject: [PATCH] 播种流程优化
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 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 ee55bd1..1ce5d11 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
@@ -11,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;
@@ -22,6 +25,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@@ -41,6 +45,9 @@
@Resource
private TaskService taskService;
+
+ @Autowired
+ private WaveSeedService waveSeedService;
/**
@@ -85,6 +92,7 @@
}
/**
+ * ESS 鎾澧欐媿鐏洖璋�
* 鎾澧欐媿鐏紝ESS璋冪敤
*/
@PostMapping("/light/off")
@@ -103,16 +111,26 @@
// 鏍规嵁绔欑偣缂栫爜鏌ユ挱绉嶇珯鐐逛俊鎭�
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::getSiteNo, request.get("tagCode").toString()));
+ if (Objects.isNull(waveSeed)) {
+ throw new CoolException("鎾澧欏湴鏍囨湭缁戝畾锛侊紒");
+ }
// 鏍规嵁鎾绔欑偣淇℃伅鏉＄爜锛屾煡浠诲姟
- Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, cacheSite.getBarcode()));
+ Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, waveSeed.getTaskId()));
+ if (Objects.isNull(task)) {
+ throw new CoolException("褰撳墠绔欑偣浠诲姟涓嶅瓨鍦紒锛�");
+ }
- request.clear();
- request.put("taskNo", task.getTaskNo());
- request.put("orderNo",cacheSite.getOrderNo());
+ Map<String, Object> param = new HashMap<>();
+ param.put("taskNo", task.getTaskNo());
+ param.put("siteNo", cacheSite.getSiteNo());
+ param.put("orderNo",cacheSite.getOrderNo());
- wcsApiService.slapLightLogic(request);
-
- return R.ok();
+ return wcsApiService.slapLightLogic(param);
}
/**
--
Gitblit v1.9.1