diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/StatementVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/StatementVO.java index dd2599108..94a195ce8 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/StatementVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oem/pojo/vo/StatementVO.java @@ -22,9 +22,6 @@ public class StatementVO extends OemStatementEntity { @Schema(description = "外协工序ID") private Long opId; - @Schema(description = "工序ID") - private Long psId; - @Schema(description = "工艺能力ID") private Long caId; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml index c632b7e06..a5fe16a6b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/mapper/OemStatementMapper.xml @@ -51,7 +51,7 @@ - + @@ -111,7 +111,7 @@ a.wo_id, a.ca_id, a.OC_ID, - a.pps_id as ps_id, + a.pps_id, b.name as ps_name, c.code as OC_CODE, c.OC_NAME, diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java index 3bc7f7d26..f3f4ad6e5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java @@ -1355,7 +1355,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl settlementVOs) { // 根据工序Id分组 - Map> groupByPsId = settlementVOs.stream().collect(Collectors.groupingBy(StatementVO::getPsId)); + Map> groupByPsId = settlementVOs.stream().collect(Collectors.groupingBy(StatementVO::getPpsId)); Set psIds = groupByPsId.keySet(); final int batchSize = 500; List allStandardList = new ArrayList<>(); @@ -1390,31 +1390,31 @@ public class OemStatementServiceImpl extends BaseServiceImpl