From 98ff94c52485dd502e10c061ae267bf24e5d1814 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 17 十一月 2023 08:26:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 67c8fe2..9fc1c53 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -266,19 +266,33 @@
if(!Cools.isEmpty(agvLocMast) && !agvLocMast.getLocSts().equals("F")){
throw new CoolException("搴撲綅鍙烽潪鍦ㄥ簱鐘舵�侊紝璇烽噸鏂伴�夋嫨鍑哄簱搴撲綅===>>" + locDto.getLocNo());
}
+ TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getAgvStaNo(), locDto);
+ if (TaskDto.has(agvTaskDtos, taskDto)) {
+ TaskDto dto = TaskDto.find(agvTaskDtos, taskDto);
+ assert dto != null;
+ dto.getLocDtos().addAll(taskDto.getLocDtos());
+ return;
+ } else {
+ agvTaskDtos.add(taskDto);
+ }
+
//瀵绘壘绌虹珯鐐逛綅缃�
AgvBasDevp agvBasDevp = agvBasDevpService.selectEmptyDevpByStation(locDto.getAgvStaNo());
if(Cools.isEmpty(agvBasDevp)){
//濡傛灉娌℃湁鎵惧埌绌虹珯鐐癸紝鍒欑敓鎴愬噯澶囦换鍔�
- TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getAgvStaNo(), locDto);
- agvTaskDtos.add(taskDto);
+ //TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getAgvStaNo(), locDto);
+ //agvTaskDtos.add(taskDto);
+ //濡傛灉搴撲綅瀛樺湪娣疯浇
+
return;
}
// agvBasDevp.setLocSts("S");
// agvBasDevpService.updateById(agvBasDevp);
agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvBasDevp.getDevNo(),"S",null);
- TaskDto taskDto = new TaskDto(locDto.getLocNo(), agvBasDevp.getDevNo(), locDto);
- agvTaskDtos.add(taskDto);
+ //TaskDto taskDto = new TaskDto(locDto.getLocNo(), agvBasDevp.getDevNo(), locDto);
+ taskDto.setAgvStaNo(agvBasDevp.getDevNo());
+
+ //agvTaskDtos.add(taskDto);
}
--
Gitblit v1.9.1