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

Merge branch 'dev' into test

This commit is contained in:
1539530615@qq.com 2024-01-29 17:59:12 +08:00
parent 50740168aa 2e4972279a
commit e1dc6d5512
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
View File

@ -398,6 +398,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ( SELECT * FROM ma_type_file WHERE file_type = '1' ) mtf ON m.type_id = mtf.type_id LEFT JOIN ( SELECT * FROM ma_type_file WHERE file_type = '1' ) mtf ON m.type_id = mtf.type_id
WHERE WHERE
m.del_flag = '0' m.del_flag = '0'
GROUP BY m.parent_id
) mt on mt.parent_id = m.type_id ) mt on mt.parent_id = m.type_id
<where> <where>
m.level != 4 and m.del_flag = '0' m.level != 4 and m.del_flag = '0'

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
View File

@ -285,7 +285,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
companyId = repairDetailList.get(0).getCompanyId(); companyId = repairDetailList.get(0).getCompanyId();
} }
taskCode = purchaseCodeRule("WX",41); taskCode = purchaseCodeRule("WX",41);
taskStatus = 42; taskStatus = 43;
taskType = 41; taskType = 41;
long inputTaskId = genTask(taskCode,taskType,taskStatus,tmTaskAgreement,companyId); long inputTaskId = genTask(taskCode,taskType,taskStatus,tmTaskAgreement,companyId);
for (RepairAuditDetails inputDetails : repairDetailList) { for (RepairAuditDetails inputDetails : repairDetailList) {

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
View File

@ -201,7 +201,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
parentId = Math.toIntExact(backList.get(0).getParentId()); parentId = Math.toIntExact(backList.get(0).getParentId());
} }
taskCode = purchaseCodeRule("T",36); taskCode = purchaseCodeRule("T",36);
taskStatus = 39; taskStatus = 38;
taskType = 36; taskType = 36;
long backTaskId = genTask(taskCode,taskType,taskStatus,tmTaskAgreement,companyId); long backTaskId = genTask(taskCode,taskType,taskStatus,tmTaskAgreement,companyId);
BackApplyInfo backApplyInfo = scrapApplyDetailsMapper.getBackApplyInfo(parentId); BackApplyInfo backApplyInfo = scrapApplyDetailsMapper.getBackApplyInfo(parentId);