From 88985562aab3ff23b0c054b7fa8ef5dcea65338b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Thu, 17 Nov 2022 22:47:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E5=8E=9F?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2=E5=85=B3=E8=81=94=E7=9A=84?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/DepotHeadController.java | 24 +++++++++++++++++++ .../erp/datasource/vo/DepotHeadVo4List.java | 12 ++++++++++ .../service/depotHead/DepotHeadService.java | 21 ++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java index 776d88ea..ab4e2ca2 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -373,6 +373,30 @@ public class DepotHeadController { return res; } + /** + * 根据原单号查询关联的单据列表 + * @param number + * @param request + * @return + */ + @GetMapping(value = "/getBillListByLinkNumber") + @ApiOperation(value = "根据原单号查询关联的单据列表") + public BaseResponseInfo getBillListByLinkNumber(@RequestParam("number") String number, + HttpServletRequest request)throws Exception { + BaseResponseInfo res = new BaseResponseInfo(); + DepotHead dh = new DepotHead(); + try { + List list = depotHeadService.getBillListByLinkNumber(number); + res.code = 200; + res.data = list; + } catch(Exception e){ + e.printStackTrace(); + res.code = 500; + res.data = "获取数据失败"; + } + return res; + } + /** * 新增单据主表及单据子表信息 * @param body diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java index c47c28a5..986597bc 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java @@ -47,6 +47,10 @@ public class DepotHeadVo4List extends DepotHead{ * 是否有付款单或收款单 */ private Boolean hasFinancialFlag; + /** + * 是否有退款单 + */ + private Boolean hasBackFlag; public String getProjectName() { return projectName; @@ -199,4 +203,12 @@ public class DepotHeadVo4List extends DepotHead{ public void setHasFinancialFlag(Boolean hasFinancialFlag) { this.hasFinancialFlag = hasFinancialFlag; } + + public Boolean getHasBackFlag() { + return hasBackFlag; + } + + public void setHasBackFlag(Boolean hasBackFlag) { + this.hasBackFlag = hasBackFlag; + } } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index dd7319dc..f10bbc01 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -156,6 +156,9 @@ public class DepotHeadService { //是否有付款单或收款单 int financialBillNoSize = accountHeadService.getFinancialBillNoByBillId(dh.getId()).size(); dh.setHasFinancialFlag(financialBillNoSize>0); + //是否有退款单 + int billListSize = getBillListByLinkNumber(dh.getNumber()).size(); + dh.setHasBackFlag(billListSize>0); if(StringUtil.isNotEmpty(dh.getSalesMan())) { dh.setSalesManStr(personService.getPersonByMapAndIds(personMap,dh.getSalesMan())); } @@ -730,6 +733,12 @@ public class DepotHeadService { if(dh.getTotalPrice() != null) { dh.setTotalPrice(dh.getTotalPrice().abs()); } + //是否有付款单或收款单 + int financialBillNoSize = accountHeadService.getFinancialBillNoByBillId(dh.getId()).size(); + dh.setHasFinancialFlag(financialBillNoSize>0); + //是否有退款单 + int billListSize = getBillListByLinkNumber(dh.getNumber()).size(); + dh.setHasBackFlag(billListSize>0); if(StringUtil.isNotEmpty(dh.getSalesMan())) { dh.setSalesManStr(personService.getPersonByMapAndIds(personMap,dh.getSalesMan())); } @@ -759,6 +768,18 @@ public class DepotHeadService { return depotHeadMapper.selectByExample(example); } + /** + * 根据原单号查询关联的单据列表 + * @param linkNumber + * @return + * @throws Exception + */ + public List getBillListByLinkNumber(String linkNumber)throws Exception { + DepotHeadExample example = new DepotHeadExample(); + example.createCriteria().andLinkNumberEqualTo(linkNumber).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); + return depotHeadMapper.selectByExample(example); + } + /** * 新增单据主表及单据子表信息 * @param beanJson