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

Merge pull request 'develop' (#213) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/213
This commit is contained in:
heyu 2025-10-30 11:33:06 +08:00
commit f6fbb7cf1a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java
View File

@ -148,7 +148,7 @@ public class EmisWriteoffApplyServiceImpl extends EmisBaseService implements IEm
if (detail.getEmisSettleSubBill() == null) { if (detail.getEmisSettleSubBill() == null) {
throw new EmisBizError("运单号 " + detail.getBillCode() + " 的子账单信息为空"); throw new EmisBizError("运单号 " + detail.getBillCode() + " 的子账单信息为空");
} }
BigDecimal recMoney = detail.getEmisSettleBill().getRecMoney(); BigDecimal recMoney = detail.getEmisSettleSubBill().getBillFee();
if (recMoney == null) { if (recMoney == null) {
throw new EmisBizError("运单号 " + detail.getBillCode() + " 的账单应收金额为空"); throw new EmisBizError("运单号 " + detail.getBillCode() + " 的账单应收金额为空");
} }

4
emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
View File

@ -324,8 +324,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
wib.in_no as batch_in_no, wib.in_no as batch_in_no,
wib.in_batch_no as in_batch_no, wib.in_batch_no as in_batch_no,
wib.entry_date as batch_entry_date, wib.entry_date as batch_entry_date,
wib.total_parcel_qty as batch_total_parcel_qty, wib.parcel_qty as batch_total_parcel_qty,
wib.total_weight as batch_total_weight, wib.bill_weight as batch_total_weight,
wib.total_volume as batch_total_volume, wib.total_volume as batch_total_volume,
wib.prepare_in_express, wib.prepare_in_express,
wib.prepare_in_bill_code, wib.prepare_in_bill_code,