From ccaf80f21ea0a8375324df6bb2250b9ad11c5cdd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 27 九月 2022 15:01:34 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java |   15 ++++++++++++++-
 1 files changed, 14 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 5a3dc21..6b89902 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -1,6 +1,7 @@
 package com.zy.asrs.service.impl;
 
 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;
@@ -16,6 +17,13 @@
     @Override
     public List<OrderDetl> selectByOrderId(Long orderId) {
         return this.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
+    }
+
+    @Override
+    public Page<OrderDetl> getPakoutPage(Page<OrderDetl> page) {
+        page.setRecords(baseMapper.getPakoutPage(page.getCondition()));
+        page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
+        return page;
     }
 
     @Override
@@ -47,7 +55,12 @@
 
     @Override
     public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
-        return this.baseMapper.decrease(orderNo, matnr, batch, qty) > 0;
+        int decrease = this.baseMapper.decrease(orderNo, matnr, batch, qty);
+        if (decrease == 0) {
+            return this.baseMapper.decrease(orderNo, matnr, null, qty) > 0;
+        } else {
+            return true;
+        }
     }
 
     @Override

--
Gitblit v1.9.1