bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退料申请表数据问题修改

This commit is contained in:
liang.chao 2024-04-02 13:57:55 +08:00
parent 8f541d2e3d
commit 1c7b74efc9
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -229,7 +229,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
if (record.getOutNum() == null || record.getOutNum() < outNum) { if (record.getOutNum() == null || record.getOutNum() < outNum) {
record.setOutNum(0.00); record.setOutNum(0.00);
} }
//先判断(ma_type 设备规格表)中的库存够不够出库的 //判断(ma_type 设备规格表)中的库存够不够出库的
MaType maType = leaseOutDetailsMapper.selectByTypeId(record); MaType maType = leaseOutDetailsMapper.selectByTypeId(record);
if (maType != null) { if (maType != null) {
if (maType.getNum() == null || maType.getNum().compareTo(BigDecimal.valueOf(record.getOutNum())) < 0) { if (maType.getNum() == null || maType.getNum().compareTo(BigDecimal.valueOf(record.getOutNum())) < 0) {

5
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
View File

@ -196,10 +196,9 @@ public class TmTaskServiceImpl implements TmTaskService {
public int updateLeaseTaskAuditInfoCq(TmTask record) { public int updateLeaseTaskAuditInfoCq(TmTask record) {
int result = 0; int result = 0;
if (StringUtils.isNotNull(record)) { if (StringUtils.isNotNull(record)) {
// 内部审核 // 先修改任务表
// 管理员登录时审核
result += tmTaskMapper.updateTmTaskAuditStatus(record); result += tmTaskMapper.updateTmTaskAuditStatus(record);
// 分公司审核
// 再审核领料任务信息表 // 再审核领料任务信息表
List<LeaseApplyInfo> leaseApplyInfoList = record.getLeaseApplyInfoList(); List<LeaseApplyInfo> leaseApplyInfoList = record.getLeaseApplyInfoList();
if (CollUtil.isNotEmpty(leaseApplyInfoList)) { if (CollUtil.isNotEmpty(leaseApplyInfoList)) {

4
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -932,7 +932,7 @@
and tt.task_status = #{taskStatus} and tt.task_status = #{taskStatus}
</if> </if>
GROUP BY lai.id GROUP BY lai.id
ORDER BY tt.task_status,tt.create_time ORDER BY tt.task_status,tt.create_time desc
</select> </select>
<select id="getLeaseDetailByParentId" resultType="com.bonus.sgzb.app.domain.TmTask"> <select id="getLeaseDetailByParentId" resultType="com.bonus.sgzb.app.domain.TmTask">
SELECT SELECT
@ -961,7 +961,7 @@
and mtk.user_id = #{userId} and mtk.user_id = #{userId}
</if> </if>
<if test="userName != null and userName != ''"> <if test="userName != null and userName != ''">
and su.user_name = #{userName} and su.user_name like concat('%', #{userName}, '%')
</if> </if>
<if test="typeId != null and typeId != ''"> <if test="typeId != null and typeId != ''">
and lad.type_id = #{typeId} and lad.type_id = #{typeId}