From 8b52cb78c70877c9d8689bfcdb49461995cf939a Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 16 六月 2022 15:21:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

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

diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index b5146b2..b60ab2c 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -19,8 +19,8 @@
 
     Integer getStockOutPageCount(Map<String, Object> map);
 
-    @Update("update asr_loc_detl set qty=#{qty}, modi_time = getDate() where loc_no = #{locNo} and mat_no = #{matNo}")
-    int updateAnfme(Double qty, String locNo, String matNo);
+    @Update("update asr_loc_detl set qty=#{qty}, modi_time = getDate(),all_weight=#{weight},all_qty=#{allQty} where loc_no = #{locNo} and mat_no = #{matNo}")
+    int updateAnfme(Double qty, String locNo, String matNo,Double weight,Double allQty);
 
     @Update("update asr_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo}")
     int updateLocNo(String newLocNo, String oldLocNo);
@@ -37,7 +37,7 @@
 
     Integer getStockStatisCount(Map<String, Object> condition);
 
-    List<LocDetl> getStockStatisExcel();
+    List<LocDetl> getStockStatisExcel(LocDetl locDetl);
 
     /**
      * 搴撳瓨涓婃姤ERP鏃讹紝鏍规嵁鐗╂枡姹囨�绘煡璇㈠簱瀛樻�婚噺

--
Gitblit v1.9.1