From 102a41a8d5c231dd306bad622344e98312c1a774 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 02 十二月 2025 10:16:53 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java |   47 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
index 887bdac..b3ad140 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.core.common.Cools;
 import com.zy.asrs.entity.OrderDetlPakin;
+import com.zy.asrs.entity.param.OrderDetlByCode;
 import com.zy.asrs.mapper.OrderDetlPakinMapper;
 import com.zy.asrs.service.OrderDetlPakinService;
 import org.springframework.stereotype.Service;
@@ -27,19 +28,25 @@
     }
 
     @Override
-    public OrderDetlPakin selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
-        return this.baseMapper.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3);
+    public OrderDetlPakin selectItem(Long orderId, String matnr, String batch, String brand,
+                                     String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+        return this.baseMapper.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
     }
 
     @Override
-    public OrderDetlPakin selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
-        return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3);
+    public OrderDetlPakin selectItem(String orderNo, String matnr, String batch, String brand,
+                                     String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+        return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
     }
 
     @Override
-    public OrderDetlPakin findByLook(List<OrderDetlPakin> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+    public OrderDetlPakin findByLook(List<OrderDetlPakin> orderDetls, Long orderId, String matnr, String batch, String brand,
+                                     String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
         for (OrderDetlPakin orderDetl : orderDetls) {
-            if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr)  && orderDetl.getBrand().equals(brand)  && orderDetl.getStandby1().equals(standby1)  && orderDetl.getStandby2().equals(standby2)  && orderDetl.getStandby3().equals(standby3)) {
+            if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr)  && orderDetl.getBrand().equals(brand)
+                    && orderDetl.getStandby1().equals(standby1)  && orderDetl.getStandby2().equals(standby2)  && orderDetl.getStandby3().equals(standby3)
+                    && orderDetl.getBoxType1().equals(boxType1)  && orderDetl.getBoxType2().equals(boxType2)  && orderDetl.getBoxType3().equals(boxType3)
+            ) {
                 if (Cools.eq(batch, orderDetl.getBatch())) {
                     return orderDetl;
                 }
@@ -49,15 +56,17 @@
     }
 
     @Override
-    public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
-        return this.baseMapper.increase(orderId, matnr, batch,brand,standby1,standby2,standby3, qty) > 0;
+    public boolean increase(Long orderId, String matnr, String batch, String brand,
+                            String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
+        return this.baseMapper.increase(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
     }
 
     @Override
-    public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
-        int decrease = this.baseMapper.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty);
+    public boolean decrease(String orderNo, String matnr, String batch, String brand,
+                            String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
+        int decrease = this.baseMapper.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
         if (decrease == 0) {
-            return this.baseMapper.decrease(orderNo, matnr, "",brand,standby1,standby2,standby3, qty) > 0;
+            return this.baseMapper.decrease(orderNo, matnr, "",brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
         } else {
             return true;
         }
@@ -74,8 +83,9 @@
     }
 
     @Override
-    public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
-        return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty) > 0;
+    public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand,
+                                        String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
+        return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
     }
 
     /**
@@ -87,7 +97,14 @@
      * @return
      */
     @Override
-    public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty) {
-        return this.baseMapper.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3, workQty) > 0;
+    public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) {
+        return this.baseMapper.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty) > 0;
+    }
+    @Override
+    public List<OrderDetlPakin> selectOrderDetls(OrderDetlByCode orderDetlByCode){
+        String orderNo = orderDetlByCode.getOrderNo();
+        String upc = orderDetlByCode.getUpc();
+        String sku = orderDetlByCode.getSku();
+        return this.baseMapper.selectOrderDetls(orderNo,sku,upc);
     }
 }

--
Gitblit v1.9.1