From 9126e6315288e1ea50e74c70b099974522d6b172 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/service/OrderDetlPakinService.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java b/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
index e8ba7fb..9247089 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.OrderDetlPakin;
+import com.zy.asrs.entity.param.OrderDetlByCode;
import java.util.List;
@@ -12,21 +13,27 @@
Page<OrderDetlPakin> getPakoutPage(Page<OrderDetlPakin> page);
- OrderDetlPakin selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
+ OrderDetlPakin selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3
+ , String boxType1, String boxType2, String boxType3);
- OrderDetlPakin selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
+ OrderDetlPakin selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3
+ , String boxType1, String boxType2, String boxType3);
- OrderDetlPakin findByLook(List<OrderDetlPakin> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
+ 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);
- boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
+ boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3
+ , String boxType1, String boxType2, String boxType3, Double qty);
- boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
+ boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3
+ , String boxType1, String boxType2, String boxType3, Double qty);
boolean modifyStatus(Long orderId, Integer status);
boolean addToLogTable(OrderDetlPakin orderDetl);
- boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
+ boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3
+ , String boxType1, String boxType2, String boxType3, Double qty);
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
@@ -36,5 +43,10 @@
* @param workQty
* @return
*/
- boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty);
+ boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3
+ , String boxType1, String boxType2, String boxType3, Double workQty);
+
+ List<OrderDetlPakin> selectOrderDetls(OrderDetlByCode orderDetlByCode);
+ List<OrderDetlPakin> selectOrderDetlsByOrderNo(String orderNo);
+
}
--
Gitblit v1.9.1