From f8adb8fbfbf9c52cf412ef4ac5742b3e5fe76748 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 21 十二月 2023 21:01:47 +0800
Subject: [PATCH] #检料盘点工作档更新
---
src/main/java/com/zy/asrs/controller/OutController.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 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..918f8b0 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -246,9 +246,9 @@
//骞冲簱
if("鏃犻渶绔欑偣".equals(locDto.getAgvStaNo())){
generateManPakout(locDto);
+ }else {
+ generateTaskDtoForAgv(locDto,agvTaskDtos);
}
- generateTaskDtoForAgv(locDto,agvTaskDtos);
-
//鍥涢」搴�
}else{
generateTaskDtoForBase(locDto,taskDtos);
@@ -266,19 +266,33 @@
if(!Cools.isEmpty(agvLocMast) && !agvLocMast.getLocSts().equals("F")){
throw new CoolException("搴撲綅鍙烽潪鍦ㄥ簱鐘舵�侊紝璇烽噸鏂伴�夋嫨鍑哄簱搴撲綅===>>" + locDto.getLocNo());
}
- //瀵绘壘绌虹珯鐐逛綅缃�
- 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);
+ 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.setLocSts("S");
-// agvBasDevpService.updateById(agvBasDevp);
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvBasDevp.getDevNo(),"S",null);
- TaskDto taskDto = new TaskDto(locDto.getLocNo(), agvBasDevp.getDevNo(), locDto);
- 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);
+// //濡傛灉搴撲綅瀛樺湪娣疯浇
+//
+// return;
+// }
+//// agvBasDevp.setLocSts("S");
+//// agvBasDevpService.updateById(agvBasDevp);
+// agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvBasDevp.getDevNo(),"S",null);
+// //TaskDto taskDto = new TaskDto(locDto.getLocNo(), agvBasDevp.getDevNo(), locDto);
+// taskDto.setAgvStaNo(agvBasDevp.getDevNo());
+
+ //agvTaskDtos.add(taskDto);
}
@@ -307,7 +321,7 @@
鐢熸垚骞冲簱鎷ｈ揣鍗�
*/
private void generateManPakout(LocDto locDto){
- ManLocDetl manLocDetl = manLocDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch());
+ ManLocDetl manLocDetl = manLocDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getCsocode(),locDto.getIsoseq(),locDto.getContainerCode());
if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme()>manLocDetl.getAnfme())) {
manLocDetl.setStatus(0);
manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("loc_no", manLocDetl.getLocNo()).eq("matnr",manLocDetl.getMatnr()));
--
Gitblit v1.9.1