From 6d76b543f02917a8fc373e12271a112d01f7b612 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 12 六月 2024 08:41:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 06b8b18..c7c5628 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -576,8 +576,7 @@
@PostMapping("/start")
@ResponseBody
@Transactional
- @Synchronized
- public R start(@RequestBody ReplenishmentParam param){
+ public synchronized R start(@RequestBody ReplenishmentParam param){
log.info("start param: " + param.toString());
String containerCode = param.getContainerCode();
if(Cools.isEmpty(containerCode)){
@@ -687,11 +686,20 @@
@ResponseBody
public R containerMove(@RequestBody ReplenishmentParam param){
- String devNo = param.getDevNo();
- if(Cools.isEmpty(currentContainerMap)){
- currentContainerMap = new HashMap<>();
+ String devNo = Cools.eq("CS-310",param.getDevNo()) ? "310-1" : Cools.eq("CS-311",param.getDevNo()) ? "312-2" : Cools.eq("CS-312",param.getDevNo()) ? "314-1" : Cools.eq("CS-313",param.getDevNo()) ? "316-1" : null;
+
+ if(Cools.isEmpty(devNo)){
+ return R.error("绔欑偣鏈夎");
}
- String containerCode = currentContainerMap.get(devNo);
+
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
+ String containerCode = agvBasDevp.getBarcode();
+
+// String devNo = param.getDevNo();
+// if(Cools.isEmpty(currentContainerMap)){
+// currentContainerMap = new HashMap<>();
+// }
+// String containerCode = currentContainerMap.get(devNo);
AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();
--
Gitblit v1.9.1