aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-03-19 10:48:07 +08:00
parent 5757aeb4cb
commit d0ecfd5db4
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -263,7 +263,7 @@ public class EmisBaseService {
} }
} }
else if("1".equals(newSettleType)){ else if("1".equals(newSettleType)){
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getSalesmen(),newBill.getSendDate(),newBill.getCarryType()); EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getCarryType());
if(creditSalesmen!=null) { if(creditSalesmen!=null) {
BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney()); BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney());
if (changeMoney.compareTo(preBalance) > 0) { if (changeMoney.compareTo(preBalance) > 0) {
@ -288,7 +288,7 @@ public class EmisBaseService {
} }
} }
else if("1".equals(newSettleType)){ else if("1".equals(newSettleType)){
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getSalesmen(),newBill.getSendDate(),newBill.getCarryType()); EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getCarryType());
if(creditSalesmen!=null) { if(creditSalesmen!=null) {
BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney()); BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney());
if (changeMoney.compareTo(preBalance) > 0) { if (changeMoney.compareTo(preBalance) > 0) {
@ -318,7 +318,7 @@ public class EmisBaseService {
} }
} }
else if("1".equals(newSettleType)){ else if("1".equals(newSettleType)){
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getSalesmen(),newBill.getSendDate(),newBill.getCarryType()); EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getCarryType());
if(creditSalesmen!=null) { if(creditSalesmen!=null) {
BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney()); BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney());
if (changeMoney.compareTo(preBalance) > 0) { if (changeMoney.compareTo(preBalance) > 0) {
@ -359,7 +359,7 @@ public class EmisBaseService {
} }
} else if ("1".equals(oldPaymentType) || "3".equals(oldPaymentType)) { } else if ("1".equals(oldPaymentType) || "3".equals(oldPaymentType)) {
// 现金额度占用 // 现金额度占用
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(oldBill.getSalesmen(),oldBill.getSendDate(),oldBill.getTransType()); EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(oldBill.getPayee(),oldBill.getSendDate(),oldBill.getTransType());
if (creditSalesmen!=null) { if (creditSalesmen!=null) {
EmisCreditSalesmen item0 = creditSalesmen; EmisCreditSalesmen item0 = creditSalesmen;
@ -392,7 +392,7 @@ public class EmisBaseService {
} }
} else if ("1".equals(newPaymentType) || "3".equals(newPaymentType)) { } else if ("1".equals(newPaymentType) || "3".equals(newPaymentType)) {
// 现金额度占用 // 现金额度占用
EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getSalesmen(),newBill.getSendDate(),newBill.getTransType()); EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getTransType());
if (creditSalesmen!=null) { if (creditSalesmen!=null) {
EmisCreditSalesmen item0 = creditSalesmen; EmisCreditSalesmen item0 = creditSalesmen;
// 获取已使用金额 // 获取已使用金额
@ -1349,7 +1349,6 @@ public class EmisBaseService {
emisSiteSettleRecord.setPreConfirmBalance(confirmMoney); emisSiteSettleRecord.setPreConfirmBalance(confirmMoney);
// 总账户变动 // 总账户变动
// 增加 // 增加
if("1".equals(emisSiteSettleRecord.getChangeType())){ if("1".equals(emisSiteSettleRecord.getChangeType())){
curMoney=curMoney.add(emisSiteSettleRecord.getCurMoney()); curMoney=curMoney.add(emisSiteSettleRecord.getCurMoney());

3
emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
View File

@ -45,7 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if> <if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if> <if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="params.beginCurMoney != null and params.beginCurMoney != ''"> <if test="params.beginCurMoney != null and params.beginCurMoney != ''">
and (a.credit_money-a.use_money) <![CDATA[ >= ]]> #{params.beginCurMoney} and (a.credit_money-a.use_money) <![CDATA[ >= ]]> #{params.beginCurMoney}
</if> </if>
@ -109,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) )
and a.payment_type in('1','3') and a.payment_type in('1','3')
and a.trans_line_type=c.line_code and a.trans_line_type=c.line_code
and a.salesmen=#{salesmen} and a.payee=#{salesmen}
and FIND_IN_SET(c.trans_type,#{transType}) and FIND_IN_SET(c.trans_type,#{transType})
and a.send_date <![CDATA[ > ]]> #{startDate} and a.send_date <![CDATA[ <= ]]> #{endDate} and a.send_date <![CDATA[ > ]]> #{startDate} and a.send_date <![CDATA[ <= ]]> #{endDate}
</select> </select>