From ee682d8d5df1ed138328ec0e9b59094b5e44290f Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 19 Sep 2025 11:13:44 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
=?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86=20-=20=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E5=BC=80=E7=A5=A8=E4=B8=BB=E4=BD=93=20-=20=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E5=90=AF=E7=94=A8=E7=8A=B6=E6=80=81=E6=8E=A7=E5=88=B6?=
=?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=BC=80=E7=A5=A8=E6=9D=83=E9=99=90=20=20=20?=
=?UTF-8?q?TMS=E7=B3=BB=E7=BB=9F=20-=20=E5=AE=A2=E6=88=B7=E8=B4=A6?=
=?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=20-=20=E4=B8=9A=E5=8A=A1=E5=BC=80?=
=?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7-=E6=96=B0=E5=A2=9E=E5=BC=80?=
=?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E6=97=B6=E5=88=A4=E6=96=AD=E5=90=AF?=
=?UTF-8?q?=E7=94=A8=E7=8A=B6=E6=80=81=EF=BC=8C=E5=81=9C=E7=94=A8=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=EF=BC=8C=E5=BC=B9=E7=AA=97=E6=8F=90=E9=86=92=E2=80=9C?=
=?UTF-8?q?=E6=AD=A4=E5=BC=80=E7=A5=A8=E6=8A=AC=E5=A4=B4=E4=BB=98=E6=AC=BE?=
=?UTF-8?q?=E4=B8=8D=E5=8F=8A=E6=97=B6=EF=BC=8C=E5=BB=B6=E5=90=8E=E5=BC=80?=
=?UTF-8?q?=E7=A5=A8=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
committer: heyu
---
.../emis/domain/EmisCustomerInvoiceInfo.java | 6 +--
.../EmisSettleInvoiceRecordServiceImpl.java | 46 ++++++++++++++-----
.../mapper/EmisCustomerInvoiceInfoMapper.xml | 9 +++-
3 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerInvoiceInfo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerInvoiceInfo.java
index c512483be..dd388ebf3 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerInvoiceInfo.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerInvoiceInfo.java
@@ -23,7 +23,6 @@ import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
-
/**
* @ClassName EmisCustomerInvoiceInfo
* @Description 客户开票信息记录表
@@ -31,8 +30,7 @@ import lombok.Data;
* @date 2024-07-21 14:31:02
*/
@Data
-public class EmisCustomerInvoiceInfo extends BaseEntity
-{
+public class EmisCustomerInvoiceInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
/* id */
@@ -64,5 +62,7 @@ public class EmisCustomerInvoiceInfo extends BaseEntity
private String recieveAddress;
/* 发票投递邮箱 */
private String email;
+ /* 启用状态：1-启用，0-停用 */
+ private String enableStatus;
}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
index 9e190344e..989b66b41 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java
@@ -1,10 +1,10 @@
- /**
+ /**
* @Project: emis
* @Title: EmisSettleInvoiceRecordServiceImpl.java
* @author linfso
* @date 2024-07-21 13:31:26
* @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0
+ * @version v1.0
* @Description: 开票记录表 实体类
*/
@@ -14,6 +14,7 @@ import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import lombok.Data;
import com.xdadan.erp.common.core.domain.entity.SysUser;
import com.xdadan.erp.emis.domain.*;
@@ -22,6 +23,7 @@ import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.mapper.EmisSettleBillMapper;
import com.xdadan.erp.emis.mapper.EmisSettleInvoiceRelMapper;
import com.xdadan.erp.emis.mapper.EmisSettleSubBillMapper;
+import com.xdadan.erp.emis.mapper.EmisCustomerInvoiceInfoMapper;
import com.xdadan.erp.emis.service.EmisBaseService;
import com.xdadan.erp.emis.service.IEmisSettleBillService;
import com.xdadan.erp.emis.utils.WaybillHelper;
@@ -38,7 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
/**
* 开票记录表Service业务层处理
- *
+ *
* @author linfso
* @date 2024-07-21 13:31:26
*/
@@ -62,10 +64,12 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
@Autowired
private IEmisSettleBillService emisSettleBillService;
+ @Autowired
+ private EmisCustomerInvoiceInfoMapper emisCustomerInvoiceInfoMapper;
/**
* 查询开票记录表
- *
+ *
* @param id 开票记录表主键
* @return 开票记录表
*/
@@ -78,7 +82,7 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
/**
* 查询开票记录表列表
- *
+ *
* @param emisSettleInvoiceRecord 开票记录表
* @return 开票记录表
*/
@@ -90,8 +94,8 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
/**
* 检查是否重复
- *
- * @param emisSettleInvoiceRecord
+ *
+ * @param emisSettleInvoiceRecord
* @return 数量
*/
@Override
@@ -102,7 +106,7 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
/**
* 新增开票记录表
- *
+ *
* @param emisSettleInvoiceRecord 开票记录表
* @return 结果
*/
@@ -113,6 +117,26 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
// id流水号
String applySeqNo= WaybillHelper.genApplySeqNo();
+ // 检查开票抬头启用状态
+ if (StringUtils.isNotBlank(emisSettleInvoiceRecord.getCustomerCode()) &&
+ StringUtils.isNotBlank(emisSettleInvoiceRecord.getCompanyName()) &&
+ StringUtils.isNotBlank(emisSettleInvoiceRecord.getCompanyTaxNo())) {
+
+ EmisCustomerInvoiceInfo queryInfo = new EmisCustomerInvoiceInfo();
+ queryInfo.setCustomerCode(emisSettleInvoiceRecord.getCustomerCode());
+ queryInfo.setCompanyName(emisSettleInvoiceRecord.getCompanyName());
+ queryInfo.setCompanyTaxNo(emisSettleInvoiceRecord.getCompanyTaxNo());
+
+ List invoiceInfoList = emisCustomerInvoiceInfoMapper
+ .selectEmisCustomerInvoiceInfoList(queryInfo);
+ if (CollectionUtils.isNotEmpty(invoiceInfoList)) {
+ EmisCustomerInvoiceInfo invoiceInfo = invoiceInfoList.get(0);
+ if (!"1".equals(invoiceInfo.getEnableStatus())) {
+ throw new EmisBizError(EmisBizErrorType.FAIL, "此开票抬头付款不及时，延后开票");
+ }
+ }
+ }
+
// 相同抬头，相同金额，有审批中或者已开票的不允许再申请
int chkRst=emisSettleInvoiceRecordMapper.checkOpenBillRepeat(emisSettleInvoiceRecord);
if(chkRst!=0){
@@ -201,7 +225,7 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
/**
* 修改开票记录表
- *
+ *
* @param emisSettleInvoiceRecord 开票记录表
* @return 结果
*/
@@ -213,7 +237,7 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
/**
* 批量删除开票记录表
- *
+ *
* @param ids 需要删除的开票记录表主键
* @return 结果
*/
@@ -225,7 +249,7 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
/**
* 删除开票记录表信息
- *
+ *
* @param id 开票记录表主键
* @return 结果
*/
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerInvoiceInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerInvoiceInfoMapper.xml
index f109d2ae3..607a017c9 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerInvoiceInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerInvoiceInfoMapper.xml
@@ -19,10 +19,11 @@
+
- select id, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, invoice_type, customer_code, customer_name, contact, phone, recieve_address, email, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_invoice_info
+ select id, company_name, company_tax_no, company_tel, company_address, bank_name, bank_acc_no, invoice_type, customer_code, customer_name, contact, phone, recieve_address, email, enable_status, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_invoice_info
@@ -106,6 +108,7 @@
phone,
recieve_address,
email,
+ enable_status,
remark,
del_flag,
create_by,
@@ -130,6 +133,7 @@
#{phone},
#{recieveAddress},
#{email},
+ #{enableStatus},
#{remark},
#{delFlag},
#{createBy},
@@ -157,6 +161,7 @@
phone = #{phone},
recieve_address = #{recieveAddress},
email = #{email},
+ enable_status = #{enableStatus},
remark = #{remark},
del_flag = #{delFlag},
create_by = #{createBy},