bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jsk 领料退料查询 完善

This commit is contained in:
jiask 2026-01-14 22:17:29 +08:00
parent 589ad3b135
commit db80268cb9
4 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyQuery.java
View File

@ -53,7 +53,7 @@ public class LeaseApplyQuery extends BaseEntity{
@ApiModelProperty(value = "规格型号")
@Excel(name = "规格型号")
private String modelName;
private String modelType;
@ApiModelProperty(value = "出库数量")
@Excel(name = "出库数量")

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/vo/BackApplyQuery.java
View File

@ -58,7 +58,7 @@ public class BackApplyQuery extends BaseEntity {
@ApiModelProperty(value = "规格型号")
@Excel(name = "规格型号")
private String modelName;
private String modelType;
@ApiModelProperty(value = "退料数量")
@Excel(name = "退料数量")

13
bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
View File

@ -1969,7 +1969,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.pro_name as proName,
bc.`code` as code,
mt2.type_name as typeName,
mt.type_name as modelName,
mt.type_name as modelType,
bcd.back_num as backNum,
bcd.create_time as inTime,
bc.print_status,
@ -1997,10 +1997,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="proName != null and proName != ''">
and bp.pro_name like concat('%', #{proName} ,'%')
</if>
<if test="modelType != null and modelType != ''">
and mt.type_name like concat('%', #{modelType} ,'%')
</if>
<if test="typeName != null and typeName != ''">
and mt2.type_name like concat('%', #{typeName} ,'%')
</if>
<if test="jijuType != null and jijuType != ''">
and mt.jiju_type= #{jijuType}
</if>
<if test="keyWord != null and keyWord != ''">
and ( bp.pro_name like concat('%', #{keyWord} ,'%')
or sd.dept_name like concat('%', #{keyWord} ,'%')
or bai.agreement_code like concat('%', #{keyWord} ,'%')
or mt2.type_name like concat('%', #{keyWord} ,'%')
or bc.`code` like concat('%', #{keyWord} ,'%')
or mt.type_name like concat('%', #{keyWord} ,'%'))
</if>
</select>

26
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml
View File

@ -1375,7 +1375,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt on lod.type_id = mt.type_id
LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
LEFT JOIN ma_machine mm on mm.ma_id = lod.ma_id
WHERE mt.jiju_type =1 and lod.publish_task is null
WHERE lod.publish_task is null
<if test="startTime != null and startTime != ''">
and SUBSTR(lod.create_time,1,10)>=#{startTime}
</if>
@ -1391,9 +1391,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="leasePerson != null and leasePerson != ''">
and lai.lease_person like concat('%', #{leasePerson} ,'%')
</if>
<if test="modelType != null and modelType != ''">
and mt.type_name like concat('%', #{modelType} ,'%')
</if>
<if test="typeName != null and typeName != ''">
and mt2.type_name like concat('%', #{typeName} ,'%')
</if>
<if test="jijuType != null and jijuType != ''">
and mt.jiju_type= #{jijuType}
</if>
<if test="keyWord != null and keyWord != ''">
and ( bp2.pro_name like concat('%', #{keyWord} ,'%')
or sd2.dept_name like concat('%', #{keyWord} ,'%')
or bai.agreement_code like concat('%', #{keyWord} ,'%')
or lai.`code` like concat('%', #{keyWord} ,'%')
or mm.ma_code like concat('%', #{keyWord} ,'%')
or mt2.type_name like concat('%', #{keyWord} ,'%')
or mt.type_name like concat('%', #{keyWord} ,'%'))
</if>
@ -1442,9 +1454,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="leasePerson != null and leasePerson != ''">
and lpd.lease_person like concat('%', #{leasePerson} ,'%')
</if>
<if test="modelType != null and modelType != ''">
and mt.type_name like concat('%', #{modelType} ,'%')
</if>
<if test="typeName != null and typeName != ''">
and mt2.type_name like concat('%', #{typeName} ,'%')
</if>
<if test="jijuType != null and jijuType != ''">
and mt.jiju_type= #{jijuType}
</if>
<if test="keyWord != null and keyWord != ''">
and ( bp2.pro_name like concat('%', #{keyWord} ,'%')
or sd2.dept_name like concat('%', #{keyWord} ,'%')
or bai.agreement_code like concat('%', #{keyWord} ,'%')
or lai.`code` like concat('%', #{keyWord} ,'%')
or mm.ma_code like concat('%', #{keyWord} ,'%')
or mt2.type_name like concat('%', #{keyWord} ,'%')
or mt.type_name like concat('%', #{keyWord} ,'%'))
</if>