From 211ae7e060b36da7c1bc790c12ccd2159aaec011 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期日, 12 十一月 2023 18:06:04 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OutController.java | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java index 17b8e4a..2ecaa14 100644 --- a/src/main/java/com/zy/asrs/controller/OutController.java +++ b/src/main/java/com/zy/asrs/controller/OutController.java @@ -6,6 +6,7 @@ import com.core.common.R; import com.zy.asrs.entity.BasDevp; import com.zy.asrs.entity.LocDetl; +import com.zy.asrs.entity.Order; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.param.StockOutParam; import com.zy.asrs.service.*; @@ -62,8 +63,12 @@ List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids); List<LocDto> locDtos = new ArrayList<>(); for (OrderDetl orderDetl : orderDetls) { + if (orderDetl.getAnfme()-orderDetl.getWorkQty()-orderDetl.getQty()==0.0){ + continue; + } LocDto locDto = new LocDto(orderDetl.getManu(), orderDetl.getMatnr(), orderDetl.getMaktx(),orderDetl.getModel(),orderDetl.getSpecs(), orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getBarcode(), orderDetl.getOrderNo(),orderDetl.getAnfme()); + locDto.setOrderDetlId(orderDetl.getId()); locDtos.add(locDto); } @@ -125,6 +130,18 @@ for (StockOutParam stockOutParam : stockOutParams){ workService.startupFullTakeStore(stockOutParam, getUserId()); } + + for (LocDto locDto:locDtos){ + OrderDetl orderDetl = orderDetlService.selectById(locDto.getOrderDetlId()); + orderDetl.setWorkQty(locDto.getAnfme()); + orderDetlService.updateById(orderDetl); + } + + Order order = orderService.selectByNo(param.getOrderNo()); + order.setSettle(2L); + orderService.updateById(order); + + // if (Cools.isEmpty(locDtos)) { // return R.parse(BaseRes.PARAM); // } -- Gitblit v1.9.1