From a10fabb7efaf05df476b057b822e2ed41c1f10f7 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, 25 Aug 2022 22:24:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=87=BA=E5=85=A5=E5=BA=93=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E7=A8=8E=E7=8E=87?= =?UTF-8?q?=E5=92=8C=E7=A8=8E=E9=A2=9D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/DepotHeadController.java | 4 +-- .../datasource/mappers/DepotHeadMapperEx.java | 4 +-- .../datasource/vo/DepotHeadVo4InDetail.java | 30 +++++++++++++++++++ .../service/depotHead/DepotHeadService.java | 8 ++--- .../mapper_xml/DepotHeadMapperEx.xml | 13 +++++--- 5 files changed, 47 insertions(+), 12 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 4776cc14..fad57489 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 @@ -126,9 +126,9 @@ public class DepotHeadController { String [] organArray = depotHeadService.getOrganArray(subType, ""); beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - List list = depotHeadService.findByAll(beginTime, endTime, type, creatorArray, organArray, + List list = depotHeadService.findInDetail(beginTime, endTime, type, creatorArray, organArray, StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark, (currentPage-1)*pageSize, pageSize); - int total = depotHeadService.findByAllCount(beginTime, endTime, type, creatorArray, organArray, + int total = depotHeadService.findInDetailCount(beginTime, endTime, type, creatorArray, organArray, StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark); map.put("total", total); //存放数据json数组 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 8fc82875..070a5d5a 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 @@ -61,7 +61,7 @@ public interface DepotHeadMapperEx { String findMaterialsListByHeaderId( @Param("id") Long id); - List findByAll( + List findInDetail( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("type") String type, @@ -75,7 +75,7 @@ public interface DepotHeadMapperEx { @Param("offset") Integer offset, @Param("rows") Integer rows); - int findByAllCount( + int findInDetailCount( @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("type") String type, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java index dc109c5a..389a5f66 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java @@ -26,6 +26,12 @@ public class DepotHeadVo4InDetail { private BigDecimal AllPrice; + private BigDecimal taxRate; + + private BigDecimal taxMoney; + + private BigDecimal taxLastMoney; + private String SName; private String DName; @@ -116,6 +122,30 @@ public class DepotHeadVo4InDetail { AllPrice = allPrice; } + public BigDecimal getTaxRate() { + return taxRate; + } + + public void setTaxRate(BigDecimal taxRate) { + this.taxRate = taxRate; + } + + public BigDecimal getTaxMoney() { + return taxMoney; + } + + public void setTaxMoney(BigDecimal taxMoney) { + this.taxMoney = taxMoney; + } + + public BigDecimal getTaxLastMoney() { + return taxLastMoney; + } + + public void setTaxLastMoney(BigDecimal taxLastMoney) { + this.taxLastMoney = taxLastMoney; + } + public String getSName() { return SName; } 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 aa7882db..c108abe0 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 @@ -486,24 +486,24 @@ public class DepotHeadService { return result; } - public List findByAll(String beginTime, String endTime, String type, String [] creatorArray, + public List findInDetail(String beginTime, String endTime, String type, String [] creatorArray, String [] organArray, String materialParam, List depotList, Integer oId, String number, String remark, Integer offset, Integer rows) throws Exception{ List list = null; try{ - list =depotHeadMapperEx.findByAll(beginTime, endTime, type, creatorArray, organArray, materialParam, depotList, oId, number, remark, offset, rows); + list =depotHeadMapperEx.findInDetail(beginTime, endTime, type, creatorArray, organArray, materialParam, depotList, oId, number, remark, offset, rows); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public int findByAllCount(String beginTime, String endTime, String type, String [] creatorArray, + public int findInDetailCount(String beginTime, String endTime, String type, String [] creatorArray, String [] organArray, String materialParam, List depotList, Integer oId, String number, String remark) throws Exception{ int result = 0; try{ - result =depotHeadMapperEx.findByAllCount(beginTime, endTime, type, creatorArray, organArray, materialParam, depotList, oId, number, remark); + result =depotHeadMapperEx.findInDetailCount(beginTime, endTime, type, creatorArray, organArray, materialParam, depotList, oId, number, remark); }catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 2aa216fe..5f3cccfc 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -21,6 +21,9 @@ + + + @@ -236,9 +239,11 @@ and ifnull(jsh_depot_item.delete_flag,'0') !='1' - + select dh.number,me.bar_code, m.`name` MName,m.model,m.standard,di.unit_price,di.material_unit as mUnit, + di.oper_number,di.all_price, ifnull(di.tax_rate,0) tax_rate, ifnull(di.tax_money,0) tax_money, ifnull(di.tax_last_money,0) tax_last_money, + s.supplier SName,d.dName DName, date_format(dh.oper_time, '%Y-%m-%d') OperTime, concat(dh.sub_type,dh.type) as NewType, + concat_ws(' ',dh.remark,di.remark) as newRemark from jsh_depot_head dh left join jsh_depot_item di on di.header_id=dh.id and ifnull(di.delete_flag,'0') !='1' left join jsh_material m on m.id=di.material_id and ifnull(m.delete_flag,'0') !='1' @@ -292,7 +297,7 @@ - select count(1) from jsh_depot_head dh left join jsh_depot_item di on di.header_id=dh.id and ifnull(di.delete_flag,'0') !='1'