From 38e378391b355cc35d7c757956910abcc373b0d7 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 18 九月 2024 13:59:00 +0800
Subject: [PATCH] 调整
---
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index dbc5388..59c940c 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -10,6 +10,7 @@
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.utils.MatCompareUtils;
+import com.zy.common.model.LocDto;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -178,7 +179,7 @@
@Override
public OrderDetl selectItem(WaitPakin waitPakin) {
- List<OrderDetl> detlList = this.baseMapper.selectItemByOrderNo(waitPakin.getOrderNo(), waitPakin.getOrderNo(), waitPakin.getBatch());
+ List<OrderDetl> detlList = this.baseMapper.selectItemByOrderNo(waitPakin.getOrderNo(), waitPakin.getMatnr(), waitPakin.getBatch());
if (detlList == null || detlList.isEmpty()) {
return null;
} else if (detlList.size() == 1) {
@@ -192,4 +193,38 @@
return null;
}
}
+
+ @Override
+ public OrderDetl selectItem(LocDto locDto) {
+ List<OrderDetl> detlList = this.baseMapper.selectItemByOrderNo(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
+ if (detlList == null || detlList.isEmpty()) {
+ return null;
+ } else if (detlList.size() == 1) {
+ return detlList.get(0);
+ } else {
+ for (OrderDetl orderDetl : detlList) {
+ if (MatCompareUtils.compare(locDto, orderDetl)) {
+ return orderDetl;
+ }
+ }
+ return null;
+ }
+ }
+
+ @Override
+ public OrderDetl selectItem(WrkDetl wrkDetl) {
+ List<OrderDetl> detlList = this.baseMapper.selectItemByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ if (detlList == null || detlList.isEmpty()) {
+ return null;
+ } else if (detlList.size() == 1) {
+ return detlList.get(0);
+ } else {
+ for (OrderDetl orderDetl : detlList) {
+ if (MatCompareUtils.compare(wrkDetl, orderDetl)) {
+ return orderDetl;
+ }
+ }
+ return null;
+ }
+ }
}
--
Gitblit v1.9.1