From 1cd1ca032679ebe486fc15ec931f3f2a5dca219f Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 4 Jul 2024 07:08:14 +0800 Subject: [PATCH] md --- .../web/emis/EmisSettleSubBillController.java | 73 +++++++++++++++++++ .../emis/mapper/EmisSettleSubBillMapper.java | 8 ++ .../erp/emis/service/EmisBaseService.java | 17 +++++ .../mapper/EmisSettleSubBillMapper.xml | 54 ++++++++++++++ 4 files changed, 152 insertions(+) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java index 32d7fd016..68f8b7e5a 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java @@ -13,6 +13,10 @@ package com.xdadan.erp.web.emis; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.xdadan.erp.emis.domain.EmisWaybillAjustApply; +import com.xdadan.erp.emis.domain.exception.EmisBizError; +import com.xdadan.erp.emis.service.EmisBaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; @@ -48,6 +52,10 @@ public class EmisSettleSubBillController extends BaseController @Autowired private IEmisSettleSubBillService emisSettleSubBillService; + @Autowired + private EmisBaseService emisBaseService; + + /** * 查询结算子账单列表 */ @@ -131,4 +139,69 @@ public class EmisSettleSubBillController extends BaseController { return toAjax(emisSettleSubBillService.deleteEmisSettleSubBillByIds(ids)); } + + + /** + * 中心确认账单 + */ + @PreAuthorize("@ss.hasPermi('emis:emisSettleSubBill:confirmBillByCenter')") + @Log(title = "中心确认通过", businessType = BusinessType.UPDATE) + @PostMapping("/auditCenterPass/{ids}") + public AjaxResult confirmBillByCenter(@PathVariable Long[] ids) + { + if(ids!=null && ids.length>0){ + for(int i=0;i0){ + for(int i=0;i */ public int updateEmisSettleSubBill(EmisSettleSubBill emisSettleSubBill); + // 财务中心取消和确认 + public int confirmBillByCenter(EmisSettleSubBill emisSettleSubBill); + public int cancelConfirmBillByCenter(EmisSettleSubBill emisSettleSubBill); + + // 业务取消和确认 + public int confirmBillBySite(EmisSettleSubBill emisSettleSubBill); + public int cancelConfirmBillBySite(EmisSettleSubBill emisSettleSubBill); + /** * 删除 * diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index d80e7ca00..4a4b5ef58 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -960,6 +960,23 @@ public class EmisBaseService { } + /** + * 财务账单确认 + * @param emisSettleSubBill + * @return + */ + public int confirmBillByCenter(EmisSettleSubBill emisSettleSubBill){ + return emisSettleSubBillMapper.confirmBillByCenter(emisSettleSubBill); + } + + /** + * 财务账单取消 + * @param emisSettleSubBill + * @return + */ + public int cancelConfirmBillByCenter(EmisSettleSubBill emisSettleSubBill){ + return emisSettleSubBillMapper.cancelConfirmBillByCenter(emisSettleSubBill); + } /** * 短信发送 diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml index 84a5454af..a3c5d668e 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml @@ -227,6 +227,60 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + + update emis_settle_sub_bill + + bl_confirm = '1', + confirm_date = now(), + confirm_man_code = #{confirmManCode}, + update_by = #{updateBy}, + update_time = #{updateTime}, + update_site = #{updateSite}, + + where id = #{id} + + + + update emis_settle_sub_bill + + bl_confirm = '0', + confirm_date = null, + confirm_man_code =null, + update_by = #{updateBy}, + update_time = #{updateTime}, + update_site = #{updateSite}, + + where id = #{id} + + + + update emis_settle_sub_bill + + bl_site_confirm = '1', + site_confirm_date = now(), + confirm_man_code = #{confirmManCode}, + update_by = #{updateBy}, + update_time = #{updateTime}, + update_site = #{updateSite}, + + where id = #{id} + + + + update emis_settle_sub_bill + + bl_confirm = '0', + site_confirm_date = null, + site_confirm_man_code =null, + update_by = #{updateBy}, + update_time = #{updateTime}, + update_site = #{updateSite}, + + where id = #{id} + + + delete from emis_settle_sub_bill where id = #{id}