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

修饰入库不通过问题修改

This commit is contained in:
hayu 2024-04-20 14:55:38 +08:00
parent f080f72c32
commit a7d8ad5ef8
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairTestInputServiceImpl.java
View File

@ -77,9 +77,11 @@ public class RepairTestInputServiceImpl implements RepairTestInputService {
dto.setUpdateBy(updateBy); dto.setUpdateBy(updateBy);
if (Objects.equals("2", dto.getCheckType())) { if (Objects.equals("2", dto.getCheckType())) {
RepairAuditDetails detail = new RepairAuditDetails(); RepairAuditDetails detail = new RepairAuditDetails();
detail.setRepairId(Long.valueOf(dto.getRepairId())); detail.setRepairId(Long.valueOf(dto.getId()));
detail.setTypeId(Long.valueOf(dto.getTypeId())); detail.setTypeId(Long.valueOf(dto.getTypeId()));
detail.setMaId(Long.valueOf(dto.getMaId())); if (StringHelper.isNotEmpty(dto.getMaId())){
detail.setMaId(Long.valueOf(dto.getMaId()));
}
detail.setRepairNum(new BigDecimal(dto.getRepairNum())); detail.setRepairNum(new BigDecimal(dto.getRepairNum()));
detail.setRepairedNum(new BigDecimal(dto.getRepairNum())); detail.setRepairedNum(new BigDecimal(dto.getRepairNum()));
detail.setScrapNum(new BigDecimal("0")); detail.setScrapNum(new BigDecimal("0"));

9
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml
View File

@ -274,8 +274,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
pci.update_time, pci.remark, pci.company_id ,tk.code,tk.task_status taskStatus,GROUP_CONCAT(distinct mpt1.pa_name) purchasingTypeName, pci.update_time, pci.remark, pci.company_id ,tk.code,tk.task_status taskStatus,GROUP_CONCAT(distinct mpt1.pa_name) purchasingTypeName,
CASE CASE
tk.task_status tk.task_status
WHEN 69 THEN '待入库' WHEN 69 THEN '待审核'
WHEN 70 THEN '已入库' WHEN 70 THEN '已审核'
ELSE '' ELSE ''
END taskStatusResult, END taskStatusResult,
su.user_name purchaserName su.user_name purchaserName
@ -314,6 +314,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.pa_name specificationType, mt.pa_name specificationType,
mt1.pa_name typeName, mt1.pa_name typeName,
pcd.check_num as checkNum, pcd.check_num as checkNum,
ppi.remark,
pcd.`status`, pcd.`status`,
CASE CASE
WHEN pcd.`status` = 0 THEN '待验收' WHEN pcd.`status` = 0 THEN '待验收'
@ -339,6 +340,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
'' ''
END as inputBy END as inputBy
FROM purchase_part_details pcd FROM purchase_part_details pcd
LEFT JOIN purchase_part_info ppi on ppi.task_id=pcd.task_id
LEFT JOIN ma_part_type mt ON pcd.part_id = mt.pa_id LEFT JOIN ma_part_type mt ON pcd.part_id = mt.pa_id
LEFT JOIN ma_part_type mt1 ON mt.parent_id = mt1.pa_id LEFT JOIN ma_part_type mt1 ON mt.parent_id = mt1.pa_id
LEFT JOIN tm_task tt on tt.task_id = pcd.task_id LEFT JOIN tm_task tt on tt.task_id = pcd.task_id
@ -482,6 +484,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt1.pa_name typeName, mt1.pa_name typeName,
pcd.check_num as checkNum, pcd.check_num as checkNum,
pcd.`status`, pcd.`status`,
ppi.remark,
mt.unit_id as unitName,
CASE CASE
WHEN pcd.`status` = 0 THEN '待验收' WHEN pcd.`status` = 0 THEN '待验收'
WHEN pcd.`status` = 1 THEN '待入库' WHEN pcd.`status` = 1 THEN '待入库'
@ -506,6 +510,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
'' ''
END as inputBy END as inputBy
FROM purchase_part_details pcd FROM purchase_part_details pcd
LEFT JOIN purchase_part_info ppi on ppi.task_id=pcd.task_id
LEFT JOIN ma_part_type mt ON pcd.part_id = mt.pa_id LEFT JOIN ma_part_type mt ON pcd.part_id = mt.pa_id
LEFT JOIN ma_part_type mt1 ON mt.parent_id = mt1.pa_id LEFT JOIN ma_part_type mt1 ON mt.parent_id = mt1.pa_id
LEFT JOIN tm_task tt on tt.task_id = pcd.task_id LEFT JOIN tm_task tt on tt.task_id = pcd.task_id