From 56678dd52e0e25afa36612f1be4a1d3ef0f4a82c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 20 十二月 2024 13:39:39 +0800
Subject: [PATCH] #明细统计总计修改可查看当前查询物料总计

---
 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java            |    2 +-
 src/main/java/com/zy/asrs/service/LocDetlService.java          |    2 +-
 src/main/java/com/zy/asrs/controller/LocDetlController.java    |   19 ++++++++++++++++++-
 src/main/webapp/static/js/locDetlStatis/locDetlStatis.js       |   13 +++++++++++++
 src/main/resources/mapper/LocDetlMapper.xml                    |    2 +-
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |    4 ++--
 6 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 58f2e66..655e6f1 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -299,7 +299,24 @@
      */
     @RequestMapping("/locDetl/count")
     public R getAllCount(){
-        Integer sum = locDetlService.sum();
+        Double sum = locDetlService.sum();
+        return R.ok(sum);
+    }
+
+    /**
+     * 鑾峰彇搴撳瓨鎬绘暟
+     * @return
+     */
+    @RequestMapping("/locDetl/matnr/count")
+    public R getCount(@RequestBody Map<String, String> param){
+        String matnr = param.get("matnr");
+        Double sum = 0.0;
+        if (Cools.isEmpty(matnr)){
+            sum = locDetlService.sum();
+        }else {
+            sum = locDetlService.getSumAnfme(matnr);
+        }
+
         return R.ok(sum);
     }
 
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 2c002a8..2b6cc26 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -66,7 +66,7 @@
     List<StockVo> queryStockTotal();
 
 
-    Integer sum();
+    Double sum();
 
     List<LocDetl> unreason();
 
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 830053d..47cdf55 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -61,7 +61,7 @@
     List<StockVo> queryStockTotal();
 
 
-    Integer sum();
+    Double sum();
 
     List<LocDetl> unreason();
 
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 941de5a..f1d3231 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -114,11 +114,11 @@
 
     /**
      * 鑾峰彇搴撳瓨鎬绘暟
+     *
      * @return
      */
     @Override
-    public Integer sum() {
-
+    public Double sum() {
         return this.baseMapper.sum();
     }
 
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 83d9663..7eb27ab 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -314,7 +314,7 @@
         where 1=1
         group by matnr,batch
     </select>
-    <select id="sum" resultType="java.lang.Integer">
+    <select id="sum" resultType="java.lang.Double">
         SELECT SUM(anfme) FROM asr_loc_detl
     </select>
     <select id="unreason" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index fd1da33..ae2639a 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -235,6 +235,19 @@
             limit(child);
         }
     });
+    /**
+     * 鏄剧ず搴撳瓨鎬绘暟閲�
+     */
+    $.ajax({
+        url: baseUrl+"/locDetl/matnr/count",
+        headers: {'token': localStorage.getItem('token')},
+        contentType:'application/json;charset=UTF-8',
+        method: 'POST',
+        data: JSON.stringify(searchData),
+        success: function (res) {
+            $("#countNum").text(res.data + '涓�');
+        }
+    });
 }
 
 function detailScreen(index) {

--
Gitblit v1.9.1