From fdf2903b8944b80877e7df5d0da38f34b5d84ed9 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 04 十二月 2023 15:02:28 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/java/com/zy/common/model/TaskDto.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index 63ea7b4..adbd14e 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -20,6 +20,8 @@
private Integer staNo;
+ private String agvStaNo;
+
private List<LocDto> locDtos;
{
@@ -37,6 +39,12 @@
this.locDtos.add(locDto);
}
+ public TaskDto(String locNo, String agvStaNo, LocDto locDto) {
+ this.locNo = locNo;
+ this.agvStaNo = agvStaNo;
+ this.locDtos.add(locDto);
+ }
+
public TaskDto(String locNo, Integer staNo, List<LocDto> locDtos) {
this.locNo = locNo;
this.staNo = staNo;
@@ -48,6 +56,9 @@
return false;
}
for (TaskDto taskDto : list) {
+ if(Cools.isEmpty(taskDto.getStaNo()) && dto.getLocNo().equals(taskDto.getLocNo())){
+ return true;
+ }
if (dto.getLocNo().equals(taskDto.getLocNo()) && taskDto.getStaNo().equals(dto.getStaNo())) {
return true;
}
@@ -60,6 +71,9 @@
return null;
}
for (TaskDto taskDto : list) {
+ if(Cools.isEmpty(taskDto.getStaNo()) && dto.getLocNo().equals(taskDto.getLocNo())){
+ return taskDto;
+ }
if (dto.getLocNo().equals(taskDto.getLocNo()) && taskDto.getStaNo().equals(dto.getStaNo())) {
return taskDto;
}
@@ -68,16 +82,17 @@
}
public boolean isAll(){
- // 姹囨�讳笉鑰冭檻鎵瑰彿
+ // 姹囨�讳笉鑰冭檻搴忓垪鐮�
List<DetlDto> detlDtos = new ArrayList<>();
for (LocDto locDto : this.getLocDtos()) {
- DetlDto dto = new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme());
+ DetlDto dto = new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme(), locDto.getCsocode(), locDto.getIsoseq(),locDto.getContainerCode());
+ //dto.setContainerCode(locDto.getContainerCode());
if (DetlDto.has(detlDtos, dto)) {
- DetlDto detlDto = DetlDto.find(detlDtos, locDto.getMatnr(), dto.getBatch());
+ DetlDto detlDto = DetlDto.find(detlDtos, locDto.getMatnr(), dto.getBatch(),dto.getCsocode(),dto.getIsoseq(),dto.getContainerCode());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + locDto.getAnfme());
} else {
- detlDtos.add(new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme()));
+ detlDtos.add(new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme(),locDto.getCsocode(),locDto.getIsoseq(),locDto.getContainerCode()));
}
}
--
Gitblit v1.9.1