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

bug修复

This commit is contained in:
赵福海 2024-06-04 15:41:08 +08:00
parent 351bcbfb12
commit 24b6c7be6e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,11 +247,11 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
if (scrapNumList.get(0).getCompanyId() != null) {
companyId = scrapNumList.get(0).getCompanyId();
}
taskCode = purchaseCodeRule(TaskTypeConstants.YBF, TaskTypeEnum.REPAIR_TO_BE_SCRAPPED.getCode());
taskCode = purchaseCodeRule(TaskTypeConstants.BF, TaskTypeEnum.SCRAP_TASK.getCode());
/*taskStatus = 58;
taskType = 57;*/
//创建报废任务
long scrapTaskId = genTask(taskCode, TaskTypeEnum.REPAIR_TO_BE_SCRAPPED.getCode(), Integer.parseInt(TaskStatusEnum.PENDING_REVIEW.getCode()), tmTaskAgreement, companyId);
long scrapTaskId = genTask(taskCode, TaskTypeEnum.SCRAP_TASK.getCode(), Integer.parseInt(TaskStatusEnum.SCRAP_UNDER_REVIEW.getCode()), tmTaskAgreement, companyId);
for (RepairAuditDetails scrapDetails : scrapNumList) {
RepairAuditDetails byRepairId = scrapApplyDetailsMapper.getByRepairId(String.valueOf(scrapDetails.getRepairId()));
List<RepairRecord> repairRecord = scrapApplyDetailsMapper.getGyoupRepairRecord(byRepairId);

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml
View File

@ -68,13 +68,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.taskStatus
FROM (
SELECT ANY_VALUE(rid.task_id) AS id,
ANY_VALUE(tt2.`code`) AS repairCode,
ANY_VALUE(tt.`code`) AS repairCode,
ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName2)) AS maTypeName,
ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeId2)) AS typeId2,
bpl.lot_name projectName,
bui.unit_name unitName,
ANY_VALUE(us.user_name) AS wxName,
ANY_VALUE(tt2.create_time) AS wxTime,
ANY_VALUE(tt.create_time) AS wxTime,
ANY_VALUE(IFNULL(sd.`name`,'入库进行中')) AS taskStatus
FROM repair_input_details rid
LEFT JOIN repair_apply_details rad on rid.repair_id=rad.id