From 68a67eab771eb281f5f105b1af87b05d58953bc6 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 02 四月 2024 15:38:51 +0800
Subject: [PATCH] 变更：同个容器多次组托
---
src/main/java/com/zy/asrs/controller/OutController.java | 66 ++------------------------------
1 files changed, 5 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 23bab48..f99c2f3 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -91,13 +91,13 @@
if (issued <= 0.0D) { continue; }
//浠庡钩搴撳鎵�
- issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+ //issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
//鍏堟壘AGV鐨勫簱瀛橈紝濡傛灉杩斿洖鐨刬ssued澶т簬0锛屽垯鍘诲洓椤瑰簱鎵�
issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
//浠庡洓椤瑰簱鐨勫簱瀛橀噷闈㈡壘锛�
- issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+ //issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
if (issued > 0) {
LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
@@ -193,44 +193,6 @@
return R.ok().add(locDtoList);
- /*
- if (Cools.isEmpty(list)) {
- return R.parse(BaseRes.PARAM);
- }
- Set<String> exist = new HashSet<>();
- List<LocDto> locDtos = new ArrayList<>();
-
- for (OrderMergeVo vo : list) {
- double issued = Optional.of(vo.getAnfme()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
- List<LocDetl> locDetls = locDetlService.queryStock(vo.getMatnr(), vo.getBatch(), null, exist);
- for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
- LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), JSON.toJSONString(vo.getOrderDtos()),
- issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
- int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
- List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
- locDto.setStaNos(staNos);
- locDtos.add(locDto);
- exist.add(locDetl.getLocNo());
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- } else {
- break;
- }
- }
- if (issued > 0) {
- LocDto locDto = new LocDto(null, vo.getMatnr(), vo.getMaktx(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), issued);
- locDto.setLack(Boolean.TRUE);
- locDtos.add(locDto);
- }
- }
- for (LocDto locDto : locDtos) {
- Mat mat = matService.selectByMatnr(locDto.getMatnr());
- assert mat != null;
- locDto.setSpecs(mat.getSpecs());
- }
- return R.ok().add(locDtos);*/
}
@@ -246,9 +208,9 @@
//骞冲簱
if("鏃犻渶绔欑偣".equals(locDto.getAgvStaNo())){
generateManPakout(locDto);
+ }else {
+ generateTaskDtoForAgv(locDto,agvTaskDtos);
}
- generateTaskDtoForAgv(locDto,agvTaskDtos);
-
//鍥涢」搴�
}else{
generateTaskDtoForBase(locDto,taskDtos);
@@ -275,24 +237,6 @@
} 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);
-// //濡傛灉搴撲綅瀛樺湪娣疯浇
-//
-// 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);
}
@@ -321,7 +265,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