From 22a51a35a7367bc5569ea075afe0b7f1c438b529 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期二, 20 二月 2024 11:10:23 +0800
Subject: [PATCH] Merge branch 'tzskasrs-2' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-2

---
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java |   64 +++++++++++++++++++++----------
 1 files changed, 43 insertions(+), 21 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 aa0f93e..0f8c4b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -1,12 +1,14 @@
 package com.zy.asrs.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 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 com.zy.asrs.utils.Utils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -29,13 +31,23 @@
     }
 
     @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, String csocode, String isoCode) {
+        return this.baseMapper.selectItem(orderId,matnr,batch,csocode,isoCode);
     }
 
     @Override
-    public OrderDetl selectItem(String orderNo, String matnr, String batch) {
-        return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
+    public OrderDetl selectItem(String orderNo, String matnr, String batch, String csocode, String isoCode) {
+        return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch,csocode,isoCode);
+    }
+
+    @Override
+    public OrderDetl selectItemNoneOfBatch(String orderNo, String matnr) {
+        return this.baseMapper.selectItemNoneOfBatch(orderNo, matnr);
+    }
+
+    @Override
+    public OrderDetl selectItemOfBatch(String matnr, String batch) {
+        return this.baseMapper.selectItemOfBatch(matnr, batch);
     }
 
     @Override
@@ -51,20 +63,20 @@
     }
 
     @Override
-    public boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty) {
-        return this.baseMapper.increaseAnfme(orderId, matnr, batch, qty) > 0;
+    public boolean increaseAnfme(Long orderId, String matnr, String batch, Double qty, String csocode, String isoCode) {
+        return this.baseMapper.increaseAnfme(orderId, matnr, batch, qty, csocode, isoCode) > 0;
     }
 
     @Override
-    public boolean increase(Long orderId, String matnr, String batch, Double qty) {
-        return this.baseMapper.increase(orderId, matnr, batch, qty) > 0;
+    public boolean increase(Long orderId, String matnr, String batch, Double qty, String csocode, String isoCode) {
+        return this.baseMapper.increase(orderId, matnr, batch, qty, csocode, isoCode) > 0;
     }
 
     @Override
-    public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
-        int decrease = this.baseMapper.decrease(orderNo, matnr, batch, qty);
+    public boolean decrease(String orderNo, String matnr, String batch, Double qty, String csocode, String isoCode) {
+        int decrease = this.baseMapper.decrease(orderNo, matnr, batch, qty, csocode, isoCode);
         if (decrease == 0) {
-            return this.baseMapper.decrease(orderNo, matnr, null, qty) > 0;
+            return this.baseMapper.decrease(orderNo, matnr, null, qty, csocode, isoCode) > 0;
         } else {
             return true;
         }
@@ -81,16 +93,26 @@
     }
 
     @Override
-    public OrderDetl selectByMatnr(String matnr) {
-        List<OrderDetl> orderDetls = this.baseMapper.selectByMatnr(matnr);
-        if (!Cools.isEmpty(orderDetls)) {
-            if (orderDetls.size() > 1) {
-                log.error("{}鏉＄爜鍚屾椂瀛樺湪澶氱瑪璁㈠崟锛岃娉ㄦ剰鏌ョ湅锛�", matnr);
-            } else {
-                return orderDetls.get(0);
-            }
-        }
-        return null;
+    public OrderDetl selectContainBatch(String batch) {
+        OrderDetl orderDetl = this.selectOne(new EntityWrapper<OrderDetl>().like("batch", batch));
+        return orderDetl;
+//        if (!Cools.isEmpty(orderDetls)) {
+//            if (orderDetls.size() > 1) {
+//                log.error("{}鏉＄爜鍚屾椂瀛樺湪澶氱瑪璁㈠崟锛岃娉ㄦ剰鏌ョ湅锛�", matnr);
+//            } else {
+//                return orderDetls.get(0);
+//            }
+//        }
+//        return null;
+    }
+
+    @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);
+
+        return this.selectOne(wrapper);
     }
 
 

--
Gitblit v1.9.1