diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java index 78302b1c2..fe2d28178 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsCostFeeServiceImpl.java @@ -257,7 +257,7 @@ public class EmisTmsCostFeeServiceImpl implements IEmisTmsCostFeeService splitItem.setTransSignNo(waybill.getTakePieceEmployeeName()); // 运输号 splitItem.setSendPlace("客户现场"); - splitItem.setDestPlace(waybill.getStartSiteName()); + splitItem.setDestPlace(waybill.getSendSiteName()); splitItem.setBillMonth(DateUtils.parseDateToStr(DateUtils.YYYY_MM,waybill.getSendDate())); splitItem.setTradeDate(waybill.getSendDate()); diff --git a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml index 9e1a1225d..23858f8b2 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsCostFeeSplitMapper.xml @@ -85,7 +85,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and create_site like concat('%', #{createSite}, '%') and update_site like concat('%', #{updateSite}, '%') - order by create_time desc + + order by billCode asc,trade_date asc + + + order by create_time desc + +