diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java index f9faa78cd..45f0a389e 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java @@ -15,6 +15,8 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.xdadan.erp.emis.domain.EmisSettleInvoiceChRecord; +import com.xdadan.erp.emis.domain.EmisSettleInvoiceRecord; +import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.service.IEmisSettleInvoiceChRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -110,6 +112,27 @@ public class EmisSettleInvoiceChRecordController extends BaseController return toAjax(emisSettleInvoiceChRecordService.insertEmisSettleInvoiceChRecord(emisSettleInvoiceChRecord)); } + + @Log(title = "发送航信开票", businessType = BusinessType.UPDATE) + @PostMapping("/sendHXToOpen") + public AjaxResult sendHXToOpen(@RequestBody EmisSettleInvoiceRecord emisSettleInvoiceRecord) + { + try { + return toAjax(emisSettleInvoiceChRecordService.sendHXToOpen(emisSettleInvoiceRecord.getId())); + } + catch (Exception ex){ + ex.printStackTrace(); + // 返回子定义异常 + if(ex instanceof EmisBizError){ + return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode()); + } + + return AjaxResult.error("服务器异常,联系客服"); + } + + } + + /** * 修改渠道开票记录表 */ 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 e5d2a08d4..6c2a2ae6b 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 @@ -13,7 +13,10 @@ package com.xdadan.erp.web.emis; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.xdadan.erp.emis.domain.exception.EmisBizError; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -107,9 +110,29 @@ public class EmisSettleInvoiceRecordController extends BaseController @PostMapping public AjaxResult add(@RequestBody EmisSettleInvoiceRecord emisSettleInvoiceRecord) { - return toAjax(emisSettleInvoiceRecordService.insertEmisSettleInvoiceRecord(emisSettleInvoiceRecord)); + try { + return toAjax(emisSettleInvoiceRecordService.insertEmisSettleInvoiceRecord(emisSettleInvoiceRecord)); + } + catch (DuplicateKeyException e) { + e.printStackTrace(); + return AjaxResult.error("开票流水号重复!"); + } + catch (Exception ex){ + ex.printStackTrace(); + // 返回子定义异常 + if(ex instanceof EmisBizError){ + return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode()); + } + + return AjaxResult.error("服务器异常,联系客服"); + } + } + + + + /** * 修改开票记录表 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisBaseInvoiceChInfoMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisBaseInvoiceChInfoMapper.java index ad9dfbe0a..73ab723df 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisBaseInvoiceChInfoMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisBaseInvoiceChInfoMapper.java @@ -28,6 +28,8 @@ public interface EmisBaseInvoiceChInfoMapper extends BaseMapper goodsList = new ArrayList<>(); + for (int i=0;i + + insert into emis_base_invoice_ch_info