From 01824c5104590b96a3040faa317969bcd812bcca Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 21 九月 2024 08:17:04 +0800
Subject: [PATCH] Merge branch 'xgmFlasrs' into xgmFlasrs2 hebing
---
src/main/java/com/zy/asrs/service/OrderDetlService.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 7becdf2..ddee929 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.common.model.LocDto;
import java.util.List;
@@ -12,27 +15,43 @@
Page<OrderDetl> getPakoutPage(Page<OrderDetl> page);
- OrderDetl selectItem(Long orderId, String matnr, String batch);
-
- OrderDetl selectItem(String orderNo, String matnr, String batch);
+// OrderDetl selectItem(Long orderId, String matnr, String batch,Double qty);
+//
+// OrderDetl selectItem(String orderNo, String matnr, String batch,Double qty);
+//
+// OrderDetl selectQtyItem(String orderNo, String matnr, String batch, Double qty);
OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch);
boolean increase(Long orderId, String matnr, String batch, Double qty);
- boolean decrease(String orderNo, String matnr, String batch, Double qty);
+ //boolean decrease(String orderNo, String matnr, String batch, Double qty);
+
+ boolean decrease(WrkDetl wrkDetl, Double qty);
+
+ boolean decrease(WaitPakin waitPakin, Double qty);
boolean modifyStatus(Long orderId, Integer status);
boolean addToLogTable(OrderDetl orderDetl);
+ //boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty);
+
+ boolean increaseQtyByOrderNo(String orderNo, WrkDetl wrkDetl, Double qty);
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
- * @param orderId
- * @param matnr
- * @param batch
+ *
+ * @param orderDetl
* @param workQty
* @return
*/
- boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
+ boolean increaseWorkQty(OrderDetl orderDetl, Double workQty);
+
+ List<OrderDetl> selectItem(String orderNo);
+
+ OrderDetl selectItem(WaitPakin waitPakin);
+
+ OrderDetl selectItem(LocDto locDto);
+
+ OrderDetl selectItem(WrkDetl wrkDetl);
}
--
Gitblit v1.9.1