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

优化供应商期初期末的方法

Browse Source
This commit is contained in:
季圣华
2020-06-30 23:28:30 +08:00
parent 577abbe953
commit 0f1f5600df
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -350,7 +350,7 @@ public class DepotHeadService {
modeName = "DiscountLastMoney"; modeName = "DiscountLastMoney";
allOtherMoney = depotHeadMapperEx.findAllOtherMoney(supplierId, type, subType, endTime); allOtherMoney = depotHeadMapperEx.findAllOtherMoney(supplierId, type, subType, endTime);
} }
BigDecimal result = null; BigDecimal result = BigDecimal.ZERO;
try{ try{
result =depotHeadMapperEx.findAllMoney(supplierId, type, subType, modeName, endTime); result =depotHeadMapperEx.findAllMoney(supplierId, type, subType, modeName, endTime);
}catch(Exception e){ }catch(Exception e){

4
src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -301,13 +301,13 @@
</select> </select>
<select id="findAllMoney" resultType="java.math.BigDecimal"> <select id="findAllMoney" resultType="java.math.BigDecimal">
select sum(${modeName}) as allMoney from jsh_depothead where Type='${type}' and SubType = '${subType}' select ifnull(sum(${modeName}),0) as allMoney from jsh_depothead where Type='${type}' and SubType = '${subType}'
and OrganId =${supplierId} and OperTime &lt;='${endTime}' and OrganId =${supplierId} and OperTime &lt;='${endTime}'
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_Flag,'0') !='1'
</select> </select>
<select id="findAllOtherMoney" resultType="java.math.BigDecimal"> <select id="findAllOtherMoney" resultType="java.math.BigDecimal">
select sum(OtherMoney) as allOtherMoney from jsh_depothead where Type='${type}' and SubType = '${subType}' select ifnull(sum(OtherMoney),0) as allOtherMoney from jsh_depothead where Type='${type}' and SubType = '${subType}'
and OrganId =${supplierId} and OperTime &lt;='${endTime}' and OrganId =${supplierId} and OperTime &lt;='${endTime}'
and ifnull(delete_Flag,'0') !='1' and ifnull(delete_Flag,'0') !='1'
</select> </select>