From 17ec0146913e299db974fe118582c69b0c1ce36f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 十一月 2023 11:18:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OutController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 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..1b41343 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);
}
@@ -99,6 +104,28 @@
return R.ok().add(locDtos);
}
+ @PostMapping("/out/refund/loc/preview/auth")
+ @ManagerAuth
+ public R refundLocPreview(@RequestBody List<Long> ids) {
+ if (Cools.isEmpty(ids)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ List<LocDto> locDtos = new ArrayList<>();
+ for (Long id : ids){
+ Order order = orderService.selectById(id);
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+
+ for (OrderDetl orderDetl : orderDetls) {
+ 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);
+ }
+ }
+
+ return R.ok().add(locDtos);
+ }
+
@PostMapping("/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakout(@RequestBody List<LocDto> locDtos) throws InterruptedException {
@@ -125,6 +152,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);
// }
@@ -162,4 +201,13 @@
return R.ok();
}
+
+ @PostMapping("/out/refund/loc/auth")
+ @ManagerAuth(memo = "璁㈠崟鍑哄簱")
+ public synchronized R refundLoc(@RequestBody List<LocDto> locDtos) throws InterruptedException {
+ System.out.println(locDtos);
+
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1