From 44b6b79dd5dee0ebbd2d11b08abbc2be275bed58 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 09 二月 2026 16:10:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 23fbfff..f35ed84 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -11,6 +11,8 @@
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.MatServiceImpl;
+import com.zy.asrs.service.impl.OrderPakoutServiceImpl;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.BeanUtils;
@@ -42,6 +44,10 @@
private WrkMastService wrkMastService;
@Autowired
private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private MatServiceImpl matService;
+ @Autowired
+ private OrderPakoutServiceImpl orderPakoutService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -106,7 +112,7 @@
}
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
}
- OrderPakout order = orderService.selectByNo(param.getOrderNo());
+ OrderPakout order = orderPakoutService.selectByNo(param.getOrderNo());
if (order != null) {
return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
}
@@ -163,8 +169,11 @@
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
} else {
+ Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
list.add(dto);
orderDetl.setOrderId(order.getId());
+ orderDetl.sync(mat);
+ orderDetl.setBatch(Cools.isEmpty(dto.getBatch())? "" :dto.getBatch());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setCreateBy(getUserId());
orderDetl.setCreateTime(now);
@@ -229,6 +238,7 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setBatch(Cools.isEmpty(dto.getBatch())? "" :dto.getBatch());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
}
--
Gitblit v1.9.1