From 676a937b20c7f68cc180387f1acd3f4825b6df93 Mon Sep 17 00:00:00 2001 From: lSun <15893999301@qq.com> Date: Thu, 22 May 2025 17:37:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E4=BB=98=E5=BD=95=E5=85=A5=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ca/im/controller/PayableController.java | 24 ++++++++++++-- .../boot/manager/ca/im/dao/PayableDao.java | 7 ++++ .../manager/ca/im/service/PayableService.java | 1 + .../im/service/impl/PayableServiceImpl.java | 32 +++++++++++++++++++ .../resources/mappers/ca/PayableMapper.xml | 10 +++++- .../static/pages/finance/addPayable.html | 17 ++++++---- 6 files changed, 81 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/bonus/boot/manager/ca/im/controller/PayableController.java b/src/main/java/com/bonus/boot/manager/ca/im/controller/PayableController.java index 62672bd..4cbdfc4 100644 --- a/src/main/java/com/bonus/boot/manager/ca/im/controller/PayableController.java +++ b/src/main/java/com/bonus/boot/manager/ca/im/controller/PayableController.java @@ -12,6 +12,8 @@ import com.bonus.boot.manager.manager.model.SysUser; import com.bonus.boot.manager.manager.table.PageTableHandler; import com.bonus.boot.manager.manager.table.PageTableRequest; import com.bonus.boot.manager.manager.table.PageTableResponse; +import com.bonus.boot.manager.manager.utils.AjaxRes; +import com.bonus.boot.manager.manager.utils.GlobalConst; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.*; @@ -66,8 +68,15 @@ public class PayableController { @PostMapping @ApiOperation(value = "保存应付录入信息") @PreAuthorize("hasAuthority('sys:payable:add')") - public void save(@RequestBody PayableBean payableBean) { - service.save(payableBean); + public AjaxRes save(@RequestBody PayableBean payableBean) { + AjaxRes ar = new AjaxRes(); + int result = service.addPayable(payableBean); + if(result>0){ + ar.setFailMsg("每个月只有一个凭证号"); + }else { + ar.setSucceedMsg("新增成功"); + } + return ar; } @GetMapping("/exp") @@ -234,7 +243,16 @@ public class PayableController { errorMsgs.add("第" + (i + 1) + "行：单号不能为空"); hasError = true; } else { - payable.setPzh(pzh); + PayableBean payableBean = new PayableBean(); + payableBean.setPzh(pzh); + payableBean.setRq(rq); + int jk = dao.getBean(payableBean); + if(jk > 0){ + errorMsgs.add("第" + (i + 1) + "行：每个月只有一个凭证号"); + hasError = true; + }else{ + payable.setPzh(pzh); + } } // 校验并设置合同名称 diff --git a/src/main/java/com/bonus/boot/manager/ca/im/dao/PayableDao.java b/src/main/java/com/bonus/boot/manager/ca/im/dao/PayableDao.java index 7777cb6..4fe9994 100644 --- a/src/main/java/com/bonus/boot/manager/ca/im/dao/PayableDao.java +++ b/src/main/java/com/bonus/boot/manager/ca/im/dao/PayableDao.java @@ -95,4 +95,11 @@ public interface PayableDao { Integer getAccountIdByName(String accountName); String getZdridByName(String zdr); + + /** + * 判断单号（凭证号） + * @param payableBean + * @return + */ + int getBean(PayableBean payableBean); } diff --git a/src/main/java/com/bonus/boot/manager/ca/im/service/PayableService.java b/src/main/java/com/bonus/boot/manager/ca/im/service/PayableService.java index c9a0b10..a8511f8 100644 --- a/src/main/java/com/bonus/boot/manager/ca/im/service/PayableService.java +++ b/src/main/java/com/bonus/boot/manager/ca/im/service/PayableService.java @@ -40,4 +40,5 @@ public interface PayableService { void expContract(HttpServletResponse response, Map params); + int addPayable(PayableBean payableBean); } diff --git a/src/main/java/com/bonus/boot/manager/ca/im/service/impl/PayableServiceImpl.java b/src/main/java/com/bonus/boot/manager/ca/im/service/impl/PayableServiceImpl.java index 619c057..ff96494 100644 --- a/src/main/java/com/bonus/boot/manager/ca/im/service/impl/PayableServiceImpl.java +++ b/src/main/java/com/bonus/boot/manager/ca/im/service/impl/PayableServiceImpl.java @@ -592,4 +592,36 @@ public class PayableServiceImpl implements PayableService { IoUtil.close(out); } + /*System.err.println(payableBean); + LoginUser loginUser = UserUtil.getLoginUser(); + String username = loginUser.getUsername(); + String userId = dao.getIdByName(username); + payableBean.setCzy(userId); + if (payableBean.getId() != null && !payableBean.getId().isEmpty()){ + update(payableBean); + }else { + add(payableBean); + }*/ + + @Override + public int addPayable(PayableBean payableBean) { + LoginUser loginUser = UserUtil.getLoginUser(); + String username = loginUser.getUsername(); + String userId = dao.getIdByName(username); + payableBean.setCzy(userId); + String htmcid = dao.gethtmcid(payableBean); + payableBean.setHtmcid(htmcid); + int i = dao.getBean(payableBean); + if(i > 0){ + + }else{ + if(payableBean.getId() != null && !payableBean.getId().isEmpty()){ + dao.update(payableBean); + }else{ + dao.add(payableBean); + } + } + return i; + } + } diff --git a/src/main/resources/mappers/ca/PayableMapper.xml b/src/main/resources/mappers/ca/PayableMapper.xml index faebc7d..2f90d71 100644 --- a/src/main/resources/mappers/ca/PayableMapper.xml +++ b/src/main/resources/mappers/ca/PayableMapper.xml @@ -792,7 +792,7 @@ select id from ca_bm_pay_account_info where IS_ACTIVE = '1' - and name = #{accountName} + and account_number = #{accountName} + + \ No newline at end of file diff --git a/src/main/resources/static/pages/finance/addPayable.html b/src/main/resources/static/pages/finance/addPayable.html index 0c8216b..609bd91 100644 --- a/src/main/resources/static/pages/finance/addPayable.html +++ b/src/main/resources/static/pages/finance/addPayable.html @@ -36,7 +36,7 @@
-
@@ -93,7 +93,7 @@
-
@@ -357,10 +357,15 @@ contentType: "application/json; charset=utf-8", data : JSON.stringify(formData.field), success : function(data) { - parent.table.reload('menuTable'); - parent.layer.closeAll(); - top.layer.close(addLoadingMsg); //再执行关闭 - parent.layer.msg('成功', {icon: 1, time: 2000}); + console.log(data) + if (data.res == 1) { + parent.table.reload('menuTable'); + parent.layer.closeAll(); + top.layer.close(loadingMsg); //再执行关闭 + parent.layer.msg('成功', {icon: 1, time: 2000}); + }else{ + parent.layer.msg('每个月只有一个凭证号', {icon: 2, time: 2000}); + } }, }); }