From 86c69620f1bb3976f01b726d3d1804527474898f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 24 三月 2025 09:34:01 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java |   61 ++++++++++++++++++++++++++++--
 1 files changed, 57 insertions(+), 4 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..46ff52b 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
@@ -41,13 +49,18 @@
     }
 
     @Override
-    public boolean increase(Long orderId, String matnr, String batch, Double qty) {
-        return this.baseMapper.increase(orderId, matnr, batch, qty) > 0;
+    public boolean increase(Long orderId, String matnr, String batch, Double workQty) {
+        return this.baseMapper.increase(orderId, matnr, batch, workQty) > 0;
     }
 
     @Override
-    public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
-        return this.baseMapper.decrease(orderNo, matnr, batch, qty) > 0;
+    public boolean decrease(String orderNo, String matnr, String batch, Double workQty) {
+        int decrease = this.baseMapper.decrease(orderNo, matnr, batch, workQty);
+        if (decrease == 0) {
+            return this.baseMapper.decrease(orderNo, matnr, null, workQty) > 0;
+        } else {
+            return true;
+        }
     }
 
     @Override
@@ -55,4 +68,44 @@
         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;
+    }
+
+    @Override
+    public Boolean checkAllDetlFinish(String orderNo) {
+        return this.baseMapper.checkAllDetlFinish(orderNo) <= 0 ;
+    }
+
+    /**
+     * 鑾峰彇鐩稿悓鍗曞彿锛岀浉鍚屾壒鍙凤紝鐩稿悓鐗╂枡浠g爜宸茬粡鍦ㄥ叆搴撻�氱煡妗i噷缁勬墭鐨勬暟閲�
+     * @param orderNo
+     * @param matnr
+     * @param batch
+     * @return
+     */
+    @Override
+    public Integer sameOrderComb(String orderNo, String matnr, String batch) {
+        Integer sum = this.baseMapper.sameOrderComb(orderNo, matnr, batch);
+        return  sum != null ? sum : 0;
+    }
 }

--
Gitblit v1.9.1