From fac8629f584bc0becef8e821d5e6adf59597bf4b Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Thu, 30 May 2024 23:17:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=AF=B9=E8=B4=A6=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=AC=A0=E6=AC=BE=E7=9A=84=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/DepotHeadController.java | 8 ++++--- .../datasource/mappers/DepotHeadMapperEx.java | 3 +++ .../service/depotHead/DepotHeadService.java | 19 +++++++++-------- .../erp/service/supplier/SupplierService.java | 2 +- .../mapper_xml/DepotHeadMapperEx.xml | 21 ++++++++++++++++--- 5 files changed, 37 insertions(+), 16 deletions(-) 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 bfd013e9..9849a838 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 @@ -308,6 +308,7 @@ public class DepotHeadController { * @param beginTime * @param endTime * @param organId + * @param hasDebt 1-有欠款 0-无欠款 * @param supplierType * @param request * @return @@ -319,6 +320,7 @@ public class DepotHeadController { @RequestParam("beginTime") String beginTime, @RequestParam("endTime") String endTime, @RequestParam(value = "organId", required = false) Integer organId, + @RequestParam(value = "hasDebt", required = false) Integer hasDebt, @RequestParam("supplierType") String supplierType, HttpServletRequest request) throws Exception{ BaseResponseInfo res = new BaseResponseInfo(); @@ -346,9 +348,9 @@ public class DepotHeadController { beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); List list = depotHeadService.getStatementAccount(beginTime, endTime, organId, organArray, - supplierType, type, subType,typeBack, subTypeBack, billType, (currentPage-1)*pageSize, pageSize); + hasDebt, supplierType, type, subType,typeBack, subTypeBack, billType, (currentPage-1)*pageSize, pageSize); int total = depotHeadService.getStatementAccountCount(beginTime, endTime, organId, organArray, - supplierType, type, subType,typeBack, subTypeBack, billType); + hasDebt, supplierType, type, subType,typeBack, subTypeBack, billType); for(DepotHeadVo4StatementAccount item: list) { //期初 = 起始期初金额+上期欠款金额-上期退货的欠款金额-上期收付款 BigDecimal preNeed = item.getBeginNeed().add(item.getPreDebtMoney()).subtract(item.getPreReturnDebtMoney()).subtract(item.getPreBackMoney()); @@ -363,7 +365,7 @@ public class DepotHeadController { map.put("rows", list); map.put("total", total); List totalPayList = depotHeadService.getStatementAccountTotalPay(beginTime, endTime, organId, organArray, - supplierType, type, subType, typeBack, subTypeBack, billType); + hasDebt, supplierType, type, subType, typeBack, subTypeBack, billType); if(totalPayList.size()>0) { DepotHeadVo4StatementAccount totalPayItem = totalPayList.get(0); BigDecimal firstMoney = BigDecimal.ZERO; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java index acf4a179..9302049a 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java @@ -199,6 +199,7 @@ public interface DepotHeadMapperEx { @Param("endTime") String endTime, @Param("organId") Integer organId, @Param("organArray") String[] organArray, + @Param("hasDebt") Integer hasDebt, @Param("supplierType") String supplierType, @Param("type") String type, @Param("subType") String subType, @@ -213,6 +214,7 @@ public interface DepotHeadMapperEx { @Param("endTime") String endTime, @Param("organId") Integer organId, @Param("organArray") String[] organArray, + @Param("hasDebt") Integer hasDebt, @Param("supplierType") String supplierType, @Param("type") String type, @Param("subType") String subType, @@ -225,6 +227,7 @@ public interface DepotHeadMapperEx { @Param("endTime") String endTime, @Param("organId") Integer organId, @Param("organArray") String[] organArray, + @Param("hasDebt") Integer hasDebt, @Param("supplierType") String supplierType, @Param("type") String type, @Param("subType") String subType, 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 b01165fc..8be0902e 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 @@ -848,33 +848,34 @@ public class DepotHeadService { } public List getStatementAccount(String beginTime, String endTime, Integer organId, String [] organArray, - String supplierType, String type, String subType, String typeBack, String subTypeBack, String billType, Integer offset, Integer rows) { + Integer hasDebt, String supplierType, String type, String subType, String typeBack, + String subTypeBack, String billType, Integer offset, Integer rows) { List list = null; try{ - list = depotHeadMapperEx.getStatementAccount(beginTime, endTime, organId, organArray, supplierType, type, subType,typeBack, subTypeBack, billType, offset, rows); + list = depotHeadMapperEx.getStatementAccount(beginTime, endTime, organId, organArray, hasDebt, supplierType, type, subType,typeBack, subTypeBack, billType, offset, rows); } catch(Exception e){ JshException.readFail(logger, e); } return list; } - public int getStatementAccountCount(String beginTime, String endTime, Integer organId, - String [] organArray, String supplierType, String type, String subType, String typeBack, String subTypeBack, String billType) { + public int getStatementAccountCount(String beginTime, String endTime, Integer organId, String [] organArray, + Integer hasDebt, String supplierType, String type, String subType, String typeBack, String subTypeBack, String billType) { int result = 0; try{ - result = depotHeadMapperEx.getStatementAccountCount(beginTime, endTime, organId, organArray, supplierType, type, subType,typeBack, subTypeBack, billType); + result = depotHeadMapperEx.getStatementAccountCount(beginTime, endTime, organId, organArray, hasDebt, supplierType, type, subType,typeBack, subTypeBack, billType); } catch(Exception e){ JshException.readFail(logger, e); } return result; } - public List getStatementAccountTotalPay(String beginTime, String endTime, Integer organId, - String [] organArray, String supplierType, - String type, String subType, String typeBack, String subTypeBack, String billType) { + public List getStatementAccountTotalPay(String beginTime, String endTime, Integer organId, String [] organArray, + Integer hasDebt, String supplierType, String type, String subType, + String typeBack, String subTypeBack, String billType) { List list = null; try{ - list = depotHeadMapperEx.getStatementAccountTotalPay(beginTime, endTime, organId, organArray, supplierType, type, subType,typeBack, subTypeBack, billType); + list = depotHeadMapperEx.getStatementAccountTotalPay(beginTime, endTime, organId, organArray, hasDebt, supplierType, type, subType,typeBack, subTypeBack, billType); } catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java index 2581efbf..f6b21eaa 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java @@ -126,7 +126,7 @@ public class SupplierService { billType = "收款"; } List saList = depotHeadService.getStatementAccount(beginTime, endTime, supplierId, null, - supplierType, inOutType, subType, typeBack, subTypeBack, billType, null, null); + 1, supplierType, inOutType, subType, typeBack, subTypeBack, billType, null, null); if(saList.size()>0) { DepotHeadVo4StatementAccount item = saList.get(0); //期初 = 起始期初金额+上期欠款金额-上期退货的欠款金额-上期收付款 diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 06cc87e4..c80c0ebc 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -900,7 +900,12 @@ ) and ifnull(s.delete_flag,'0') !='1') tb - where begin_need+preDebtMoney-preReturnDebtMoney-preBackMoney+debtMoney-returnDebtMoney-backMoney!=0 + + where begin_need+preDebtMoney-preReturnDebtMoney-preBackMoney+debtMoney-returnDebtMoney-backMoney!=0 + + + where begin_need+preDebtMoney-preReturnDebtMoney-preBackMoney+debtMoney-returnDebtMoney-backMoney=0 + order by begin_need+preDebtMoney-preReturnDebtMoney-preBackMoney+debtMoney-returnDebtMoney-backMoney desc limit #{offset},#{rows} @@ -970,7 +975,12 @@ ) and ifnull(s.delete_flag,'0') !='1') tb - where begin_need+preDebtMoney-preReturnDebtMoney-preBackMoney+debtMoney-returnDebtMoney-backMoney!=0 + + where begin_need+preDebtMoney-preReturnDebtMoney-preBackMoney+debtMoney-returnDebtMoney-backMoney!=0 + + + where begin_need+preDebtMoney-preReturnDebtMoney-preBackMoney+debtMoney-returnDebtMoney-backMoney=0 +