From 3801dd8202888667f0d9b2a87e6c3644ceebfaee Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Tue, 25 Feb 2025 22:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=94=B6=E5=85=A5=E5=8D=95=E5=92=8C?= =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=8D=95=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=94=B6=E6=94=AF=E9=A1=B9=E7=9B=AE=E7=9A=84=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsh/erp/controller/AccountHeadController.java | 3 ++- .../jsh/erp/datasource/mappers/AccountHeadMapperEx.java | 6 ++++-- .../main/java/com/jsh/erp/service/AccountHeadService.java | 8 ++++---- .../src/main/resources/mapper_xml/AccountHeadMapperEx.xml | 6 ++++++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountHeadController.java index 99729f65f..9455500ff 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountHeadController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountHeadController.java @@ -68,8 +68,9 @@ public class AccountHeadController extends BaseController { String status = StringUtil.getInfo(search, "status"); String remark = StringUtil.getInfo(search, "remark"); String number = StringUtil.getInfo(search, "number"); + Long inOutItemId = StringUtil.parseStrLong(StringUtil.getInfo(search, "inOutItemId")); List list = accountHeadService.select(type, billNo, beginTime, endTime, organId, creator, - handsPersonId, accountId, status, remark, number); + handsPersonId, accountId, status, remark, number, inOutItemId); return getDataTable(list); } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java index 21b4ca8bc..6018ddc4e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java @@ -24,7 +24,8 @@ public interface AccountHeadMapperEx { @Param("accountId") Long accountId, @Param("status") String status, @Param("remark") String remark, - @Param("number") String number); + @Param("number") String number, + @Param("inOutItemId") Long inOutItemId); Long countsByAccountHead( @Param("type") String type, @@ -38,7 +39,8 @@ public interface AccountHeadMapperEx { @Param("accountId") Long accountId, @Param("status") String status, @Param("remark") String remark, - @Param("number") String number); + @Param("number") String number, + @Param("inOutItemId") Long inOutItemId); List getDetailByNumber( @Param("billNo") String billNo); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/AccountHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/AccountHeadService.java index 77bb7631e..3d588d212 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/AccountHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/AccountHeadService.java @@ -90,7 +90,7 @@ public class AccountHeadService { public List select(String type, String billNo, String beginTime, String endTime, Long organId, Long creator, Long handsPersonId, Long accountId, String status, - String remark, String number) throws Exception{ + String remark, String number, Long inOutItemId) throws Exception{ List list = new ArrayList<>(); try{ String [] creatorArray = getCreatorArray(); @@ -98,7 +98,7 @@ public class AccountHeadService { endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); PageUtils.startPage(); list = accountHeadMapperEx.selectByConditionAccountHead(type, creatorArray, billNo, - beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, number); + beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, number, inOutItemId); if (null != list) { for (AccountHeadVo4ListEx ah : list) { if(ah.getChangeAmount() != null) { @@ -132,14 +132,14 @@ public class AccountHeadService { public Long countAccountHead(String type, String billNo, String beginTime, String endTime, Long organId, Long creator, Long handsPersonId, Long accountId, String status, - String remark, String number) throws Exception{ + String remark, String number, Long inOutItemId) throws Exception{ Long result=null; try{ String [] creatorArray = getCreatorArray(); beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); result = accountHeadMapperEx.countsByAccountHead(type, creatorArray, billNo, - beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, number); + beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, number, inOutItemId); } catch(Exception e){ JshException.readFail(logger, e); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml index 72c0eca79..f56e0804b 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml @@ -67,6 +67,9 @@ and dh.number like #{bindNumber} + + and ai.in_out_item_id=#{inOutItemId} + and ifnull(ah.delete_flag,'0') !='1' order by ah.id desc @@ -126,6 +129,9 @@ and dh.number like #{bindNumber} + + and ai.in_out_item_id=#{inOutItemId} + and ifnull(ah.delete_flag,'0') !='1') tb