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

优化

This commit is contained in:
mashuai 2026-01-14 17:43:09 +08:00
parent 03e3493bdb
commit 54f9453f24
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/service/impl/DirectRotationImpl.java
View File

@ -585,9 +585,7 @@ public class DirectRotationImpl implements DirectRotationService {
details.setCreateTime(DateUtils.getNowDate());
details.setTypeId(Long.valueOf(applyInfo.getTypeId()));
// 保存退料详情
if (applyInfo.getIsClzUse()) {
result += materialBackInfoMapper.insertBackApplyDetails(details);
}
result += materialBackInfoMapper.insertBackApplyDetails(details);
}
}
// 保存退料详情数据 back_check_details
@ -742,8 +740,7 @@ public class DirectRotationImpl implements DirectRotationService {
record.setCreateTime(DateUtils.getNowDate());
record.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
record.setIsFinished(GlobalConstants.INT_1);
record.setPreNum(directApplyDetails.getDirectNum());
record.setAlNum(directApplyDetails.getDirectNum());
record.setOutNum(directApplyDetails.getDirectNum());
record.setParentId(materialLeaseApplyInfo.getId());
record.setTypeId(Long.valueOf(directApplyDetails.getTypeId()));
record.setCompanyId(companyId);

22
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
View File

@ -968,23 +968,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
sd.dept_name AS impUnitName,
bp.pro_center AS departName,
lod.id AS id,
lod.parent_id AS parentId,
csai.lease_id AS parentId,
mt.type_id AS typeId,
mt2.type_name AS maTypeName,
mt.type_name AS typeName,
mt.manage_type AS manageType,
mt.unit_name AS unitName,
SUM( lod.out_num ) AS outNum,
lod.remark AS remark,
SUM( csai.num ) AS outNum,
lai.create_time as leaseDate,
lod.create_time as outDate,
csai.create_time as outDate,
bt.unit_name as teamName,
bp.external_id as externalId,
bp.pro_id as proId,
bp.pro_name as projectName,
lai.lease_person as leasePerson,
su.nick_name as outPerson,
lai.create_by as outPerson,
lai.`code` as code,
bp.imp_unit as impUnit,
bt.bzz_idcard as idCard,
@ -995,20 +993,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
end as leaseStyle,
lai.sub_unit_name as subUnitName
FROM
clz_lease_out_details lod
LEFT JOIN ma_type mt ON lod.type_id = mt.type_id
clz_slt_agreement_info csai
LEFT JOIN ma_type mt ON csai.type_id = mt.type_id
AND mt.`level` = '4'
AND mt.del_flag = '0'
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
AND mt2.`level` = '3'
AND mt2.del_flag = '0'
LEFT JOIN clz_lease_apply_info lai ON lod.parent_id = lai.id
LEFT JOIN clz_lease_apply_info lai ON csai.lease_id = lai.id
LEFT JOIN bm_unit bt on lai.team_id = bt.unit_id
LEFT JOIN bm_project bp ON lai.project_id = bp.pro_id
LEFT JOIN sys_user su on su.user_id=lod.create_by
/*LEFT JOIN sys_user su on su.user_id=lod.create_by*/
LEFT JOIN sys_dept sd ON sd.dept_id = bp.imp_unit
WHERE
lod.is_finished = '1'
1 = 1
<if test="impUnitName != null and impUnitName != ''">
and sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
</if>
@ -1038,7 +1036,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt2.type_name like concat('%', #{keyWord}, '%') or
lai.`code` like concat('%', #{keyWord}, '%') or
lai.lease_person like concat('%', #{keyWord}, '%') or
su.nick_name like concat('%', #{keyWord}, '%') or
lai.create_by like concat('%', #{keyWord}, '%') or
bp.pro_name like concat('%', #{keyWord}, '%')
)
</if>