diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java index 5d5d0b7a8..40db021fe 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java @@ -116,4 +116,10 @@ public class AuditFile extends BaseEntity { @Schema(description = "产品应用领域") @JsonSerialize(using = Integer0ToEmptyStringSerializer.class) private Integer prodApplyArea; + + /** + * 工艺能力ID + */ + @Schema(description = "工艺能力ID") + private Long caId; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml index fd0881e83..3f6855026 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml @@ -79,8 +79,8 @@ - select a.PART_CODE, a.BATCH_NO, a.WORK_QTY, a.area, a.sumArea, - a.MTN_CODE, a.prod_ident,a.wo_code,a.material,a.yield_type from ( + select a.PART_CODE as partCode, a.BATCH_NO as batchNo, a.WORK_QTY as workQty, a.area, a.sumArea, + a.MTN_CODE as mtnCode, a.prod_ident as prodIdent,a.wo_code as woCode,a.material,a.yield_type as yieldType from ( select d.PART_CODE, c.BATCH_NO, b.WORK_QTY, b.WORK_QTY*d.YP_AREA as area, sum(b.WORK_QTY*d.YP_AREA) over() as sumArea, a.MTN_CODE, d.PRODUCT_IDENT as prod_ident,c.wo_code,f.material,d.yield_type from MES_MAC_TOOL_USE a diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java index 0ab9c401d..190248582 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java @@ -40,4 +40,10 @@ public interface AuditFileMapper extends BaseMapper { List exportAuditFile(@Param("ew") Wrapper queryWrapper); List listSearch(IPage page, @Param("q") AuditFileSearch search); + + AuditFile getByPpsId(Long ppsId); + + AuditFile getDataByPpsIdAndApplyArea(@Param("ppsId") Long ppsId, @Param("wcId") Long wcId, @Param("prodApplyArea") String prodApplyArea, @Param("prodIdent") String prodIdent, @Param("caId") Long caId); + + AuditFile getDataByPpsIdAndPqName(@Param("ppsId") Long ppsId, @Param("wcId") Long wcId, @Param("prodIdent") String prodIdent, @Param("caId") Long caId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml index bb76cc317..25214b9f5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml @@ -15,6 +15,7 @@ + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index d3a592bea..1fb99122f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -28,8 +28,10 @@ import org.springblade.desk.basic.constant.BaseValue; import org.springblade.desk.basic.mapper.OemMapper; import org.springblade.desk.basic.pojo.entity.CenterTeam; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.service.ICenterTeamService; import org.springblade.desk.basic.service.IPlatingService; +import org.springblade.desk.basic.service.ITeamSetService; import org.springblade.desk.basic.util.IdUtil; import org.springblade.desk.basic.util.StatusCountMap; import org.springblade.desk.dashboard.pojo.entity.*; @@ -57,6 +59,7 @@ import org.springblade.desk.quality.constant.InspectionItemConst; import org.springblade.desk.quality.constant.InspectionTaskConst; import org.springblade.desk.quality.constant.ReviewSheetConst; import org.springblade.desk.quality.excel.InspectionTaskExcel; +import org.springblade.desk.quality.mapper.AuditFileMapper; import org.springblade.desk.quality.mapper.InspectionTaskMapper; import org.springblade.desk.quality.pojo.entity.*; import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; @@ -147,6 +150,10 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl checkList = this.getCheckListNotNG(woId, wpList, true); modelJson1.put("checkList", checkList); jsonObj.put("modelThree", modelJson1); - } +// } - List modelTwoList = this.buildModelTwo(wpList, planList); + List modelTwoList = this.buildModelTwo(wo, yo, dsPart, wpList, planList); jsonObj.put("modelTwo", modelTwoList); if (moduleList.get(2)) { @@ -682,6 +689,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl buildModelTwo(List wpList, List modelFlag) { + private List buildModelTwo(WorkOrder wo, YieldOrder yo, DsPartEntity dsPart, List wpList, List modelFlag) { if (wpList == null || wpList.size() == 0) { return null; } @@ -740,9 +749,9 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl buildDsRbFilePreserveSlotList(WorkPlanExpandVO workPlan){ + private List buildDsRbFilePreserveSlotList(WorkPlanExpandVO workPlan) { List dsRbFilePreserveSlotList = new ArrayList<>(); QueryWrapper qwteam = new QueryWrapper<>(); qwteam.eq("TS_ID", workPlan.getMakeTeam());