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 535ba422..7a6090e1 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 @@ -93,9 +93,10 @@ public class DepotHeadController extends BaseController { Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator")); Long depotId = StringUtil.parseStrLong(StringUtil.getInfo(search, "depotId")); Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId")); + String salesMan = StringUtil.getInfo(search, "salesMan"); String remark = StringUtil.getInfo(search, "remark"); List list = depotHeadService.select(type, subType, hasDebt, status, purchaseStatus, number, linkApply, linkNumber, - beginTime, endTime, materialParam, organId, creator, depotId, accountId, remark); + beginTime, endTime, materialParam, organId, creator, depotId, accountId, salesMan, remark); return getDataTable(list); } 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 a5d800c0..7db547a5 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 @@ -34,6 +34,7 @@ public interface DepotHeadMapperEx { @Param("depotId") Long depotId, @Param("depotArray") String[] depotArray, @Param("accountId") Long accountId, + @Param("salesMan") String salesMan, @Param("remark") String remark); List findMaterialsListMapByHeaderIdList( diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java index 59237b9b..0cdb76f1 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java @@ -100,7 +100,7 @@ public class DepotHeadService { } public List select(String type, String subType, String hasDebt, String status, String purchaseStatus, String number, String linkApply, String linkNumber, - String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId, Long accountId, String remark) throws Exception { + String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId, Long accountId, String salesMan, String remark) throws Exception { List list = new ArrayList<>(); try{ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); @@ -121,7 +121,7 @@ public class DepotHeadService { PageUtils.startPage(); list = depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, hasDebt, statusArray, purchaseStatusArray, number, linkApply, linkNumber, beginTime, endTime, - materialParam, organId, organArray, creator, depotId, depotArray, accountId, remark); + materialParam, organId, organArray, creator, depotId, depotArray, accountId, salesMan, remark); if (null != list) { List idList = new ArrayList<>(); List numberList = new ArrayList<>(); diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 08f78b71..cb1c1fbd 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -153,6 +153,9 @@ and (ifnull(dh.discount_last_money,0)+ifnull(dh.other_money,0)-ifnull(dh.deposit,0)-abs(ifnull(dh.change_amount,0))=0) + + and FIND_IN_SET(#{salesMan}, dh.sales_man) > 0 + and (dh.remark like #{bindRemark} or di.remark like #{bindRemark})