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

给入库明细增加操作人的查询条件

Browse Source
This commit is contained in:
季圣华
2023-06-23 17:32:20 +08:00
parent 989a38c768
commit 8111729fd8
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,6 +108,7 @@ public class DepotHeadController {
@RequestParam("endTime") String endTime, @RequestParam("endTime") String endTime,
@RequestParam(value = "roleType", required = false) String roleType, @RequestParam(value = "roleType", required = false) String roleType,
@RequestParam("type") String type, @RequestParam("type") String type,
@RequestParam("creator") Long creator,
@RequestParam("remark") String remark, @RequestParam("remark") String remark,
HttpServletRequest request)throws Exception { HttpServletRequest request)throws Exception {
BaseResponseInfo res = new BaseResponseInfo(); BaseResponseInfo res = new BaseResponseInfo();
@@ -132,9 +133,9 @@ public class DepotHeadController {
endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
Boolean forceFlag = systemConfigService.getForceApprovalFlag(); Boolean forceFlag = systemConfigService.getForceApprovalFlag();
List<DepotHeadVo4InDetail> list = depotHeadService.findInOutDetail(beginTime, endTime, type, creatorArray, organArray, forceFlag, List<DepotHeadVo4InDetail> list = depotHeadService.findInOutDetail(beginTime, endTime, type, creatorArray, organArray, forceFlag,
StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark, (currentPage-1)*pageSize, pageSize); StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), creator, remark, (currentPage-1)*pageSize, pageSize);
int total = depotHeadService.findInOutDetailCount(beginTime, endTime, type, creatorArray, organArray, forceFlag, int total = depotHeadService.findInOutDetailCount(beginTime, endTime, type, creatorArray, organArray, forceFlag,
StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark); StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), creator, remark);
map.put("total", total); map.put("total", total);
//存放数据json数组 //存放数据json数组
if (null != list) { if (null != list) {

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

@@ -74,6 +74,7 @@ public interface DepotHeadMapperEx {
@Param("depotList") List<Long> depotList, @Param("depotList") List<Long> depotList,
@Param("oId") Integer oId, @Param("oId") Integer oId,
@Param("number") String number, @Param("number") String number,
@Param("creator") Long creator,
@Param("remark") String remark, @Param("remark") String remark,
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
@@ -89,6 +90,7 @@ public interface DepotHeadMapperEx {
@Param("depotList") List<Long> depotList, @Param("depotList") List<Long> depotList,
@Param("oId") Integer oId, @Param("oId") Integer oId,
@Param("number") String number, @Param("number") String number,
@Param("creator") Long creator,
@Param("remark") String remark); @Param("remark") String remark);
List<DepotHeadVo4InOutMCount> findInOutMaterialCount( List<DepotHeadVo4InOutMCount> findInOutMaterialCount(

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

@@ -624,10 +624,11 @@ public class DepotHeadService {
public List<DepotHeadVo4InDetail> findInOutDetail(String beginTime, String endTime, String type, String [] creatorArray, public List<DepotHeadVo4InDetail> findInOutDetail(String beginTime, String endTime, String type, String [] creatorArray,
String [] organArray, Boolean forceFlag, String materialParam, List<Long> depotList, Integer oId, String number, String [] organArray, Boolean forceFlag, String materialParam, List<Long> depotList, Integer oId, String number,
String remark, Integer offset, Integer rows) throws Exception{ Long creator, String remark, Integer offset, Integer rows) throws Exception{
List<DepotHeadVo4InDetail> list = null; List<DepotHeadVo4InDetail> list = null;
try{ try{
list =depotHeadMapperEx.findInOutDetail(beginTime, endTime, type, creatorArray, organArray, forceFlag, materialParam, depotList, oId, number, remark, offset, rows); list =depotHeadMapperEx.findInOutDetail(beginTime, endTime, type, creatorArray, organArray, forceFlag,
materialParam, depotList, oId, number, creator, remark, offset, rows);
}catch(Exception e){ }catch(Exception e){
JshException.readFail(logger, e); JshException.readFail(logger, e);
} }
@@ -636,10 +637,11 @@ public class DepotHeadService {
public int findInOutDetailCount(String beginTime, String endTime, String type, String [] creatorArray, public int findInOutDetailCount(String beginTime, String endTime, String type, String [] creatorArray,
String [] organArray, Boolean forceFlag, String materialParam, List<Long> depotList, Integer oId, String number, String [] organArray, Boolean forceFlag, String materialParam, List<Long> depotList, Integer oId, String number,
String remark) throws Exception{ Long creator, String remark) throws Exception{
int result = 0; int result = 0;
try{ try{
result =depotHeadMapperEx.findInOutDetailCount(beginTime, endTime, type, creatorArray, organArray, forceFlag, materialParam, depotList, oId, number, remark); result =depotHeadMapperEx.findInOutDetailCount(beginTime, endTime, type, creatorArray, organArray, forceFlag,
materialParam, depotList, oId, number, creator, remark);
}catch(Exception e){ }catch(Exception e){
JshException.readFail(logger, e); JshException.readFail(logger, e);
} }

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

@@ -324,6 +324,9 @@
<bind name="bindKey" value="'%'+materialParam+'%'"/> <bind name="bindKey" value="'%'+materialParam+'%'"/>
and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
</if> </if>
<if test="creator != null">
and dh.creator=#{creator}
</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})
@@ -382,6 +385,9 @@
<bind name="bindKey" value="'%'+materialParam+'%'"/> <bind name="bindKey" value="'%'+materialParam+'%'"/>
and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey}) and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
</if> </if>
<if test="creator != null">
and dh.creator=#{creator}
</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})