From 3485effe3f65dbfdeaf4c3c1efca3d9fa6cd4d94 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 01 三月 2024 13:46:18 +0800
Subject: [PATCH] 修改库存明细按车间分组统计

---
 src/main/webapp/static/js/locDetlStatis/locDetlStatis.js |    1 +
 src/main/java/com/zy/asrs/mapper/PlaMapper.java          |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/PlaMapper.java b/src/main/java/com/zy/asrs/mapper/PlaMapper.java
index 27e7df2..eb64e27 100644
--- a/src/main/java/com/zy/asrs/mapper/PlaMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/PlaMapper.java
@@ -14,10 +14,10 @@
 @Repository
 public interface PlaMapper extends BaseMapper<Pla> {
 
-    @Select("select brand, matnr, sum(weight_anfme) as weight from asr_pla_detl where brand = #{brand} GROUP BY brand,matnr ORDER BY weight")
+    @Select("select brand, matnr,workshop, sum(weight_anfme) as weight from asr_pla_detl where brand = #{brand} GROUP BY brand,matnr,workshop ORDER BY matnr,workshop")
     List<Pla> getStockStatisAllByBrand(@Param("brand") String brand);
 
-    @Select("select brand, matnr, sum(weight_anfme) as weight from asr_pla_detl GROUP BY brand,matnr ORDER BY weight")
+    @Select("select brand, matnr,workshop , sum(weight_anfme) as weight from asr_pla_detl GROUP BY brand,matnr,workshop ORDER BY matnr,workshop desc")
     List<Pla> getStockStatisAll();
 
 
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index 0239451..33fae30 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -3,6 +3,7 @@
     var cols = [
         {field: 'brand', align: 'center',title: '鐗屽彿', style: 'font-weight: bold'},
         {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', style: 'font-weight: bold'},
+        {field: 'workshop', align: 'center',title: '杞﹂棿', style: 'font-weight: bold'},
         {field: 'weight', align: 'center',title: '搴撳瓨閲嶉噺锛圞G锛�', style: 'font-weight: bold'}
     ];
     // arrRemove(detlCols, "field", "anfme")

--
Gitblit v1.9.1