From c8daee5975e5a6f5c844e1fceb65a3a682253c0e Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 06 三月 2024 11:51:23 +0800
Subject: [PATCH] #四项库拣料回库时合并wrkdetl到locdetl

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

diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index f55c61a..4aa30a4 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -13,9 +13,19 @@
 @Repository
 public interface OrderDetlMapper extends BaseMapper<OrderDetl> {
 
-    OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);
+    /*
+    濡傛灉batch銆乧socode銆乮socode涓虹┖锛屽垯鏌ヨ缁撴灉涓璪atch銆乧socode銆乮socode鐨勫�间负绌�
+     */
+    OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("csocode")String csocode, @Param("isocode")String isocode);
 
-    OrderDetl selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);
+    /*
+    濡傛灉batch銆乧socode銆乮socode涓虹┖锛屽垯鏌ヨ缁撴灉涓笉鑰冭檻batch銆乧socode銆乮socode鐨勫��
+     */
+    OrderDetl selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("csocode")String csocode, @Param("isocode")String isocode);
+
+    OrderDetl selectItemNoneOfBatch(@Param("orderNo")String orderNo, @Param("matnr")String matnr);
+
+    OrderDetl selectItemOfBatch(@Param("matnr")String matnr, @Param("batch")String batch);
 
     List<OrderDetl> selectWorkingDetls(Long orderId);
 
@@ -23,12 +33,16 @@
 
     Integer getPakoutPageCount(Map<String, Object> map);
 
-    int increaseAnfme(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+    int increaseAnfme(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty, @Param("csocode")String csocode, @Param("isocode")String isocode);
 
-    int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+    int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty, @Param("csocode")String csocode, @Param("isocode")String isocode);
 
-    int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+    int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty, @Param("csocode")String csocode, @Param("isocode")String isocode);
 
     int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
 
+    List<OrderDetl> selectRemainder(@Param("orderId") Long orderId);
+
+    List<OrderDetl> selectByMatnr(@Param("matnr") String matnr);
+
 }

--
Gitblit v1.9.1