diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DeductionPreserveMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DeductionPreserveMapper.xml index 606c9161..96c4066e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DeductionPreserveMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/DeductionPreserveMapper.xml @@ -9,17 +9,21 @@ c.PART_CODE AS partCode, b.BATCH_NO AS batchNo, d.PPS_ID AS ppsId, + e.NAME AS ppsName, a.QTY AS qty, a.TEST_QTY AS testQty, a.SCRAP_QTY AS scrapQty, a.LOSS_QTY AS lossQty, a.MEMO AS memo, a.CREATE_TIME AS maintenanceTime, - a.CREATE_USER AS maintenance + a.CREATE_USER AS maintenance, + f.REAL_NAME AS maintenanceName FROM MES_DEDUCTION_PRESERVE a INNER JOIN MES_WORK_ORDER b ON a.WO_ID = b.ID INNER JOIN MES_YIELD_ORDER c ON b.YO_ID = c.ID INNER JOIN MES_WORK_PLAN d ON a.WP_ID = d.ID + LEFT JOIN BS_PROCESS_SET e ON d.PPS_ID = e.ID + LEFT JOIN BLADE_USER f ON a.CREATE_USER = f.ID a.IS_DELETED = 0 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DeductionPreserveServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DeductionPreserveServiceImpl.java index 39d45361..830de794 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DeductionPreserveServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DeductionPreserveServiceImpl.java @@ -98,10 +98,10 @@ public class DeductionPreserveServiceImpl extends BaseServiceImpl