From 8003a29d3f510adfa971ea6ebd23af1ccd7316c1 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 05 三月 2024 15:37:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 45f3aff..3855940 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -28,6 +28,8 @@
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
*/
@@ -633,7 +635,8 @@
currentContainerMap = new HashMap<>();
}
- String containerCode = param.getContainerCode();
+ String containerCode = param.getContainerCode().split(";")[0];
+
if(Cools.isEmpty(containerCode)){
throw new CoolException("鏂欑鐮佷负绌�");
}
@@ -651,19 +654,22 @@
//鏌ヨ鏃у鍣ㄧ殑宸ヤ綔妗�
AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(currentContainerCode);
if(!Cools.isEmpty(agvWrkMast) && agvWrkMast.getIoType() == 101){
- //鍙戦�佸鍣ㄧ珛鍦鸿姹傦紝瀹屾垚宸ヤ綔妗�
- List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
- agvWrkMastList.add(agvWrkMast);
- try {
- int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
- if(code == 0){
- //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
- agvWrkMast.setWrkSts(206L);
- agvWrkMastService.updateById(agvWrkMast);
- }
- } catch (IOException e) {
- log.error(e.getMessage());
- }
+ //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
+ agvWrkMast.setWrkSts(206L);
+ agvWrkMastService.updateById(agvWrkMast);
+// //鍙戦�佸鍣ㄧ珛鍦鸿姹傦紝瀹屾垚宸ヤ綔妗�
+// List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
+// agvWrkMastList.add(agvWrkMast);
+// try {
+// int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
+// if(code == 0){
+// //灏嗗伐浣滃厷鐘舵�佹敼涓哄鍣ㄧ鍦�
+// agvWrkMast.setWrkSts(206L);
+// agvWrkMastService.updateById(agvWrkMast);
+// }
+// } catch (IOException e) {
+// log.error(e.getMessage());
+// }
}
}
@@ -689,7 +695,7 @@
if(!Cools.isEmpty(agvWrkMast)){
List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
- for (AgvWrkDetl agvWrkDetl : AgvWrkDetlList){
+ for (AgvWrkDetl agvWrkDetl : agvWrkDetlList){
agvWrkDetl.setVolume(agvWrkDetl.getAnfme());
if(agvWrkMast.getIoType() == 103){
//瀵绘壘鏄惁鏈夌浉鍚岀墿鏂欑殑宸ヤ綔妗ｆ槑缁嗭紝骞惰繑鍥炴暟閲忎箣鍜�
@@ -708,16 +714,21 @@
}
};
-
- return R.ok(agvWrkDetlList).add(agvWrkMast);
+ agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
+ agvBasDevpDto.setAgvWrkMast(agvWrkMast);
}
//鏌ユ壘璇ュ鍣ㄧ殑鍏ュ簱閫氱煡妗�
List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", containerCode));
if(!Cools.isEmpty(agvWaitPakinList)){
- return R.ok(agvWaitPakinList);
+ agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
}
- return R.error("娌℃湁璇ュ鍣ㄧ殑鍑哄簱銆佹嫞鏂欍�佸叆搴撲俊鎭瓑");
+ System.out.println("currentContainerMap: " + currentContainerMap);
+
+
+ System.out.println("agvBasDevpDto: " + agvBasDevpDto);
+
+ return R.ok(agvBasDevpDto);
}
private double getAllAnfmeInAgvWrkDetlList(List<AgvWrkDetl> agvWrkDetlList, AgvWrkDetl wd0) {
--
Gitblit v1.9.1