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() + " 的账单应收金额为空");
} }

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

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xdadan.erp.emis.mapper.EmisWarehouseInMapper"> <mapper namespace="com.xdadan.erp.emis.mapper.EmisWarehouseInMapper">
<resultMap type="EmisWarehouseIn" id="BaseEmisWarehouseInResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult"> <resultMap type="EmisWarehouseIn" id="BaseEmisWarehouseInResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="serialNo" column="serial_no" /> <result property="serialNo" column="serial_no" />
@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectEmisWarehouseInList" parameterType="EmisWarehouseIn" resultMap="EmisWarehouseInResult"> <select id="selectEmisWarehouseInList" parameterType="EmisWarehouseIn" resultMap="EmisWarehouseInResult">
select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, stock_in_flag, bl_upload_pic, total_parcel_qty, total_volume, total_weight, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, stock_in_flag, bl_upload_pic, total_parcel_qty, total_volume, total_weight, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_warehouse_in a from emis_warehouse_in a
<where> <where>
del_flag='0' del_flag='0'
<if test="id != null "> and id = #{id}</if> <if test="id != null "> and id = #{id}</if>
<if test="serialNo != null and serialNo != ''"> and serial_no like concat('%', #{serialNo}, '%')</if> <if test="serialNo != null and serialNo != ''"> and serial_no like concat('%', #{serialNo}, '%')</if>
@ -295,7 +295,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where> </where>
order by create_time desc order by create_time desc
</select> </select>
<select id="selectEmisWarehouseInById" parameterType="Long" resultMap="EmisWarehouseInResult"> <select id="selectEmisWarehouseInById" parameterType="Long" resultMap="EmisWarehouseInResult">
select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, stock_in_flag, bl_upload_pic, total_parcel_qty, total_volume, total_weight, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, stock_in_flag, bl_upload_pic, total_parcel_qty, total_volume, total_weight, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_warehouse_in a from emis_warehouse_in a
@ -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,
@ -482,4 +482,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
</mapper> </mapper>