From 1c0dbad152362ac704a27ecfc5b5d08247385d87 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 17:12:48 +0800
Subject: [PATCH] 13

---
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java |   76 ++++++++++++++++++++++++++++++-------
 1 files changed, 61 insertions(+), 15 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 6981a2d..1d224ff 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -1,39 +1,47 @@
 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.OrderDetlPakout;
+import com.zy.asrs.mapper.OrderDetlMapper;
+import com.zy.asrs.service.OrderDetlService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 @Service("orderDetlService")
-public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetl> implements OrderDetlService {
+public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetlPakout> implements OrderDetlService {
 
     @Override
-    public List<OrderDetl> selectByOrderId(Long orderId) {
-        return this.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
+    public List<OrderDetlPakout> selectByOrderId(Long orderId) {
+        return this.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
     }
 
     @Override
-    public OrderDetl selectItem(Long orderId, String matnr, String batch) {
+    public Page<OrderDetlPakout> getPakoutPage(Page<OrderDetlPakout> page) {
+        page.setRecords(baseMapper.getPakoutPage(page.getCondition()));
+        page.setTotal(baseMapper.getPakoutPageCount(page.getCondition()));
+        return page;
+    }
+
+    @Override
+    public OrderDetlPakout selectItem(Long orderId, String matnr, String batch) {
         return this.baseMapper.selectItem(orderId, matnr, batch);
     }
 
     @Override
-    public OrderDetl selectItem(String orderNo, String matnr, String batch) {
+    public OrderDetlPakout selectItem(String orderNo, String matnr, String batch) {
         return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
     }
 
     @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.eq(batch, orderDetl.getBatch())) {
-                    return orderDetl;
+    public OrderDetlPakout findByLook(List<OrderDetlPakout> orderDetlPakouts, Long orderId, String matnr, String batch) {
+        for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
+            if (orderDetlPakout.getOrderId().equals(orderId) && orderDetlPakout.getMatnr().equals(matnr)) {
+                if (Cools.eq(batch, orderDetlPakout.getBatch())) {
+                    return orderDetlPakout;
                 }
             }
         }
@@ -47,7 +55,45 @@
 
     @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
+    public boolean modifyStatus(Long orderId, Integer status) {
+        return this.baseMapper.modifyStatus(orderId, status) > 0;
+    }
+
+    @Override
+    public boolean addToLogTable(OrderDetlPakout orderDetlPakout) {
+        return this.baseMapper.addToLogTable(orderDetlPakout) > 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 id, String matnr, String batch, Double workQty) {
+        return this.baseMapper.increaseWorkQty(id, matnr, batch, workQty) > 0;
+    }
+
+    @Override
+    public boolean increaseWorkQtyById(Long id, Double workQty) {
+        return this.baseMapper.increaseWorkQtyById(id, workQty) > 0;
+    }
 }

--
Gitblit v1.9.1