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

修改查询库存数量的方法

Browse Source
This commit is contained in:
qiankunpingtai
2019-06-11 14:44:18 +08:00
parent 99d856111e
commit 5f9e2055e6
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,5 +176,5 @@ public interface DepotItemMapperEx {
int findStockWarningCountTotal( @Param("pid") Integer pid); int findStockWarningCountTotal( @Param("pid") Integer pid);
BigDecimal getCurrentRepByMaterialIdAndDepotId(@Param("materialId")Long materialId,@Param("depotId") Long depotId); BigDecimal getCurrentRepByMaterialIdAndDepotId(@Param("materialId") Long materialId, @Param("depotId") Long depotId,@Param("tenantId")Long tenantId);
} }

13
src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -30,6 +30,7 @@ import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
@Service @Service
public class DepotItemService { public class DepotItemService {
@@ -819,8 +820,18 @@ public class DepotItemService {
*/ */
public BigDecimal getCurrentRepByMaterialIdAndDepotId(Long materialId,Long depotId) { public BigDecimal getCurrentRepByMaterialIdAndDepotId(Long materialId,Long depotId) {
BigDecimal result = BigDecimal.ZERO; BigDecimal result = BigDecimal.ZERO;
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
Long tenantId=null;
Object tenantIdO = request.getSession().getAttribute("tenantId");
if(tenantIdO!=null){
//多租户模式，租户id从当前用户获取
tenantId=Long.valueOf(tenantId.toString());
} else {
//无租户模式，租户id为-1
tenantId=Long.valueOf(-1);
}
try{ try{
result =depotItemMapperEx.getCurrentRepByMaterialIdAndDepotId(materialId,depotId); result =depotItemMapperEx.getCurrentRepByMaterialIdAndDepotId(materialId,depotId,tenantId);
}catch(Exception e){ }catch(Exception e){
logger.error("异常码[{}],异常提示[{}],异常[{}]", logger.error("异常码[{}],异常提示[{}],异常[{}]",
ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e); ExceptionConstants.DATA_READ_FAIL_CODE,ExceptionConstants.DATA_READ_FAIL_MSG,e);

2
src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -618,6 +618,8 @@
jsh_depothead dh,jsh_depotitem di jsh_depothead dh,jsh_depotitem di
where 1=1 where 1=1
and dh.id=di.HeaderId and dh.id=di.HeaderId
and dh.tenant_id=#{tenantId}
and di.tenant_id=#{tenantId}
and di.MaterialId=#{materialId} and di.MaterialId=#{materialId}
and ifnull(dh.delete_Flag,'0') !='1' and ifnull(dh.delete_Flag,'0') !='1'
and ifnull(di.delete_Flag,'0') !='1') as curep and ifnull(di.delete_Flag,'0') !='1') as curep