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

Merge pull request 'demand: TMS系统 - 客户账单管理 - 业务出账确认 - 逻辑优化 TMS系统 - 客户账单管理 - 业务开票申请/财务开票处理 - 按运单号查询 不支持多个运单号查询数据' (#286) from test1 into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/286
This commit is contained in:
heyu 2026-01-05 09:30:47 +08:00
commit add8a2a212
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
View File

@ -145,7 +145,7 @@ public class EmisSettleSubBillController extends EmisBaseController
{ {
setPrivParams(emisSettleSubBill); setPrivParams(emisSettleSubBill);
if(!org.apache.commons.lang3.StringUtils.isEmpty(emisSettleSubBill.getBillCode())){ if(!StringUtils.isEmpty(emisSettleSubBill.getBillCode())){
emisSettleSubBill.setBillCode(WaybillHelper.formatQueryValue(emisSettleSubBill.getBillCode())); emisSettleSubBill.setBillCode(WaybillHelper.formatQueryValue(emisSettleSubBill.getBillCode()));
String[] billCodeSortList = emisSettleSubBill.getBillCode().split(","); String[] billCodeSortList = emisSettleSubBill.getBillCode().split(",");
if(billCodeSortList.length>1){ if(billCodeSortList.length>1){
@ -440,6 +440,13 @@ public class EmisSettleSubBillController extends EmisBaseController
return AjaxResult.error("账单不存在:"+old.getBillCode()); return AjaxResult.error("账单不存在:"+old.getBillCode());
} }
EmisWaybill waybill = emisBaseService.getWaybillByBillCode(old.getBillNo());
if(waybill==null){
return AjaxResult.error("运单不存在:"+old.getBillCode());
}
if ("6".equals(waybill.getPaymentType())) {
return AjaxResult.error(old.getBillCode() + "支付方式是其他,不允许确认账单，请修改正确的支付方式");
}
if(!"0086".equals(old.getWaybillDetail().getSendCountry()) && "0086".equals(old.getWaybillDetail().getReceiveCountry()) if(!"0086".equals(old.getWaybillDetail().getSendCountry()) && "0086".equals(old.getWaybillDetail().getReceiveCountry())
&& ( && (
"2".equals(old.getWaybillDetail().getPaymentType()) "2".equals(old.getWaybillDetail().getPaymentType())
@ -467,7 +474,6 @@ public class EmisSettleSubBillController extends EmisBaseController
bug:1688 bug:1688
调整为现金保留自动确认,月结调整为不自动确认 调整为现金保留自动确认,月结调整为不自动确认
*/ */
EmisWaybill waybill = emisBaseService.getWaybillByBillCode(old.getBillNo());
if (waybill.getRealFee() == null) { if (waybill.getRealFee() == null) {
continue; continue;
} }

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

@ -191,7 +191,7 @@
and EXISTS( and EXISTS(
select 1 from emis_settle_invoice_rel rel select 1 from emis_settle_invoice_rel rel
where rel.del_flag = '0' and rel.bill_no=#{params.billCode} where rel.del_flag = '0' and FIND_IN_SET(rel.bill_no, #{params.billCode})
and rel.apply_seq_no = a.apply_seq_no and rel.apply_seq_no = a.apply_seq_no
) )
@ -350,7 +350,7 @@
<if test="params.billCode != null and params.billCode != ''"> <if test="params.billCode != null and params.billCode != ''">
and EXISTS( and EXISTS(
select 1 from emis_settle_invoice_rel rel select 1 from emis_settle_invoice_rel rel
where rel.del_flag = '0' and rel.bill_no=#{params.billCode} where rel.del_flag = '0' and FIND_IN_SET(rel.bill_no, #{params.billCode})
and rel.apply_seq_no = a.apply_seq_no and rel.apply_seq_no = a.apply_seq_no
) )
</if> </if>