From e7d8e2c64facfa261e8b168b84e81ef6c835f57d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 03 九月 2025 09:25:19 +0800
Subject: [PATCH] 许可证到期提醒，系统30分钟无操作下线账号

---
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java |   67 ++++++++++++++++++++++++++++++++-
 1 files changed, 64 insertions(+), 3 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..71c2bc7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -4,12 +4,14 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.core.common.Cools;
+import com.zy.asrs.entity.AcQuantity;
 import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.entity.WaitPakin;
 import com.zy.asrs.entity.WrkDetl;
 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;
@@ -27,6 +29,11 @@
         page.setRecords(baseMapper.getPakoutPage(page.getCondition()));
         page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
         return page;
+    }
+
+    @Override
+    public List<AcQuantity> loadQuantity(String orderNo){
+        return baseMapper.loadQuantity(orderNo);
     }
 
     @Override
@@ -138,6 +145,11 @@
         List<OrderDetl> detlList = selectItem(waitPakin.getOrderNo());
         for (OrderDetl orderDetl : detlList) {
             if (MatCompareUtils.compare(orderDetl, waitPakin)) {
+                Double workQty = orderDetl.getWorkQty();
+                //闃叉鍑忔垚璐熸暟
+                if (workQty - qty <= 0) {
+                    qty = workQty;
+                }
                 int decrease = this.baseMapper.decrease2(orderDetl.getId(), qty);
                 if (decrease == 0) {
                     return false;
@@ -159,10 +171,25 @@
         return this.baseMapper.addToLogTable(orderDetl) > 0;
     }
 
+//    @Override
+//    public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
+//        return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty) > 0;
+//    }
+
     @Override
-    public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
-        return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty) > 0;
+    public boolean increaseQtyByOrderNo(String orderNo, WrkDetl wrkDetl, Double qty) {
+        List<OrderDetl> detlList = this.baseMapper.listByOrderNo(orderNo);
+        if (detlList == null || detlList.isEmpty()) {
+            return false;
+        }
+        for (OrderDetl orderDetl : detlList) {
+            if (MatCompareUtils.compare(orderDetl, wrkDetl)) {
+                return this.baseMapper.increaseQtyById(orderDetl.getId(), qty) > 0;
+            }
+        }
+        return false;
     }
+
 
     /**
      * 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
@@ -178,7 +205,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 +219,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