库存汇总根据物料及货主汇总数量

xqs
1 parent aa12a430
Showing 7 changed files with 184 additions and 37 deletions
src/main/java/com/huaheng/pc/inventory/InventoryMaterialSummary/controller/InventoryMaterialSummaryController.java
src/main/java/com/huaheng/pc/inventory/InventoryMaterialSummary/service/InventoryMaterialSummaryService.java
src/main/java/com/huaheng/pc/inventory/InventoryMaterialSummary/service/InventoryMaterialSummaryServiceImpl.java
src/main/resources/templates/inventory/inventoryMaterialSummary/inventoryMaterialSummary.html
src/test/java/com.huaheng.test/EncryptPassword.java
src/test/java/com.huaheng.test/User.java
src/test/java/com.huaheng.test/tasting.java
@@ -80,10 +80,9 @@ public class InventoryMaterialSummaryController extends BaseController {
                 .eq(StringUtils.isNotEmpty(inventoryMaterialSummary.getMaterialName()), InventoryMaterialSummary::getMaterialName, inventoryMaterialSummary.getMaterialName());
         //.orderByAsc(InventoryMaterialSummary::getMaterialCode);
  
-
         List<InventoryMaterialSummary> list = inventoryMaterialSummaryService.list(lambdaQueryWrapper);
         //筛选库存汇总数据的专用方法
-        List<InventoryMaterialSummary> details = inventoryMaterialSummaryService.inventoryMaterialSummarySelect(list);
+        List<InventoryMaterialSummary> details = inventoryMaterialSummaryService.duplicateRemoval(list);
         if (details == null) {
             details = Collections.emptyList();
         }
@@ -8,10 +8,13 @@ import java.util.List;
 public interface InventoryMaterialSummaryService extends IService<InventoryMaterialSummary> {
  
     /**
-     * 查询库存汇总数据的专用方法
+     * 根据物料码去重及累加数量
      * */
     List<InventoryMaterialSummary> inventoryMaterialSummarySelect(List<InventoryMaterialSummary> inventoryMaterialSummaryList);
  
-
+    /**
+     * 多条件去重及累加数量，货主，物料码
+     * */
+    List<InventoryMaterialSummary> duplicateRemoval(List<InventoryMaterialSummary> inventoryMaterialSummaryList);
  
 }
@@ -5,9 +5,9 @@ import com.huaheng.pc.inventory.InventoryMaterialSummary.domain.InventoryMateria
 import com.huaheng.pc.inventory.InventoryMaterialSummary.mapper.InventoryMaterialSummaryMapper;
 import org.springframework.stereotype.Service;
  
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
  
  
 @Service
@@ -19,31 +19,61 @@ public class InventoryMaterialSummaryServiceImpl extends ServiceImpl&lt;InventoryMa
  
  
     /**
-     * 筛选库存汇总数据的专用方法
+     * 根据物料码去重及累加数量
      * */
     @Override
     public List<InventoryMaterialSummary> inventoryMaterialSummarySelect(List<InventoryMaterialSummary> inventoryMaterialSummaryList) {
-
         /*以物料为条件把同物料数量全部相加，去重再展示*/
  
+        //单物料条件，
         HashMap<String, InventoryMaterialSummary> map = new HashMap<String, InventoryMaterialSummary>();
         for (InventoryMaterialSummary bean : inventoryMaterialSummaryList) {
-            //单物料条件，
-            //货主和物料条件（！！！）
+            //map.containsKey()方法是判断该key在map中是否有该key值存在。如果存在则返回true。如果不存在则返回false
             if (map.containsKey(bean.getMaterialCode())) {
                 bean.setQty(map.get(bean.getMaterialCode()).getQty().add(bean.getQty()));
             }
+            //根据物料编码去重，hashMap的put方法不允许相同的键
             map.put(bean.getMaterialCode(), bean);
         }
-//        inventorys.clear();//清空list
         List<InventoryMaterialSummary> inventoryList = new ArrayList<>();
         inventoryList.addAll(map.values());
  
         return inventoryList;
     }
  
-
-
+    /**
+    * 多条件去重
+     * 合并数量
+     * 多条件去重及累加数量，货主，物料码
+    * */
+    @Override
+    public List<InventoryMaterialSummary> duplicateRemoval(List<InventoryMaterialSummary> inventoryMaterialSummaryList){
+        /*********/
+        //先找货主和物料码相同的物料SKU相加得总数
+        for(InventoryMaterialSummary o:inventoryMaterialSummaryList){
+            BigDecimal numQty = BigDecimal.ZERO;
+            for (InventoryMaterialSummary t:inventoryMaterialSummaryList){
+                if(o.getCompanyCode().equals(t.getCompanyCode()) &&
+                        o.getMaterialCode().equals(t.getMaterialCode())){
+
+                    numQty = numQty.add(t.getQty());
+                    o.setQty(numQty);
+                }
+            }
+        }
+        /*此时，inventoryMaterialSummaryList内的全部QTY为货主和物料都相同的库存数量的总数，直接去重即可*/
+        //多条件去重
+        List<InventoryMaterialSummary> materialSummaryList = new ArrayList<>();
+        inventoryMaterialSummaryList.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(
+                        Comparator.comparing(
+                                inventoryMaterialSummary ->
+                                        inventoryMaterialSummary.getCompanyCode() + ";" + inventoryMaterialSummary.getMaterialCode()))),
+                                                ArrayList::new))
+                .forEach(list -> materialSummaryList.add(list));
+
+        return materialSummaryList;
+    }
  
  
  
