From ece092e4c5d4e968b424421c6f78b065bbb0bd73 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 24 八月 2024 15:13:10 +0800
Subject: [PATCH] #修复目标站显示错误问题
---
src/main/java/com/zy/common/web/WcsController.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 76c58fc..f6e5cce 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
@@ -531,7 +529,7 @@
}
//鑾峰彇鍥炲簱鎻愬崌鏈虹洰鏍囩珯
- Integer staNo = liftNo * 100 + locMast1.getLev1();
+ Integer staNo = liftNo * 100 + locMast.getLev1();
// 鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬�
wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54
@@ -577,8 +575,9 @@
*/
@PostMapping("/start")
@ResponseBody
- public R start(@RequestBody ReplenishmentParam param){
- log.info("start param: " + param.toString());
+ @Transactional
+ public synchronized R start(@RequestBody ReplenishmentParam param){
+ log.info("agv start param: " + param.toString());
String containerCode = param.getContainerCode();
if(Cools.isEmpty(containerCode)){
throw new CoolException("鏂欑鐮佷负绌�");
@@ -613,7 +612,7 @@
}
//鍏ュ簱浠诲姟
- if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
+ if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode)) && Cools.isEmpty(agvWrkMast)){
//缁戝畾绔欑偣
agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
//鐢熸垚宸ヤ綔妗�
@@ -630,6 +629,8 @@
@PostMapping("/current/containerCode")
@ResponseBody
public R move(@RequestBody ReplenishmentParam param){
+
+ log.info("current containerCode: " + param.toString());
if(Cools.isEmpty(currentContainerMap)){
currentContainerMap = new HashMap<>();
@@ -685,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