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

解决bug：批次商品进行销售出库的时候，数量超出库存确出库了，而且没开负库存

Browse Source
This commit is contained in:
jishenghua
2024-05-15 00:53:31 +08:00
parent 08a69b82d4
commit 8950be4c6c
1 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -624,15 +624,21 @@ public class DepotItemService {
} }
//出库时判断库存是否充足 //出库时判断库存是否充足
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())){ if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())){
String stockMsg = material.getName() + "-" + barCode;
BigDecimal stock = getCurrentStockByParam(depotItem.getDepotId(),depotItem.getMaterialId()); BigDecimal stock = getCurrentStockByParam(depotItem.getDepotId(),depotItem.getMaterialId());
if(StringUtil.isNotEmpty(depotItem.getSku())) { if(StringUtil.isNotEmpty(depotItem.getSku())) {
//对于sku商品要换个方式计算库存 //对于sku商品要换个方式计算库存
stock = getSkuStockByParam(depotItem.getDepotId(),depotItem.getMaterialExtendId(),null,null); stock = getSkuStockByParam(depotItem.getDepotId(),depotItem.getMaterialExtendId(),null,null);
} }
if(StringUtil.isNotEmpty(depotItem.getBatchNumber())) {
//对于批次商品要换个方式计算库存
stock = getOneBatchNumberStock(depotItem.getDepotId(), barCode, depotItem.getBatchNumber());
stockMsg += "-批号" + depotItem.getBatchNumber();
}
BigDecimal thisBasicNumber = depotItem.getBasicNumber()==null?BigDecimal.ZERO:depotItem.getBasicNumber(); BigDecimal thisBasicNumber = depotItem.getBasicNumber()==null?BigDecimal.ZERO:depotItem.getBasicNumber();
if(!systemConfigService.getMinusStockFlag() && stock.compareTo(thisBasicNumber)<0){ if(!systemConfigService.getMinusStockFlag() && stock.compareTo(thisBasicNumber)<0){
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE, throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE,
String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG, material.getName() + "-" + barCode)); String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG, stockMsg));
} }
//出库时处理序列号 //出库时处理序列号
if(!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())) { if(!BusinessConstants.SUB_TYPE_TRANSFER.equals(depotHead.getSubType())) {
@@ -1170,6 +1176,34 @@ public class DepotItemService {
return reslist; return reslist;
} }
/**
* 查询某个批号的商品库存
* @param depotId
* @param barCode
* @param batchNumber
* @return
* @throws Exception
*/
public BigDecimal getOneBatchNumberStock(Long depotId, String barCode, String batchNumber) throws Exception {
BigDecimal totalNum = BigDecimal.ZERO;
Boolean forceFlag = systemConfigService.getForceApprovalFlag();
Boolean inOutManageFlag = systemConfigService.getInOutManageFlag();
List<DepotItemVoBatchNumberList> list = depotItemMapperEx.getBatchNumberList(null, null,
depotId, barCode, batchNumber, forceFlag, inOutManageFlag);
if(list!=null && list.size()>0) {
DepotItemVoBatchNumberList bn = list.get(0);
totalNum = bn.getTotalNum();
if(bn.getTotalNum()!=null && bn.getTotalNum().compareTo(BigDecimal.ZERO)>0) {
if(bn.getUnitId()!=null) {
Unit unit = unitService.getUnit(bn.getUnitId());
String commodityUnit = bn.getCommodityUnit();
totalNum = unitService.parseStockByUnit(bn.getTotalNum(), unit, commodityUnit);
}
}
}
return totalNum;
}
public Long getCountByMaterialAndDepot(Long mId, Long depotId) { public Long getCountByMaterialAndDepot(Long mId, Long depotId) {
return depotItemMapperEx.getCountByMaterialAndDepot(mId, depotId); return depotItemMapperEx.getCountByMaterialAndDepot(mId, depotId);
} }