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

Merge pull request 'demand: 海运账单起运港目的港导出名称' (#14) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/14
This commit is contained in:
smshen 2025-05-07 13:53:50 +08:00
commit 00d8c4e100
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillAndFeeitem.java
View File

@ -55,13 +55,17 @@ public class EmisWaybillAndFeeitem extends BaseEntity
@DataAuditField(fieldComment = "贵司编号（记录相关业务的贵司编号）") @DataAuditField(fieldComment = "贵司编号（记录相关业务的贵司编号）")
private String companyCode ; private String companyCode ;
private String departurePort ;
private String destinationPort;
@TableField @TableField
@DataAuditField(fieldComment = "起运港") @DataAuditField(fieldComment = "起运港")
private String departurePort ; private String departurePortName ;
@TableField @TableField
@DataAuditField(fieldComment = "目的港") @DataAuditField(fieldComment = "目的港")
private String destinationPort; private String destinationPortName;
@TableField @TableField
@DataAuditField(fieldComment = "箱量") @DataAuditField(fieldComment = "箱量")

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java
View File

@ -1043,8 +1043,8 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS
calculateSubtotal(settleSubBillFeeitemList, subtotalMap); calculateSubtotal(settleSubBillFeeitemList, subtotalMap);
settleSubBillFeeitemList.forEach(item -> { settleSubBillFeeitemList.forEach(item -> {
result.add(Lists.newArrayList(emisWaybill.getLadingBillCode(), emisWaybill.getBillCode(), result.add(Lists.newArrayList(emisWaybill.getLadingBillCode(), emisWaybill.getBillCode(),
emisWaybill.getCompanyCode(), emisWaybill.getDeparturePort(), emisWaybill.getCompanyCode(), emisWaybill.getDeparturePortName(),
emisWaybill.getDestinationPort(), emisWaybill.getBoxQuantity(), emisWaybill.getDestinationPortName(), emisWaybill.getBoxQuantity(),
String.valueOf(emisWaybill.getParcelQty()), String.valueOf(emisWaybill.getParcelQty()),
emisWaybill.getBillWeight().stripTrailingZeros().toPlainString(), emisWaybill.getBillWeight().stripTrailingZeros().toPlainString(),
emisWaybill.getTotalVolume().stripTrailingZeros().toPlainString(), emisWaybill.getTotalVolume().stripTrailingZeros().toPlainString(),

6
emis-biz/src/main/resources/mapper/EmisSettleSubBillFeeitemMapper.xml
View File

@ -23,6 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="companyCode" column="company_code"/> <result property="companyCode" column="company_code"/>
<result property="departurePort" column="departure_port"/> <result property="departurePort" column="departure_port"/>
<result property="destinationPort" column="destination_port"/> <result property="destinationPort" column="destination_port"/>
<result property="departurePortName" column="departure_port_name" />
<result property="destinationPortName" column="destination_port_name" />
<result property="boxQuantity" column="box_quantity"/> <result property="boxQuantity" column="box_quantity"/>
<result property="parcelQty" column="parcel_qty"/> <result property="parcelQty" column="parcel_qty"/>
<result property="billWeight" column="bill_weight"/> <result property="billWeight" column="bill_weight"/>
@ -55,9 +57,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.parcel_qty, a.parcel_qty,
a.bill_weight, a.bill_weight,
a.total_volume, a.total_volume,
seaway1.site_name as departure_port_name,
seaway2.site_name as destination_port_name,
b.* b.*
from emis_waybill a from emis_waybill a
left join emis_settle_sub_bill_feeitem b on a.bill_code = b.bill_code and b.del_flag = '0' left join emis_settle_sub_bill_feeitem b on a.bill_code = b.bill_code and b.del_flag = '0'
left join emis_site seaway1 on a.departure_port=seaway1.site_code and seaway1.del_flag='0'
left join emis_site seaway2 on a.destination_port=seaway2.site_code and seaway2.del_flag='0'
</sql> </sql>
<select id="selectFeeitemListBySubBillNo" parameterType="String" resultMap="EmisSettleSubBillFeeitemResult"> <select id="selectFeeitemListBySubBillNo" parameterType="String" resultMap="EmisSettleSubBillFeeitemResult">