From 0868d9d032f3bfb5f9af870e3f9fbb63e9cb3b8c Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期二, 03 九月 2024 12:29:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs
---
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 64 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 8 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 3f08146..9752268 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -2,11 +2,11 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.Cools;
-import com.zy.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.OrderDetlService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.mapper.OrderDetlMapper;
+import com.zy.asrs.service.OrderDetlService;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -32,13 +32,60 @@
}
@Override
- public OrderDetl selectItem(Long orderId, String matnr, String batch) {
- return this.baseMapper.selectItem(orderId, matnr, batch);
+ public OrderDetl selectItem(Long orderId, String matnr, String batch, Double qty) {
+ List<OrderDetl> detlList = this.baseMapper.selectItem(orderId, matnr, batch);
+ if (detlList == null || detlList.isEmpty()) {
+ return null;
+ } else if (detlList.size() == 1) {
+ return detlList.get(0);
+ } else {
+ if (qty != null) {
+ for (OrderDetl orderDetl : detlList) {
+ if (qty.equals(orderDetl.getAnfme())) {
+ return orderDetl;
+ }
+ }
+ }
+ return detlList.get(0);
+ }
}
@Override
- public OrderDetl selectItem(String orderNo, String matnr, String batch) {
- return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
+ public OrderDetl selectQtyItem(String orderNo, String matnr, String batch, Double qty) {
+ List<OrderDetl> detlList = this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
+ if (detlList == null || detlList.isEmpty()) {
+ return null;
+ } else if (detlList.size() == 1) {
+ return detlList.get(0);
+ } else {
+ if (qty != null) {
+ for (OrderDetl orderDetl : detlList) {
+ if (!orderDetl.getQty().equals(orderDetl.getWorkQty()) && qty.equals(orderDetl.getAnfme())) {
+ return orderDetl;
+ }
+ }
+ }
+ return detlList.get(0);
+ }
+ }
+
+ @Override
+ public OrderDetl selectItem(String orderNo, String matnr, String batch, Double qty) {
+ List<OrderDetl> detlList = this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
+ if (detlList == null || detlList.isEmpty()) {
+ return null;
+ } else if (detlList.size() == 1) {
+ return detlList.get(0);
+ } else {
+ if (qty != null) {
+ for (OrderDetl orderDetl : detlList) {
+ if (qty.equals(orderDetl.getAnfme())) {
+ return orderDetl;
+ }
+ }
+ }
+ return detlList.get(0);
+ }
}
@Override
@@ -85,6 +132,7 @@
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ *
* @param orderId
* @param matnr
* @param batch
--
Gitblit v1.9.1