purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给销售相关的单据接口增加销售人员的查询参数

Browse Source
This commit is contained in:
jishenghua
2025-06-17 23:32:23 +08:00
parent d5e535fbd6
commit c6f7b63e95
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
View File

@@ -93,9 +93,10 @@ public class DepotHeadController extends BaseController {
Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator")); Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator"));
Long depotId = StringUtil.parseStrLong(StringUtil.getInfo(search, "depotId")); Long depotId = StringUtil.parseStrLong(StringUtil.getInfo(search, "depotId"));
Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId")); Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId"));
String salesMan = StringUtil.getInfo(search, "salesMan");
String remark = StringUtil.getInfo(search, "remark"); String remark = StringUtil.getInfo(search, "remark");
List<DepotHeadVo4List> list = depotHeadService.select(type, subType, hasDebt, status, purchaseStatus, number, linkApply, linkNumber, List<DepotHeadVo4List> 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); return getDataTable(list);
} }

1
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
View File

@@ -34,6 +34,7 @@ public interface DepotHeadMapperEx {
@Param("depotId") Long depotId, @Param("depotId") Long depotId,
@Param("depotArray") String[] depotArray, @Param("depotArray") String[] depotArray,
@Param("accountId") Long accountId, @Param("accountId") Long accountId,
@Param("salesMan") String salesMan,
@Param("remark") String remark); @Param("remark") String remark);
List<MaterialsListVo> findMaterialsListMapByHeaderIdList( List<MaterialsListVo> findMaterialsListMapByHeaderIdList(

4
jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java
View File

@@ -100,7 +100,7 @@ public class DepotHeadService {
} }
public List<DepotHeadVo4List> select(String type, String subType, String hasDebt, String status, String purchaseStatus, String number, String linkApply, String linkNumber, public List<DepotHeadVo4List> 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<DepotHeadVo4List> list = new ArrayList<>(); List<DepotHeadVo4List> list = new ArrayList<>();
try{ try{
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
@@ -121,7 +121,7 @@ public class DepotHeadService {
PageUtils.startPage(); PageUtils.startPage();
list = depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, hasDebt, list = depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, hasDebt,
statusArray, purchaseStatusArray, number, linkApply, linkNumber, beginTime, endTime, 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) { if (null != list) {
List<Long> idList = new ArrayList<>(); List<Long> idList = new ArrayList<>();
List<String> numberList = new ArrayList<>(); List<String> numberList = new ArrayList<>();

3
jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
View File

@@ -153,6 +153,9 @@
and and
(ifnull(dh.discount_last_money,0)+ifnull(dh.other_money,0)-ifnull(dh.deposit,0)-abs(ifnull(dh.change_amount,0))=0) (ifnull(dh.discount_last_money,0)+ifnull(dh.other_money,0)-ifnull(dh.deposit,0)-abs(ifnull(dh.change_amount,0))=0)
</if> </if>
<if test="salesMan != null and salesMan !=''">
and FIND_IN_SET(#{salesMan}, dh.sales_man) > 0
</if>
<if test="remark != null and remark !=''"> <if test="remark != null and remark !=''">
<bind name="bindRemark" value="'%'+remark+'%'"/> <bind name="bindRemark" value="'%'+remark+'%'"/>
and (dh.remark like #{bindRemark} or di.remark like #{bindRemark}) and (dh.remark like #{bindRemark} or di.remark like #{bindRemark})