From a840e7934946d6aeae1e2abd61f5fd024c2868d8 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期日, 07 四月 2024 08:23:52 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 17 +++++++++++------
1 files changed, 11 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 53add18..06b8b18 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -15,20 +15,18 @@
import com.zy.common.service.CommonService;
import com.zy.common.web.param.ReplenishmentParam;
import com.zy.common.web.param.SearchLocParam;
+import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
-
-import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
/**
* Created by vincent on 2020/10/30
@@ -577,8 +575,10 @@
*/
@PostMapping("/start")
@ResponseBody
+ @Transactional
+ @Synchronized
public R start(@RequestBody ReplenishmentParam param){
-
+ log.info("start param: " + param.toString());
String containerCode = param.getContainerCode();
if(Cools.isEmpty(containerCode)){
throw new CoolException("鏂欑鐮佷负绌�");
@@ -630,6 +630,8 @@
@PostMapping("/current/containerCode")
@ResponseBody
public R move(@RequestBody ReplenishmentParam param){
+
+ log.info("current containerCode: " + param.toString());
if(Cools.isEmpty(currentContainerMap)){
currentContainerMap = new HashMap<>();
@@ -686,6 +688,9 @@
public R containerMove(@RequestBody ReplenishmentParam param){
String devNo = param.getDevNo();
+ if(Cools.isEmpty(currentContainerMap)){
+ currentContainerMap = new HashMap<>();
+ }
String containerCode = currentContainerMap.get(devNo);
AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();
@@ -723,10 +728,10 @@
agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
}
- System.out.println("currentContainerMap: " + currentContainerMap);
+ //System.out.println("currentContainerMap: " + currentContainerMap);
- System.out.println("agvBasDevpDto: " + agvBasDevpDto);
+ //System.out.println("agvBasDevpDto: " + agvBasDevpDto);
return R.ok(agvBasDevpDto);
}
--
Gitblit v1.9.1