From 2ee70a38e4c832e3888b12d29ebf962456069cdb Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期三, 03 七月 2024 14:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs

---
 src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index cad5da0..8d8bbd6 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -31,5 +31,32 @@
 
     int addToLogTable(OrderDetl orderDetl);
 
-    int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double workQty);
+    int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+
+    int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty);
+
+    Integer checkAllDetlFinish(@Param("orderNo") String orderNo);
+
+    Integer sameOrderComb(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);
+
+    int increaseAnfme(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+
+    /**
+     * 鏍规嵁鍟嗗搧缂栫爜鍜屾壒鍙峰垎鍒煡璇㈠湪骞冲簱璇ョ墿鏂欏簱瀛�
+     * @param matnr 鍟嗗搧缂栧彿
+     * @param batch 鎵瑰彿
+     * @return 搴撳瓨鏁伴噺
+     */
+    Long selectCountToAsrByMatnr(@Param("matnr") String matnr,@Param("batch") String batch);
+
+    /**
+     * 鏍规嵁鍟嗗搧缂栫爜鍜屾壒鍙峰垎鍒煡璇㈠湪绔嬪簱璇ョ墿鏂欏簱瀛�
+     * @param matnr 鍟嗗搧缂栧彿
+     * @param batch 鎵瑰彿
+     * @return 搴撳瓨鏁伴噺
+     */
+    Long selectCountToManByMatnr(@Param("matnr") String matnr,@Param("batch") String batch);
+
+    int increaseWorkQtyByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("qty") Double qty);
+
 }

--
Gitblit v1.9.1