From 34ecb595b36765479e0acf770e6774a0f6a32cca Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期四, 05 九月 2024 15:59:42 +0800
Subject: [PATCH] 批次显示

---
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java |  121 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 108 insertions(+), 13 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..9752268 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -1,11 +1,12 @@
 package com.zy.asrs.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.OrderDetlService;
+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 org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -19,24 +20,79 @@
     }
 
     @Override
-    public OrderDetl selectItem(Long orderId, String matnr, String batch) {
-        return this.baseMapper.selectItem(orderId, matnr, batch);
+    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(String orderNo, String matnr, String batch) {
-        return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
+    public List<OrderDetl> selectItem(String orderNo) {
+        return this.baseMapper.listByOrderNo(orderNo);
+    }
+
+    @Override
+    public OrderDetl selectItem(Long orderId, String matnr, String batch, Double qty) {
+        List<OrderDetl> detlList = this.baseMapper.selectItem(orderId, matnr, batch);
+        if (detlList == null || detlList.isEmpty()) {
+            return null;
+        } else if (detlList.size() == 1) {
+            return detlList.get(0);
+        } else {
+            if (qty != null) {
+                for (OrderDetl orderDetl : detlList) {
+                    if (qty.equals(orderDetl.getAnfme())) {
+                        return orderDetl;
+                    }
+                }
+            }
+            return detlList.get(0);
+        }
+    }
+
+    @Override
+    public OrderDetl selectQtyItem(String orderNo, String matnr, String batch, Double qty) {
+        List<OrderDetl> detlList = this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
+        if (detlList == null || detlList.isEmpty()) {
+            return null;
+        } else if (detlList.size() == 1) {
+            return detlList.get(0);
+        } else {
+            if (qty != null) {
+                for (OrderDetl orderDetl : detlList) {
+                    if (!orderDetl.getQty().equals(orderDetl.getWorkQty()) && qty.equals(orderDetl.getAnfme())) {
+                        return orderDetl;
+                    }
+                }
+            }
+            return detlList.get(0);
+        }
+    }
+
+    @Override
+    public OrderDetl selectItem(String orderNo, String matnr, String batch, Double qty) {
+        List<OrderDetl> detlList = this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
+        if (detlList == null || detlList.isEmpty()) {
+            return null;
+        } else if (detlList.size() == 1) {
+            return detlList.get(0);
+        } else {
+            if (qty != null) {
+                for (OrderDetl orderDetl : detlList) {
+                    if (qty.equals(orderDetl.getAnfme())) {
+                        return orderDetl;
+                    }
+                }
+            }
+            return detlList.get(0);
+        }
     }
 
     @Override
     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 +104,43 @@
     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;
+    }
+
+    @Override
+    public boolean addToLogTable(OrderDetl orderDetl) {
+        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;
+    }
+
+    /**
+     * 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+     *
+     * @param orderId
+     * @param matnr
+     * @param batch
+     * @param workQty
+     * @return
+     */
+    @Override
+    public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
+        return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0;
+    }
 }

--
Gitblit v1.9.1