From 637e8436a33cbc4ea04d4fc68763debaba8412c4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 11 八月 2025 14:19:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms

---
 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index a764efc..13c7568 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -39,6 +39,11 @@
                     @Param("brand")String brand,@Param("standby1")String standby1,@Param("standby2")String standby2,
                     @Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3 );
 
+    int updateWeight(@Param("weight")Double weight, @Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch,
+                    @Param("brand")String brand,@Param("standby1")String standby1,@Param("standby2")String standby2,
+                    @Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3 );
+
+
     List<LocDetl> getStockOutPage(Map<String, Object> map);
 
     Integer getStockOutPageCount(Map<String, Object> map);
@@ -71,6 +76,9 @@
     // -------------------------------------------------
 
     List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
+    List<LocDetl> queryStockAll(@Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("matnr")String matnr, @Param("batch")String batch,
+                                @Param("brand")String brand,@Param("standby1")String standby1,@Param("standby2")String standby2,
+                                @Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3,@Param("cstateid") String cstateid);
 
     Double queryStockAnfme(String matnr, String batch);
 
@@ -79,6 +87,8 @@
 
     Integer sum();
 
+    Integer sum2();
+
     List<LocDetl> unreason();
 
     Double selectLocDetlSumQty(String locNo);

--
Gitblit v1.9.1