库存查询,查数据库

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -2,7 +2,6 @@ package com.neotel.smfcore.core.kanban.rest;
 
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.google.common.base.Strings;
 import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
@@ -23,19 +22,15 @@ import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.service.manager.impl.DataLogManagerImpl;
 import com.neotel.smfcore.core.system.service.manager.impl.DataLogManagerImpl;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.service.po.DataLog;
-import com.neotel.smfcore.core.system.service.po.Humiture;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.security.annotation.AnonymousPutMapping;
 import com.neotel.smfcore.security.annotation.AnonymousPutMapping;
 import com.neotel.smfcore.security.service.manager.IGroupManager;
 import com.neotel.smfcore.security.service.manager.IGroupManager;
-import com.neotel.smfcore.security.service.manager.impl.GroupManagerImpl;
 import com.neotel.smfcore.security.service.manager.impl.UserManagerImpl;
 import com.neotel.smfcore.security.service.manager.impl.UserManagerImpl;
 import com.neotel.smfcore.security.service.po.Group;
 import com.neotel.smfcore.security.service.po.Group;
 import com.neotel.smfcore.security.service.po.User;
 import com.neotel.smfcore.security.service.po.User;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import javafx.concurrent.Task;
-import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +38,6 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -6,7 +6,6 @@ import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.Constants;
-import com.neotel.smfcore.common.utils.JsonUtil;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.api.SmfApi;
 import com.neotel.smfcore.core.api.SmfApi;
@@ -35,14 +34,12 @@ import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.custom.lizhen.LizhenApi;
 import com.neotel.smfcore.custom.lizhen.LizhenApi;
 import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
 import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
-import com.sun.org.apache.regexp.internal.RE;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
-import springfox.documentation.spring.web.json.Json;
 
 
 import java.util.*;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;

src/main/java/com/neotel/smfcore/core/storage/rest/MaterialController.java

@@ -404,4 +404,22 @@ public class MaterialController {
         liteOrderCache.addOrderToMap(liteOrder);
         liteOrderCache.addOrderToMap(liteOrder);
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
+
+    @ApiOperation("查找所有库存")
+    @RequestMapping("/getAllInventory")
+    @AnonymousAccess
+    public Map<String, Integer> getAllInventory() {
+        Map<String, Integer> resultMap = new HashMap<>();
+        List<StoragePos> storagePosList = storagePosManager.findNotEmpty();
+        for (StoragePos pos : storagePosList) {
+            Barcode barcode = pos.getBarcode();
+            if (barcode != null){
+                Integer i = resultMap.getOrDefault(barcode.getPartNumber(), 0);
+                i = i + 1;
+                resultMap.put(barcode.getPartNumber(),i);
+            }
+        }
+        return resultMap;
+    }
+
 }
 }

src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/util/StationCacheUtil.java

@@ -36,7 +36,7 @@ public class StationCacheUtil {
         StationCacheUtil.updateStation(station);
         StationCacheUtil.updateStation(station);
     }
     }
 
 
-    @PostConstruct
+    //@PostConstruct
     public void init() {
     public void init() {
         log.info("开始工位缓存信息");
         log.info("开始工位缓存信息");
         for (int i = 1; i <= 5; i++) {
         for (int i = 1; i <= 5; i++) {

src/main/java/com/neotel/smfcore/custom/lizhen/setting/controller/ExpiredSettingController.java

@@ -3,11 +3,6 @@ package com.neotel.smfcore.custom.lizhen.setting.controller;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.event.AnalysisEventListener;
-import com.alibaba.excel.read.builder.ExcelReaderBuilder;
-import com.alibaba.excel.read.metadata.ReadSheet;
-import com.alibaba.excel.support.ExcelTypeEnum;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.base.IExcelDownLoad;
 import com.neotel.smfcore.common.base.IExcelDownLoad;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.PageData;
@@ -19,14 +14,11 @@ import com.neotel.smfcore.common.utils.QueryHelp;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.custom.lizhen.setting.bean.ExpiredSetting;
 import com.neotel.smfcore.custom.lizhen.setting.bean.ExpiredSetting;
 import com.neotel.smfcore.custom.lizhen.setting.bean.query.ExpiredSettingQueryCriteria;
 import com.neotel.smfcore.custom.lizhen.setting.bean.query.ExpiredSettingQueryCriteria;
-import com.neotel.smfcore.custom.lizhen.setting.excel.ExpiredSettingInfo;
 import com.neotel.smfcore.custom.lizhen.setting.service.manager.ExpiredSettingManager;
 import com.neotel.smfcore.custom.lizhen.setting.service.manager.ExpiredSettingManager;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import javafx.util.StringConverter;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FileUtils;
-import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -36,7 +28,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.*;
 import java.util.*;