blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
4 天以前 ac225bd66eb7c21b5af1d8533dc59376ea53da6c 
 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java


@@ -1,23 +1,14 @@


package com.example.erp.service.mm;




import cn.hutool.core.util.StrUtil;


import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.JSONArray;


import com.alibaba.fastjson.JSONObject;


import com.baomidou.dynamic.datasource.annotation.DS;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.example.erp.common.Constants;


import com.example.erp.dto.mm.FinishedOperateLogDTO;


import com.example.erp.dto.mm.MaterialLogDTO;


import com.example.erp.entity.mm.*;


import com.example.erp.entity.pp.*;


import com.example.erp.entity.sd.Delivery;


import com.example.erp.entity.sd.DeliveryDetail;


import com.example.erp.entity.sd.OrderDetail;


import com.example.erp.entity.sd.OrderProcessDetail;


import com.example.erp.entity.userInfo.Log;


import com.example.erp.entity.userInfo.SysError;


import com.example.erp.exception.ServiceException;


import com.example.erp.mapper.mm.BasicWarehouseTypeMapper;


import com.example.erp.mapper.mm.MaterialInventoryMapper;


import com.example.erp.mapper.mm.MaterialLogMapper;


@@ -29,7 +20,6 @@


import org.springframework.transaction.annotation.Transactional;


import org.springframework.transaction.interceptor.TransactionAspectSupport;




import java.time.LocalDateTime;


import java.util.List;


import java.util.ArrayList;




@@ -37,6 +27,9 @@


import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.util.*;


import java.util.concurrent.ExecutorService;


import java.util.concurrent.Executors;


import java.util.concurrent.atomic.AtomicReference;


import java.util.stream.Collectors;




@Service


@@ -1178,7 +1171,6 @@


                materialInventoryMapper.insertMaterialOutbound(materialOutbound, oddNumber);


                log.setFunction("saveMaterialOutbound新增:"+oddNumber);


            }




            //获取对象集合循环进行新增修改




            if (!materialOutboundDetailList.isEmpty()) {


@@ -1237,10 +1229,6 @@


                        TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);


                        return "false1";


                    }










                }




            }


@@ -1315,4 +1303,30 @@




    }




    public Object appGetStockList() {


        //ExecutorService executor = Executors.newFixedThreadPool(2);


        List<MaterialInventory> materialInventoryList = materialInventoryMapper.selectGetStockList();


        //executor.shutdown();




        Map<String, Object> totalSum  = new HashMap<>();




        Integer inventoryQuantity = 0;


        Integer availableQuantity = 0;


        Double totalArea = 0.00;


        for (MaterialInventory materialInventory : materialInventoryList) {


            inventoryQuantity += materialInventory.getInventoryQuantity();


            availableQuantity += materialInventory.getAvailableQuantity();


            totalArea += materialInventory.getTotalArea();


        }


        DecimalFormat df = new DecimalFormat("#.00");


        totalSum.put("inventoryQuantity",inventoryQuantity);


        totalSum.put("availableQuantity",availableQuantity);


        totalSum.put("totalArea", df.format(totalArea));






        Map<String, Object> map = new HashMap<>();


        map.put("glassStock", materialInventoryList);


        map.put("totalSum", totalSum);


        return map;


    }


}