From 3c1fb80c66e8a5bbcc996dedc897734699656f01 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期一, 11 八月 2025 18:47:29 +0800
Subject: [PATCH] 完善erp对接

---
 src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
index 1f566fe..232034d 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -90,8 +90,8 @@
     }
 
     @Override
-    public List<ManLocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos) {
-        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos);
+    public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
+        return this.baseMapper.queryStock(matnr, batch, orderNo, locNos,supp,temp1,temp2);
     }
 
     @Override
@@ -110,7 +110,7 @@
      * @return
      */
     @Override
-    public Integer sum() {
+    public Double sum() {
 
         return this.baseMapper.sum();
     }
@@ -172,10 +172,13 @@
             manLocDetl.setUnit(mat.getUnit());
             manLocDetl.setBarcode(mat.getBarcode());
             manLocDetl.setPrice(mat.getPrice());
+            manLocDetl.setDanger(locDetlAdjust.getDanger());
             SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme());
             this.baseMapper.insert(manLocDetl);
         }
     }
+
+
 
     @Override
     public Page<ManLocDetl> selectAllPage(Page<ManLocDetl> param) {
@@ -186,5 +189,8 @@
         return param;
     }
 
-
+    @Override
+    public List<ManLocDetl> getStockStatisExcel() {
+        return this.baseMapper.getStockStatisExcel();
+    }
 }

--
Gitblit v1.9.1