库存管理 库存记录

This commit is contained in:
2024-06-22 10:38:51 +08:00
parent 2a52961024
commit 1675e5d45b
9 changed files with 74 additions and 16 deletions

View File

@@ -32,13 +32,13 @@ public class StockServiceImpl implements StockService {
@Override
public Page queryAll(StockQueryDto criteria, Integer page, Integer size) {
Pageable pageable = PageRequest.of(page, size);
return tbProductSkuRepository.searchProStock(criteria.getShopId(), criteria.getName(), criteria.getIsStock(), pageable);
return tbProductSkuRepository.searchProStock(criteria.getShopId(), criteria.getName(), criteria.getIsStock(),criteria.getNum(), pageable);
}
@Override
public void download(StockQueryDto criteria, HttpServletResponse response) throws IOException {
List<Map<String, Object>> list = new ArrayList<>();
List<StockVo> stockVos = tbProductSkuRepository.searchProStock(criteria.getShopId(), criteria.getName(), criteria.getIsStock());
List<StockVo> stockVos = tbProductSkuRepository.searchProStock(criteria.getShopId(), criteria.getName(), criteria.getIsStock(),criteria.getNum());
for (StockVo all : stockVos) {
Map<String, Object> map = new LinkedHashMap<>();
map.put("id(如需导入,该值不可变)", all.getId());

View File

@@ -65,8 +65,11 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
Page<TbProductStockDetail> page = tbProductStockDetailRepository.findAll((root, criteriaQuery, criteriaBuilder)
-> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
return PageUtil.toPage(page.map(tbProductStockDetailMapper::toDto));
Page<TbProductStockDetailDto> map = page.map(tbProductStockDetailMapper::toDto);
for (TbProductStockDetailDto tbProductStockDetailDto : map.getContent()) {
tbProductStockDetailDto.setTypes();
}
return PageUtil.toPage(map);
}

View File

@@ -163,7 +163,6 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe
stockOperate.setStatus("normal");
stockOperate.setPurveyorId(resources.getPurveyorId());
stockOperate.setPurveyorName(resources.getPurveyorName());
TbProductStockOperate saveStockOperate = tbProductStockOperateRepository.save(stockOperate);
if (!resources.getIsImport().equals("true")) {
//供应商退货 reject
//供应商入库 purveyor
@@ -197,10 +196,14 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe
purveyorRepository.upLastTransactAt(resources.getPurveyorId());
}
}
TbProductStockOperate saveStockOperate = tbProductStockOperateRepository.save(stockOperate);
Map<Integer, Double> idStockMap = new HashMap<>();
for (Object date : resources.getList()) {
//商品详情
ProductListDto productListDto = JSONObject.parseObject(JSONObject.toJSONString(date), ProductListDto.class);
if (productListDto.getNumber().equals(0)) {
continue;
}
TbProductSku tbProductSku = tbProductSkuRepository.findById(productListDto.getId()).orElseGet(TbProductSku::new);
TbProductStockDetail productStockDetail = new TbProductStockDetail();
productStockDetail.setBatchNumber(resources.getBatchNumber());
@@ -215,6 +218,7 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe
productStockDetail.setShopId(resources.getShopId());
productStockDetail.setSkuId(productListDto.getId().toString());
productStockDetail.setSourcePath("NORMAL");
productStockDetail.setStockSnap(productListDto.getSpecSnap());
productListDto.setNumber(productListDto.getNumber() != null ? productListDto.getNumber() : 0);
switch (resources.getType()) {
case "sale":
@@ -253,6 +257,8 @@ public class TbProductStockOperateServiceImpl implements TbProductStockOperateSe
idStockMap.put(productListDto.getId(), productStockDetail.getStockNumber());
}
redisUtils.redisUp(2, resources.getShopId(), idStockMap);
}else {
tbProductStockOperateRepository.save(stockOperate);
}
return resources;
}