|
|
|
@ -13,6 +13,7 @@ import com.zhehekeji.web.entity.Street;
|
|
|
|
import com.zhehekeji.web.mapper.CheckLogMapper;
|
|
|
|
import com.zhehekeji.web.mapper.CheckLogMapper;
|
|
|
|
import com.zhehekeji.web.mapper.StockLogMapper;
|
|
|
|
import com.zhehekeji.web.mapper.StockLogMapper;
|
|
|
|
import com.zhehekeji.web.mapper.StockMapper;
|
|
|
|
import com.zhehekeji.web.mapper.StockMapper;
|
|
|
|
|
|
|
|
import com.zhehekeji.web.mapper.StreetMapper;
|
|
|
|
import com.zhehekeji.web.pojo.category.PageSearch;
|
|
|
|
import com.zhehekeji.web.pojo.category.PageSearch;
|
|
|
|
import com.zhehekeji.web.pojo.stock.*;
|
|
|
|
import com.zhehekeji.web.pojo.stock.*;
|
|
|
|
import io.swagger.models.auth.In;
|
|
|
|
import io.swagger.models.auth.In;
|
|
|
|
@ -40,6 +41,8 @@ public class StockService {
|
|
|
|
private CheckLogMapper logMapper;
|
|
|
|
private CheckLogMapper logMapper;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private StockLogMapper stockLogMapper;
|
|
|
|
private StockLogMapper stockLogMapper;
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
private StreetMapper streetMapper;
|
|
|
|
|
|
|
|
|
|
|
|
public void importExcel(MultipartFile file) {
|
|
|
|
public void importExcel(MultipartFile file) {
|
|
|
|
log.info("import excel stock");
|
|
|
|
log.info("import excel stock");
|
|
|
|
@ -278,6 +281,37 @@ public class StockService {
|
|
|
|
return stockExportExcels;
|
|
|
|
return stockExportExcels;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public List<StockExportExcel> exportAllExcels() {
|
|
|
|
|
|
|
|
List<Stock> stocks = stockMapper.selectByMap(new HashMap<>());
|
|
|
|
|
|
|
|
List<Street> streets = streetMapper.selectByMap(new HashMap<>());
|
|
|
|
|
|
|
|
Map<String,List<String>> shevleMaps = new HashMap<>();
|
|
|
|
|
|
|
|
streets.forEach(street -> {
|
|
|
|
|
|
|
|
List<String> shelveIds = streetService.check(street);
|
|
|
|
|
|
|
|
shevleMaps.put(street.getName(),shelveIds);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
//Street street = streetService.streetById(streetId);
|
|
|
|
|
|
|
|
List<StockExportExcel> stockExportExcels = new ArrayList<>(stocks.size());
|
|
|
|
|
|
|
|
stocks.forEach(stock -> {
|
|
|
|
|
|
|
|
StockExportExcel stockExportExcel = new StockExportExcel();
|
|
|
|
|
|
|
|
stockExportExcel.setCode(stock.getTrayCode());
|
|
|
|
|
|
|
|
stockExportExcel.setLotnum(stock.getLotnum());
|
|
|
|
|
|
|
|
stockExportExcel.setColumn(stock.getColumn());
|
|
|
|
|
|
|
|
//stockExportExcel.setCount(stock.getCount());
|
|
|
|
|
|
|
|
stockExportExcel.setRow(stock.getRow());
|
|
|
|
|
|
|
|
shevleMaps.forEach((k,v)->{
|
|
|
|
|
|
|
|
if(v.contains(stock.getShelveId())){
|
|
|
|
|
|
|
|
stockExportExcel.setStreetName(k);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
stockExportExcel.setExportTime(stock.getExportTime());
|
|
|
|
|
|
|
|
stockExportExcel.setShelveId(stock.getShelveId());
|
|
|
|
|
|
|
|
stockExportExcel.setStatus(stock.getStatus());
|
|
|
|
|
|
|
|
stockExportExcels.add(stockExportExcel);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
return stockExportExcels;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 获取行列号,货架号对应的格子信息
|
|
|
|
* 获取行列号,货架号对应的格子信息
|
|
|
|
*
|
|
|
|
*
|
|
|
|
|