From 20a1449f65a9d577c2c9c0af62f3c4af3dd8d172 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 04 十二月 2023 15:02:10 +0800
Subject: [PATCH] 库位规则、库位编码规则bug修改
---
src/main/java/com/zy/asrs/controller/OutController.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 9fc1c53..442a91a 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -276,21 +276,21 @@
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());
+// //瀵绘壘绌虹珯鐐逛綅缃�
+// 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 +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