diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java index 578f0de26..638e613ce 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRecord.java @@ -19,6 +19,8 @@ import com.xdadan.erp.common.core.domain.TreeEntity; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + import lombok.Data; @@ -131,4 +133,7 @@ public class EmisSettleInvoiceRecord extends BaseEntity private String opSiteName; + List invoiceRelList; + + } 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 fa99b483d..7aef17b45 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 @@ -14,23 +14,21 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -import com.xdadan.erp.common.annotation.Log; -import com.xdadan.erp.common.core.domain.AjaxResult; -import com.xdadan.erp.common.enums.BusinessType; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; 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.service.EmisBaseService; import com.xdadan.erp.emis.utils.WaybillHelper; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; import com.xdadan.erp.emis.mapper.EmisSettleInvoiceRecordMapper; import com.xdadan.erp.emis.service.IEmisSettleInvoiceRecordService; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; /** * 开票记录表Service业务层处理 @@ -47,6 +45,10 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen @Autowired private EmisSettleBillMapper emisSettleBillMapper; + @Autowired + private EmisSettleInvoiceRelMapper emisSettleInvoiceRelMapper; + + /** * 查询开票记录表 * @@ -94,6 +96,9 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen public int insertEmisSettleInvoiceRecord(EmisSettleInvoiceRecord emisSettleInvoiceRecord) throws EmisBizError { // 判断对应账单是否存在 + // id流水号 + String applySeqNo= WaybillHelper.genApplySeqNo(); + // 相同抬头,相同金额,有审批中或者已开票的不允许再申请 int chkRst=emisSettleInvoiceRecordMapper.checkOpenBillRepeat(emisSettleInvoiceRecord); if(chkRst!=0){ @@ -105,7 +110,15 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen WaybillHelper.formatQueryValue(emisSettleInvoiceRecord.getSettleBillNo()) ); - + // 记录开票运单号 + List listRel=emisSettleInvoiceRecord.getInvoiceRelList(); + if(!CollectionUtils.isEmpty(listRel)){ + for (EmisSettleInvoiceRel invoiceRel:listRel + ) { + invoiceRel.setApplySeqNo(applySeqNo); + emisSettleInvoiceRelMapper.insertEmisSettleInvoiceRel(invoiceRel); + } + } BigDecimal totalFee =BigDecimal.ZERO; // 总可开票金额 @@ -131,8 +144,7 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen emisSettleInvoiceRecord.setOpenMoneyMax(totalFee); - // id流水号 - String applySeqNo= WaybillHelper.genApplySeqNo(); + emisSettleInvoiceRecord.setApplySeqNo(applySeqNo); emisSettleInvoiceRecord.setApplyManCode(getCurrentUser().getEmpCode()); emisSettleInvoiceRecord.setApplySiteCode(getCurrentUser().getOwnerSiteCode());