diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java index 504f3c9f..cb5ac891 100644 --- a/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java +++ b/dxhy-extend/src/main/java/com/dxhy/extend/service/pool/ExtInvoicePoolServiceImpl.java @@ -285,12 +285,13 @@ public class ExtInvoicePoolServiceImpl extends MpBaseServiceImpl ,t.incentive_flag incentiveFlag ,t.system_name systemName + ,t.sn_voucher_no snVoucherNo + ,t.image_id imageId + ,t.account_period accountPeriod + ,t.posting_time postingTime from t_dx_sale_record_invoice t where 1 = 1 @@ -507,6 +511,18 @@ and t.invoice_source = #{invoiceSource} + + and t.sn_voucher_number = #{snVoucherNumber} + + + and t.posting_time = #{postingTime} + + + and t.image_id = #{imageId} + + + and t.account_period = #{accountPeriod} + GROUP BY t.uuid ORDER BY t.create_date DESC diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java index 3060ad40..50a040d4 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java @@ -308,6 +308,7 @@ public class FpqsServiceImpl extends MpBaseServiceImpl 0) { for (SignRulesEntity signRulesEntity : rules) { if ("1008".contains(signRulesEntity.getRuleCode())) {