From 8a062516ed4852292b8a47601e32ca953ff6f16c Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 26 Dec 2024 11:12:24 +0800 Subject: [PATCH] md --- .../web/emis/EmisSettleInvoiceRecordController.java | 10 ++++++++-- .../emis/mapper/EmisSettleInvoiceChRecordMapper.java | 11 ++++++++++- .../service/IEmisSettleInvoiceChRecordService.java | 2 ++ .../impl/EmisSettleInvoiceChRecordServiceImpl.java | 7 +++++++ .../mapper/EmisSettleInvoiceChRecordMapper.xml | 9 +++++++++ 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRecordController.java index cc0c46325..172b5490d 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceRecordController.java @@ -15,6 +15,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.xdadan.erp.emis.domain.exception.EmisBizError; +import com.xdadan.erp.emis.service.IEmisSettleInvoiceChRecordService; import com.xdadan.erp.emis.utils.WaybillHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; @@ -52,6 +53,9 @@ public class EmisSettleInvoiceRecordController extends BaseController @Autowired private IEmisSettleInvoiceRecordService emisSettleInvoiceRecordService; + @Autowired + private IEmisSettleInvoiceChRecordService emisSettleInvoiceChRecordService; + /** * 查询开票记录表列表 */ @@ -184,8 +188,10 @@ public class EmisSettleInvoiceRecordController extends BaseController return AjaxResult.error("申请不存在"); } - if("1".equals(old.getBlAudit())){ - return AjaxResult.error("已审核通过,不可操作"); + // 如果已发送航信开票则不允许操作 + int isSend=emisSettleInvoiceChRecordService.checkHasSendToHx(old.getApplySeqNo()); + if(isSend>0){ + return AjaxResult.error("已发航信开票,不可操作"); } if("2".equals(old.getBlAudit())){ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceChRecordMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceChRecordMapper.java index f418ce29b..f4c0bf4de 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceChRecordMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettleInvoiceChRecordMapper.java @@ -13,6 +13,8 @@ package com.xdadan.erp.emis.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.xdadan.erp.emis.domain.EmisSettleInvoiceChRecord; +import org.apache.ibatis.annotations.Param; + /** * @ClassName EmisSettleInvoiceChRecordMapper * @Description

渠道开票记录表 Mapper 接口

@@ -47,6 +49,12 @@ public interface EmisSettleInvoiceChRecordMapper extends BaseMapper selectWaitQueryStatusList(); + /** + * 检查是否发送航信 + * @param applySeqNo + * @return + */ + public int checkHasSendToHx(@Param("applySeqNo") String applySeqNo); /** @@ -56,7 +64,8 @@ public interface EmisSettleInvoiceChRecordMapper extends BaseMapper selectEmisSettleInvoiceChRecordList(EmisSettleInvoiceChRecord emisSettleInvoiceChRecord); + public int checkHasSendToHx(String applySeqNo); + /** * 检查是否重复 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java index 4a4063961..b587e4f07 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java @@ -85,6 +85,13 @@ public class EmisSettleInvoiceChRecordServiceImpl extends EmisBaseService implem return emisSettleInvoiceChRecordMapper.selectEmisSettleInvoiceChRecordList(emisSettleInvoiceChRecord); } + + @Override + public int checkHasSendToHx(String applySeqNo) + { + return emisSettleInvoiceChRecordMapper.checkHasSendToHx(applySeqNo); + } + /** * 检查是否重复 * diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml index f1f56c0a1..08f4203da 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml @@ -162,6 +162,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc + + +