From f746571f6d16529b8e2593e1d25681dde592d56c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 18 四月 2024 11:11:48 +0800
Subject: [PATCH] 商品档案全量导出修改
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index c0d7dd4..f4ed538 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -60,6 +60,8 @@
private NodeService nodeService;
@Autowired
private ManLocDetlService manLocDetlService;
+ @Autowired
+ private MatV2Service matV2Service;
@Override
@Transactional
@@ -125,11 +127,16 @@
}
for (DetlDto detlDto : list) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
+ if (Cools.isEmpty(mat)) {
+ MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr()));
+ if(Cools.isEmpty(matV2)){
+ throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ orderDetl.sync(matV2);
+ } else {
+ orderDetl.sync(mat);
+ }
//鎵瑰彿涓虹┖浼氬嚭鐜伴棶棰橈紝璁剧疆涓�涓粯璁ゅ��
if (detlDto.getBatch() == null) {
@@ -267,11 +274,16 @@
}
for (DetlDto detlDto : list) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
+ if (Cools.isEmpty(mat)) {
+ MatV2 matV2 = matV2Service.selectOne(new EntityWrapper<MatV2>().eq("matnr", detlDto.getMatnr()));
+ if(Cools.isEmpty(matV2)){
+ throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ orderDetl.sync(matV2);
+ } else {
+ orderDetl.sync(mat);
+ }
orderDetl.setBatch(detlDto.getBatch() == null ? "" : detlDto.getBatch());
orderDetl.setAnfme(detlDto.getAnfme());
orderDetl.setOrderId(order.getId());
--
Gitblit v1.9.1