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

Merge pull request 'demand: TMS系统 - 客户账单管理 - 财务开票处理 - 已开票 - 定制导出-客户付款日期、收款登记日期拼接时按照日期从小到大的顺序拼接' (#217) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/217
This commit is contained in:
heyu 2025-11-04 17:49:09 +08:00
commit 6d5d2f754e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5428,9 +5428,9 @@ public class EmisBaseService {
String supplierNames = group.stream().map(EmisTransPlanRule::getSupplierName) String supplierNames = group.stream().map(EmisTransPlanRule::getSupplierName)
.filter(Objects::nonNull).distinct().collect(Collectors.joining(",")); .filter(Objects::nonNull).distinct().collect(Collectors.joining(","));
EmisTransPlanRule first = group.get(0); EmisTransPlanRule first = group.get(0);
if (first.getEndDate().before(waybill.getSendDate()) || first.getStartDate().after(waybill.getSendDate())) { // if (first.getEndDate().before(waybill.getSendDate()) || first.getStartDate().after(waybill.getSendDate())) {
continue; // continue;
} // }
String missReason = String.format("%s-%s-%s", first.getStartSiteName(), String missReason = String.format("%s-%s-%s", first.getStartSiteName(),
first.getNextSiteName(), supplierNames); first.getNextSiteName(), supplierNames);
EmisTmsSiteBatchMiss miss = createMissRecord(waybill); EmisTmsSiteBatchMiss miss = createMissRecord(waybill);

2
emis-biz/src/main/resources/mapper/EmisTmsSiteBatchDtlMapper.xml
View File

@ -229,7 +229,7 @@
</select> </select>
<select id="selectEmisWayBillByBatchNo" parameterType="String" resultMap="com.xdadan.erp.emis.mapper.EmisWaybillMapper.EmisWaybillResult"> <select id="selectEmisWayBillByBatchNo" parameterType="String" resultMap="com.xdadan.erp.emis.mapper.EmisWaybillMapper.EmisWaybillResult">
select a.id, a.bill_code,a.trans_line_type, a.product_type,a.start_site_code,a.send_site_code select a.*
from emis_waybill a from emis_waybill a
left join emis_tms_site_batch_dtl b on a.bill_code = b.bill_code and b.del_flag = '0' left join emis_tms_site_batch_dtl b on a.bill_code = b.bill_code and b.del_flag = '0'
where b.batch_no = #{batchNo} where b.batch_no = #{batchNo}