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

解决库存状态统计的bug

Browse Source
This commit is contained in:
季圣华
2020-02-19 17:11:51 +08:00
parent d23f1f4117
commit e1e133d9fd
5 changed files with 6 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -298,8 +298,10 @@ public class DepotItemController {
item.put("thisSum", thisSum);
for(MaterialExtend me:meList) {
if(me.getMaterialId().longValue() == diEx.getMId().longValue()) {
item.put("UnitPrice", me.getPurchaseDecimal());
item.put("thisAllPrice", thisSum.multiply(me.getPurchaseDecimal()));
if(me.getPurchaseDecimal()!=null) {
item.put("UnitPrice", me.getPurchaseDecimal());
item.put("thisAllPrice", thisSum.multiply(me.getPurchaseDecimal()));
}
}
}
dataArray.add(item);

2
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
View File

@@ -117,8 +117,6 @@ public interface DepotHeadMapperEx {
List<DepotHead> getDepotHeadListByHandsPersonIds(@Param("handsPersonIds") String[] handsPersonIds);
List<DepotHead> getDepotHeadListByDepotIds(@Param("depotIds") String[] depotIds);
BigDecimal getBuyAndSaleStatistics(
@Param("type") String type,
@Param("subType") String subType,

15
src/main/java/com/jsh/erp/service/depot/DepotService.java
View File

@@ -238,21 +238,6 @@ public class DepotService {
}
String [] idArray=ids.split(",");
/**
* 校验单据主表 jsh_depothead
* */
List<DepotHead> depotHeadList=null;
try{
depotHeadList= depotHeadMapperEx.getDepotHeadListByDepotIds(idArray);
}catch(Exception e){
JshException.readFail(logger, e);
}
if(depotHeadList!=null&&depotHeadList.size()>0){
logger.error("异常码[{}],异常提示[{}],参数,DepotIds[{}]",
ExceptionConstants.DELETE_FORCE_CONFIRM_CODE,ExceptionConstants.DELETE_FORCE_CONFIRM_MSG,ids);
throw new BusinessRunTimeException(ExceptionConstants.DELETE_FORCE_CONFIRM_CODE,
ExceptionConstants.DELETE_FORCE_CONFIRM_MSG);
}
/**
* 校验单据子表 jsh_depotitem
* */