From 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 05 六月 2025 14:15:07 +0800 Subject: [PATCH] 123 --- src/main/java/com/zy/asrs/controller/WaitPakinController.java | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java index 9898dde..0dd8ccf 100644 --- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java +++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java @@ -10,8 +10,14 @@ import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.R; +import com.zy.asrs.entity.Order; +import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.WaitPakin; +import com.zy.asrs.entity.WrkMast; +import com.zy.asrs.service.OrderDetlService; +import com.zy.asrs.service.OrderService; import com.zy.asrs.service.WaitPakinService; +import com.zy.asrs.service.WrkMastService; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -26,6 +32,15 @@ @Autowired private WaitPakinService waitPakinService; + + @Autowired + private WrkMastService wrkMastService; + + @Autowired + private OrderService orderService; + + @Autowired + private OrderDetlService orderDetlService; @RequestMapping(value = "/waitPakin/{id}/auth") @ManagerAuth @@ -88,7 +103,27 @@ return R.error(); } for (WaitPakin entity : list){ - waitPakinService.delete(new EntityWrapper<>(entity)); + WrkMast wrkMast = wrkMastService.selectByBarcode(entity.getBarcode()); + if (Cools.isEmpty(wrkMast)) { + Order order = orderService.selectByNo(entity.getOrderNo()); + if (!Cools.isEmpty(order)) { + String matnr = entity.getMatnr(); + Double anfme = entity.getAnfme(); + List<OrderDetl> orderDetls = orderService.selectTotalDetls(order.getId()); + for (OrderDetl orderDetl : orderDetls) { + if (matnr.equals(orderDetl.getMatnr())) { + orderDetl.setQty(orderDetl.getQty() - anfme); + orderDetlService.updateById(orderDetl); + } + } + waitPakinService.delete(new EntityWrapper<>(entity)); + } else { + waitPakinService.delete(new EntityWrapper<>(entity)); + } + } else { + return R.error("宸ヤ綔妗f暟鎹凡瀛樺湪,鏃犳硶鍒犻櫎锛侊紒"); + } + } return R.ok(); } -- Gitblit v1.9.1