From 57fe41f460cb72684d6a76869ced6ae93577b75a Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 15 六月 2025 17:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/asrs/service/OrderDetlPakinService.java | 21 ++++++++++++++-------
1 files changed, 14 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 44c975a..9527f19 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
@@ -12,21 +12,27 @@
Page<OrderDetlPakin> getPakoutPage(Page<OrderDetlPakin> page);
- OrderDetlPakin selectItem(Long orderId, String matnr, String batch);
+ 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);
+ 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);
+ 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, 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, 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, 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 +42,6 @@
* @param workQty
* @return
*/
- boolean increaseWorkQty(Long orderId, String matnr, String batch, 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);
}
--
Gitblit v1.9.1