From b17fe3091ae104984347622eb9db40765b5d025c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 20 十二月 2024 13:30:49 +0800
Subject: [PATCH] 优化订单查询逻辑

---
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java |   48 +++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 39 insertions(+), 9 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 4695d23..395972f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.core.common.Cools;
+import com.core.exception.CoolException;
 import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.mapper.OrderDetlMapper;
 import com.zy.asrs.service.OrderDetlService;
@@ -39,29 +40,58 @@
 
     @Override
     public OrderDetl selectItem(Long orderId, String matnr, String batch, String csocode, String isoCode) {
-        return this.baseMapper.selectItem(orderId,matnr,batch,csocode,isoCode);
+        List<OrderDetl> orderDetls = this.baseMapper.selectItem(orderId, matnr, batch, csocode, isoCode);
+        if (orderDetls.isEmpty()) {
+            return null;
+        } else if (orderDetls.size() > 1) {
+            throw new CoolException("璁㈠崟鏄庣粏鏌ヨ鍒板鏉¤褰�");
+        }
+        return orderDetls.get(0);
     }
 
     @Override
     public OrderDetl selectItem(String orderNo, String matnr, String batch, String csocode, String isoCode) {
-        return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch,csocode,isoCode);
+        List<OrderDetl> orderDetls = this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch, csocode, isoCode);
+        if (orderDetls.isEmpty()) {
+            return null;
+        } else if (orderDetls.size() > 1) {
+            throw new CoolException("璁㈠崟鏄庣粏鏌ヨ鍒板鏉¤褰�");
+        }
+        return orderDetls.get(0);
     }
 
     @Override
-    public OrderDetl selectItem(String orderNo, String matnr,String batch, String threeCode) {
-        return this.baseMapper.selectItemByOrderNo2(orderNo, matnr, batch, threeCode);
+    public OrderDetl selectItem(String orderNo, String matnr, String batch, String threeCode) {
+        List<OrderDetl> orderDetls = this.baseMapper.selectItemByOrderNo2(orderNo, matnr, batch, threeCode);
+        if (orderDetls.isEmpty()) {
+            return null;
+        } else if (orderDetls.size() > 1) {
+            throw new CoolException("璁㈠崟鏄庣粏鏌ヨ鍒板鏉¤褰�");
+        }
+        return orderDetls.get(0);
     }
-
 
 
     @Override
     public OrderDetl selectItemNoneOfBatch(String orderNo, String matnr) {
-        return this.baseMapper.selectItemNoneOfBatch(orderNo, matnr);
+        List<OrderDetl> orderDetls = this.baseMapper.selectItemNoneOfBatch(orderNo, matnr);
+        if (orderDetls.isEmpty()) {
+            return null;
+        } else if (orderDetls.size() > 1) {
+            throw new CoolException("璁㈠崟鏄庣粏鏌ヨ鍒板鏉¤褰�");
+        }
+        return orderDetls.get(0);
     }
 
     @Override
     public OrderDetl selectItemOfBatch(String matnr, String batch) {
-        return this.baseMapper.selectItemOfBatch(matnr, batch);
+        List<OrderDetl> orderDetls = this.baseMapper.selectItemOfBatch(matnr, batch);
+        if (orderDetls.isEmpty()) {
+            return null;
+        } else if (orderDetls.size() > 1) {
+            throw new CoolException("璁㈠崟鏄庣粏鏌ヨ鍒板鏉¤褰�");
+        }
+        return orderDetls.get(0);
     }
 
     @Override
@@ -123,8 +153,8 @@
     @Override
     public OrderDetl selectByOrderNoAndMatnr(String orderNo, String matnr, String csocode, String isoseq) {
         Wrapper<OrderDetl> wrapper = new EntityWrapper<OrderDetl>().eq("order_no", orderNo).eq("matnr", matnr);
-        Utils.wapperSetCondition(wrapper,"three_code",csocode);
-        Utils.wapperSetCondition(wrapper,"dead_time",isoseq);
+        Utils.wapperSetCondition(wrapper, "three_code", csocode);
+        Utils.wapperSetCondition(wrapper, "dead_time", isoseq);
 
         return this.selectOne(wrapper);
     }

--
Gitblit v1.9.1