@@ -28,6 +28,9 @@
                                name="createdEnd"/>
                     </li>
                     <li>
+                        货主：<input id="companyCode" type="text" name="companyCode" />
+                    </li>
+                    <li>
                     <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                     </li>
                 </ul>
@@ -85,13 +88,10 @@
                             title: '仓库 ',
                             visible: true
                         },
-                        /*{
-                            field: 'companyCode',
-                            title: '货主编码'
-                        },*/
                         {
-                            field: 'qty',
-                            title: '库存总数'
+                            field: 'companyCode',
+                            title: '货主编码',
+                            visible: true
                         },
                         {
                             field: 'materialCode',
@@ -102,6 +102,10 @@
                             title: '物料名称'
                         },
                         {
+                            field: 'qty',
+                            title: '库存总数'
+                        },
+                        {
                             field: 'materialSpec',
                             title: '物料规格'
                         },
-package com.huaheng.test;
-
-import com.huaheng.framework.shiro.service.PasswordService;
-
-import java.math.BigDecimal;
-
-public class EncryptPassword {
-
-    public static void main(String[] args) {
-//          PasswordService passwordService = new PasswordService();
-//          String psw = passwordService.encryptPassword("superAdmin", "admin123", "3d82fd");
-//          System.out.println(psw);
-        BigDecimal sum = new BigDecimal(575);
-        BigDecimal max = new BigDecimal(400);
-        System.out.println(sum.compareTo(max));
-    }
-}
+package com.huaheng.test;
+
+public class User {
+
+    public String name;
+
+    public Integer age;
+
+    public String sex;
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" +
+                "name='" + name + '\'' +
+                ", age=" + age +
+                ", sex='" + sex + '\'' +
+                '}';
+    }
+}
+package com.huaheng.test;
+
+
+import com.huaheng.pc.inventory.InventoryMaterialSummary.domain.InventoryMaterialSummary;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class tasting {
+
+
+    private static List<User> list = new ArrayList<User>();
+
+    public static void main(String[] args) {
+
+        User user0 = new User();
+        user0.setName("小强");
+        user0.setAge(11);
+        user0.setSex("男");
+        list.add(user0);
+
+        User user2 = new User();
+        user2.setName("小强");
+        user2.setAge(15);
+        user2.setSex("男");
+        list.add(user2);
+
+        User user3 = new User();
+        user3.setName("小强");
+        user3.setAge(23);
+        user3.setSex("男");
+        list.add(user3);
+
+        User user4 = new User();
+        user4.setName("小雨");
+        user4.setAge(24);
+        user4.setSex("女");
+        list.add(user4);
+
+        User user5 = new User();
+        user5.setName("小雨");
+        user5.setAge(24);
+        user5.setSex("女");
+        list.add(user5);
+
+        User user6 = new User();
+        user6.setName("小雨");
+        user6.setAge(15);
+        user6.setSex("女");
+        list.add(user6);
+        System.out.println("原始数据:" + list);
+
+        List<User> u = new ArrayList<>();
+
+        //先找货主和物料码相同的物料SKU相加得总数
+        for(User o:list){
+            int numQty = 0;
+            for (User t:list){
+                if(o.getName().equals(t.getName()) &&
+                        o.getSex().equals(t.getSex())){
+
+                     numQty = numQty + t.getAge();
+                    o.setAge(numQty);
+                }
+            }
+        }
+
+        //多条件去重
+        list.stream().collect(Collectors.collectingAndThen(
+                Collectors.toCollection(() -> new TreeSet<>(
+                        Comparator.comparing(user -> user.getSex() + ";" + user.getName()))), ArrayList::new))
+                .forEach(user -> u.add(user));
+
+        System.out.println("多条件去重后数据:" + u);
+
+
+    }
+
+
+
+
+
+}