From 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 11 十月 2023 10:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 0947e50..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,12 @@
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;
@@ -31,6 +35,12 @@
@Autowired
private WrkMastService wrkMastService;
+
+ @Autowired
+ private OrderService orderService;
+
+ @Autowired
+ private OrderDetlService orderDetlService;
@RequestMapping(value = "/waitPakin/{id}/auth")
@ManagerAuth
@@ -95,9 +105,25 @@
for (WaitPakin entity : list){
WrkMast wrkMast = wrkMastService.selectByBarcode(entity.getBarcode());
if (Cools.isEmpty(wrkMast)) {
- waitPakinService.delete(new EntityWrapper<>(entity));
+ 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("宸ヤ綔妗ｆ暟鎹凡瀛樺湪,鏃犳硶鍒犻櫎锛侊紒");
}
- return R.error("宸ヤ綔妗ｆ暟鎹凡瀛樺湪,鏃犳硶鍒犻櫎锛侊紒");
+
}
return R.ok();
}
--
Gitblit v1.9.1