purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决excel导入商品的库存遇到的bug（0库存不重置）

Browse Source
This commit is contained in:
jishenghua
2024-12-08 21:55:40 +08:00
parent 0c09387a07
commit a181203ef8
1 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java
View File

@@ -801,8 +801,11 @@ public class MaterialService {
for(Depot depot: depotList){ for(Depot depot: depotList){
Long depotId = depot.getId(); Long depotId = depot.getId();
String materialDepotKey = mId + "_" + depotId; String materialDepotKey = mId + "_" + depotId;
//获取初始库存
BigDecimal initStock = getInitStock(mId, depotId);
//excel里面的当前库存
BigDecimal stock = stockMap.get(depot.getId()); BigDecimal stock = stockMap.get(depot.getId());
//新增初始库存 //新增或更新初始库存
if(stock!=null && stock.compareTo(BigDecimal.ZERO)!=0) { if(stock!=null && stock.compareTo(BigDecimal.ZERO)!=0) {
String basicStr = materialExObj.getString("basic"); String basicStr = materialExObj.getString("basic");
MaterialExtend materialExtend = JSONObject.parseObject(basicStr, MaterialExtend.class); MaterialExtend materialExtend = JSONObject.parseObject(basicStr, MaterialExtend.class);
@@ -810,46 +813,29 @@ public class MaterialService {
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SKU_BEGIN_STOCK_FAILED_CODE, throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SKU_BEGIN_STOCK_FAILED_CODE,
String.format(ExceptionConstants.MATERIAL_SKU_BEGIN_STOCK_FAILED_MSG, materialExtend.getBarCode())); String.format(ExceptionConstants.MATERIAL_SKU_BEGIN_STOCK_FAILED_MSG, materialExtend.getBarCode()));
} }
if(materialDepotInitialMap.get(materialDepotKey)==null) { buildChangeInitialStock(deleteInitialStockMaterialIdList, insertInitialStockMaterialList, materialDepotInitialMap, mId, depotId, materialDepotKey, stock);
MaterialInitialStock materialInitialStock = new MaterialInitialStock(); } else {
materialInitialStock.setMaterialId(mId); if(initStock.compareTo(BigDecimal.ZERO)!=0) {
materialInitialStock.setDepotId(depotId); buildChangeInitialStock(deleteInitialStockMaterialIdList, insertInitialStockMaterialList, materialDepotInitialMap, mId, depotId, materialDepotKey, stock);
materialInitialStock.setNumber(stock);
insertInitialStockMaterialList.add(materialInitialStock);
deleteInitialStockMaterialIdList.add(mId);
materialDepotInitialMap.put(materialDepotKey, materialDepotKey);
} }
} }
//新增或更新当前库存 //新增或更新当前库存
Long billCount = depotItemService.getCountByMaterialAndDepot(mId, depotId); Long billCount = depotItemService.getCountByMaterialAndDepot(mId, depotId);
if(billCount == 0) { if(billCount == 0) {
if(stock!=null && stock.compareTo(BigDecimal.ZERO)!=0) { if(stock!=null && stock.compareTo(BigDecimal.ZERO)!=0) {
if(materialDepotCurrentMap.get(materialDepotKey)==null) { buildChangeCurrentStock(deleteCurrentStockMaterialIdList, insertCurrentStockMaterialList, materialDepotCurrentMap, mId, depotId, materialDepotKey, stock);
MaterialCurrentStock materialCurrentStock = new MaterialCurrentStock(); } else {
materialCurrentStock.setMaterialId(mId); if(initStock.compareTo(BigDecimal.ZERO)!=0) {
materialCurrentStock.setDepotId(depotId); buildChangeCurrentStock(deleteCurrentStockMaterialIdList, insertCurrentStockMaterialList, materialDepotCurrentMap, mId, depotId, materialDepotKey, stock);
materialCurrentStock.setCurrentNumber(stock);
insertCurrentStockMaterialList.add(materialCurrentStock);
deleteCurrentStockMaterialIdList.add(mId);
materialDepotCurrentMap.put(materialDepotKey, materialDepotKey);
} }
} }
} else { } else {
BigDecimal initStock = getInitStock(mId, depotId);
BigDecimal currentNumber = getCurrentStockByMaterialIdAndDepotId(mId, depotId); BigDecimal currentNumber = getCurrentStockByMaterialIdAndDepotId(mId, depotId);
//当前库存的更新：减去初始库存，再加上导入的新初始库存 //当前库存的更新：减去初始库存，再加上导入的新初始库存
if(currentNumber!=null && initStock!=null && stock!=null) { if(currentNumber!=null && initStock!=null && stock!=null) {
currentNumber = currentNumber.subtract(initStock).add(stock); currentNumber = currentNumber.subtract(initStock).add(stock);
} }
if(materialDepotCurrentMap.get(materialDepotKey)==null) { buildChangeCurrentStock(deleteCurrentStockMaterialIdList, insertCurrentStockMaterialList, materialDepotCurrentMap, mId, depotId, materialDepotKey, currentNumber);
MaterialCurrentStock materialCurrentStock = new MaterialCurrentStock();
materialCurrentStock.setMaterialId(mId);
materialCurrentStock.setDepotId(depotId);
materialCurrentStock.setCurrentNumber(currentNumber);
insertCurrentStockMaterialList.add(materialCurrentStock);
deleteCurrentStockMaterialIdList.add(mId);
materialDepotCurrentMap.put(materialDepotKey, materialDepotKey);
}
} }
} }
} }
@@ -880,6 +866,38 @@ public class MaterialService {
return info; return info;
} }
/**
* 构造初始库存的变化
*/
private void buildChangeInitialStock(List<Long> deleteInitialStockMaterialIdList, List<MaterialInitialStock> insertInitialStockMaterialList,
Map<String, String> materialDepotInitialMap, Long mId, Long depotId, String materialDepotKey, BigDecimal stock) {
if(materialDepotInitialMap.get(materialDepotKey)==null) {
MaterialInitialStock materialInitialStock = new MaterialInitialStock();
materialInitialStock.setMaterialId(mId);
materialInitialStock.setDepotId(depotId);
materialInitialStock.setNumber(stock);
insertInitialStockMaterialList.add(materialInitialStock);
deleteInitialStockMaterialIdList.add(mId);
materialDepotInitialMap.put(materialDepotKey, materialDepotKey);
}
}
/**
* 构造当前库存的变化
*/
private void buildChangeCurrentStock(List<Long> deleteCurrentStockMaterialIdList, List<MaterialCurrentStock> insertCurrentStockMaterialList,
Map<String, String> materialDepotCurrentMap, Long mId, Long depotId, String materialDepotKey, BigDecimal stock) {
if(materialDepotCurrentMap.get(materialDepotKey)==null) {
MaterialCurrentStock materialCurrentStock = new MaterialCurrentStock();
materialCurrentStock.setMaterialId(mId);
materialCurrentStock.setDepotId(depotId);
materialCurrentStock.setCurrentNumber(stock);
insertCurrentStockMaterialList.add(materialCurrentStock);
deleteCurrentStockMaterialIdList.add(mId);
materialDepotCurrentMap.put(materialDepotKey, materialDepotKey);
}
}
private Map<String, Long> parseDepotToMap(List<Depot> depotList) { private Map<String, Long> parseDepotToMap(List<Depot> depotList) {
Map<String, Long> map = new HashMap<>(); Map<String, Long> map = new HashMap<>();
for(Depot depot: depotList) { for(Depot depot: depotList) {