From 3dbc72ed3bfed1a7f2d3d38b88f71953ed47a531 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 18 八月 2022 10:26:41 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 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 65e721f..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;
@@ -19,6 +20,13 @@
     }
 
     @Override
+    public Page<OrderDetl> getPakoutPage(Page<OrderDetl> page) {
+        page.setRecords(baseMapper.getPakoutPage(page.getCondition()));
+        page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
+        return page;
+    }
+
+    @Override
     public OrderDetl selectItem(Long orderId, String matnr, String batch) {
         return this.baseMapper.selectItem(orderId, matnr, batch);
     }
@@ -32,11 +40,7 @@
     public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) {
         for (OrderDetl orderDetl : orderDetls) {
             if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr)) {
-                if (!Cools.isEmpty(batch)) {
-                    if (orderDetl.getBatch().equals(batch)) {
-                        return orderDetl;
-                    }
-                } else {
+                if (Cools.eq(batch, orderDetl.getBatch())) {
                     return orderDetl;
                 }
             }
@@ -48,4 +52,20 @@
     public boolean increase(Long orderId, String matnr, String batch, Double qty) {
         return this.baseMapper.increase(orderId, matnr, batch, qty) > 0;
     }
+
+    @Override
+    public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
+        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
+    public boolean modifyStatus(Long orderId, Integer status) {
+        return this.baseMapper.modifyStatus(orderId, status) > 0;
+    }
+
 }

--
Gitblit v1.9.1