From 0fc6123a213aa5568d3afb524f578d754de5933c Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 19 十一月 2025 19:58:36 +0800
Subject: [PATCH] #盘点
---
src/main/java/com/zy/asrs/controller/CheckOrderController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CheckOrderController.java b/src/main/java/com/zy/asrs/controller/CheckOrderController.java
index 7819cd5..eadd92c 100644
--- a/src/main/java/com/zy/asrs/controller/CheckOrderController.java
+++ b/src/main/java/com/zy/asrs/controller/CheckOrderController.java
@@ -12,6 +12,7 @@
import com.zy.asrs.service.*;
import com.core.annotations.ManagerAuth;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.LocDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -32,6 +33,17 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private DocTypeService docTypeService;
+
+
+ @PostMapping(value = "/checkOrder/preview/auth")
+ @ManagerAuth
+ public R checkOrderPreview(@RequestParam("orderId") Long orderId) {
+
+
+
+ List<LocDto> locDtos = checkOrderService.preview(orderId);
+ return R.ok(locDtos);
+ }
@@ -112,6 +124,7 @@
for (LocDetl locDetl : param.getLocDetlList()) {
CheckOrderDetl checkOrderDetl = new CheckOrderDetl();
checkOrderDetl.sync(locDetl);
+ checkOrderDetl.setLocDetlId(locDetl.getId());
checkOrderDetl.setOrderId(checkOrder.getId());
checkOrderDetl.setOrderNo(checkOrder.getOrderNo());
checkOrderDetl.setMatnr(locDetl.getMatnr());
@@ -157,6 +170,7 @@
for (CheckOrderDetl checkOrderDetl : param.getCheckOrderDetls()) {
CheckOrderDetl checkOrderDetl1 = new CheckOrderDetl();
checkOrderDetl1.sync(checkOrderDetl);
+ checkOrderDetl1.setLocDetlId(checkOrderDetl.getLocDetlId()==null?checkOrderDetl.getId():checkOrderDetl.getLocDetlId());
checkOrderDetl1.setOrderId(checkOrder.getId());
checkOrderDetl1.setOrderNo(checkOrder.getOrderNo());
checkOrderDetl1.setMatnr(checkOrderDetl.getMatnr());
@@ -167,7 +181,7 @@
checkOrderDetl1.setQty(checkOrderDetl.getQty());
checkOrderDetl1.setWorkQty(checkOrderDetl.getWorkQty());
checkOrderDetl1.setStatus(checkOrderDetl.getStatus());
- checkOrderDetl.setZpallet(checkOrderDetl.getZpallet());
+ checkOrderDetl1.setZpallet(checkOrderDetl.getZpallet());
if (!checkOrderDetlService.insert(checkOrderDetl1)) {
throw new CoolException("淇濆瓨鐩樼偣鍗曟槑缁嗗け璐�");
}
--
Gitblit v1.9.1