From b366af9bc3e6661f38c2acb5250bc18b02a3e051 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Wed, 25 Mar 2026 18:40:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=89=80=E6=9C=89=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E5=B7=A5=E8=89=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 4 +- .../entity/DsProcessMeasuringToolEntity.java | 11 ++- .../pojo/entity/DsProcessMoldToolEntity.java | 6 ++ .../controller/DsTaskingController.java | 8 +- .../mapper/DsProcessMeasuringToolMapper.java | 2 + .../mapper/DsProcessMoldToolMapper.java | 2 + .../mapper/DsProcessProjectMapper.java | 2 + .../dashboard/mapper/DsTaskingMapper.java | 2 + .../mapper/ProcessMeasuringToolMapper.xml | 6 +- .../mapper/ProcessMoldToolMapper.xml | 5 ++ .../dashboard/mapper/ProcessProjectMapper.xml | 4 + .../desk/dashboard/mapper/TaskingMapper.xml | 6 ++ .../IDsProcessMeasuringToolService.java | 7 ++ .../service/IDsProcessMoldToolService.java | 7 ++ .../service/IDsProcessProjectService.java | 7 ++ .../dashboard/service/IDsTaskingService.java | 5 ++ .../DsProcessMeasuringToolServiceImpl.java | 5 ++ .../impl/DsProcessMoldToolServiceImpl.java | 5 ++ .../impl/DsProcessProjectServiceImpl.java | 5 ++ .../service/impl/DsTaskingServiceImpl.java | 79 +++++++++++++++++++ 20 files changed, 170 insertions(+), 8 deletions(-) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 9729cc37..7b82fcee 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -31,8 +31,8 @@ public interface LauncherConstant { /** * nacos dev 地址 */ -// String NACOS_DEV_ADDR = "192.168.249.27:8848"; - String NACOS_DEV_ADDR = "127.0.0.1:8848"; + String NACOS_DEV_ADDR = "192.168.249.27:8848"; +// String NACOS_DEV_ADDR = "127.0.0.1:8848"; /**R * nacos prod 地址 diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMeasuringToolEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMeasuringToolEntity.java index 44d75d5c..4c588119 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMeasuringToolEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMeasuringToolEntity.java @@ -65,10 +65,17 @@ public class DsProcessMeasuringToolEntity extends BaseEntity { @Schema(description = "测量类型;1：镀前，2：镀后") private String testType; /** - * 量具 + * 量具ID */ - @Schema(description = "量具") + @Schema(description = "量具ID") + private String mtId; + + /** + * 量具ID + */ + @Schema(description = "量具ID") private String tool; + /** * 量具尺寸 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMoldToolEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMoldToolEntity.java index 4103bf01..8e9bc3de 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMoldToolEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/DsProcessMoldToolEntity.java @@ -90,4 +90,10 @@ public class DsProcessMoldToolEntity extends BaseEntity { @Schema(description = "实验编号") private String trialNo; + /** + * 工装类型;1:工装，2:玻璃饼 + */ + @Schema(description = "工装类型;1:工装，2:玻璃饼") + private Integer tiType; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java index 19c668af..75a098a9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsTaskingController.java @@ -404,9 +404,11 @@ public class DsTaskingController extends BladeController { /** * 零件信息表 详情-工艺详情 */ - @GetMapping("/syncTasking") - public R craftDetail() { - boolean b = dsTaskingService.reworkTask(); + @GetMapping("/syncPart") + public R craftDetail(@RequestParam String StartTime, + @RequestParam String endTime) { + + boolean b = dsTaskingService.syncPart(StartTime,endTime); return R.data(b); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMeasuringToolMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMeasuringToolMapper.java index 403da7d1..275423e1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMeasuringToolMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMeasuringToolMapper.java @@ -68,4 +68,6 @@ public interface DsProcessMeasuringToolMapper extends BaseMapper selectDsProcessMeasuringToolByProcessIds(@Param("processIds")List processIds); List selectDsProcessMeasuringToolByProcessId(@Param("processId")Long processId); + + List selectOldMesByPid(@Param("oldMesProcessId") Long oldMesProcessId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMoldToolMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMoldToolMapper.java index e0935176..d9a16d16 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMoldToolMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMoldToolMapper.java @@ -68,4 +68,6 @@ public interface DsProcessMoldToolMapper extends BaseMapper selectDsProcessMoldToolByProcessIds(@Param("processIds")List processIds); List selectDsProcessMoldToolByProcessId(@Param("processId")Long processId); + + List selectOldMesByPid(@Param("oldMesProcessId") Long oldMesProcessId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java index 72e91ab6..9d2fbee6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java @@ -75,4 +75,6 @@ public interface DsProcessProjectMapper extends BaseMapper selectDsProcessProjectByProcessCode(@Param("projectCode")Long projectCode); List selectDsProcessProjectByProcessId(@Param("processId")Long processId); + + List selectOldMesByPid(@Param("oldMesProcessId") Long oldMesProcessId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java index 9b953202..ea4cd62c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java @@ -129,4 +129,6 @@ public interface DsTaskingMapper extends BaseMapper { * @return */ DsPartEntity getOldMesPartByPartCode(@Param("partCode") String partCode); + + List getOldMesAllPart(@Param("startTime") String startTime,@Param("endTime") String endTime); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMeasuringToolMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMeasuringToolMapper.xml index 8ba2918e..98f472fb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMeasuringToolMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMeasuringToolMapper.xml @@ -8,7 +8,7 @@ - + @@ -47,5 +47,9 @@ resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessMeasuringToolEntity"> select * from DS_PROCESS_MEASURING_TOOL where is_deleted = 0 and process_id = #{processId} + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMoldToolMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMoldToolMapper.xml index 523f308c..b110b1e8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMoldToolMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMoldToolMapper.xml @@ -20,6 +20,7 @@ + @@ -45,5 +46,9 @@ SELECT * FROM DS_PROCESS_MOLD_TOOL WHERE process_id = #{processId} and is_deleted = 0 + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml index 984ca7ac..aea93a4b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessProjectMapper.xml @@ -49,6 +49,10 @@ resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessProjectEntity"> select * from DS_PROCESS_PROJECT where is_deleted = 0 and PROCESS_ID = #{processId} + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml index 1524f020..9ea4b8b4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml @@ -137,4 +137,10 @@ SELECT * FROM P_RB_SYNC_PART where PART_CODE=#{partCode} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMeasuringToolService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMeasuringToolService.java index 6b4999ee..da1bc0b2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMeasuringToolService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMeasuringToolService.java @@ -91,4 +91,11 @@ public interface IDsProcessMeasuringToolService extends BaseService processMeasuringToolVOList); + + /** + * 查询老mes尺寸量具信息 + * @param oldMesProcessId + * @return + */ + List selectOldMesByPid(Long oldMesProcessId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMoldToolService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMoldToolService.java index fc7dce7b..ac126d22 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMoldToolService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMoldToolService.java @@ -90,4 +90,11 @@ public interface IDsProcessMoldToolService extends BaseService processMoldToolVOList); + + /** + * 查询老mes工装 + * @param oldMesProcessId + * @return + */ + List selectOldMesByPid(Long oldMesProcessId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java index d0fdd96b..d221770f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java @@ -97,4 +97,11 @@ public interface IDsProcessProjectService extends BaseService processProjectVOList); + + /** + * 根据老mes工序ID 查询项目 + * @param oldMesProcessId + * @return + */ + List selectOldMesByPid(Long oldMesProcessId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java index 7189cec2..f8a50aff 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java @@ -230,4 +230,9 @@ public interface IDsTaskingService extends BaseService { */ boolean syncTasking(); + /** + * 同步零件 + * @return + */ + boolean syncPart(String startTime, String endTime); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMeasuringToolServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMeasuringToolServiceImpl.java index 189e0e65..aa6cbfb9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMeasuringToolServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMeasuringToolServiceImpl.java @@ -110,5 +110,10 @@ public class DsProcessMeasuringToolServiceImpl extends BaseServiceImpl selectOldMesByPid(Long oldMesProcessId) { + return dsProcessMeasuringToolMapper.selectOldMesByPid(oldMesProcessId); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMoldToolServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMoldToolServiceImpl.java index 955e68c4..56848077 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMoldToolServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMoldToolServiceImpl.java @@ -81,4 +81,9 @@ public class DsProcessMoldToolServiceImpl extends BaseServiceImpl selectOldMesByPid(Long oldMesProcessId) { + return baseMapper.selectOldMesByPid(oldMesProcessId); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java index ce0df61e..88a2a07d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java @@ -113,4 +113,9 @@ public class DsProcessProjectServiceImpl extends BaseServiceImpl selectOldMesByPid(Long oldMesProcessId) { + return processProjectMapper.selectOldMesByPid(oldMesProcessId); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java index 0b026af6..0836496d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java @@ -1551,6 +1551,24 @@ public class DsTaskingServiceImpl extends BaseServiceImpl dsPartEntityList = taskingMapper.getOldMesAllPart(startTime,endTime); + for (DsPartEntity partEntity : dsPartEntityList) { + + // 2. 递归处理零件及其子件 + DsPartEntity newPart = processPartRecursively(partEntity); + if (newPart == null) { + log.error("零件处理失败：{}", partEntity.getPartCode()); + return false; + } + + } + + return true; + } + /** * 单个任务独立事务处理 */ @@ -1742,6 +1760,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl newCraftId:{}", oldMesPartId, oldCraft.getId()); + + //同步工序 + List oldMesProcessList = processService.selectOldMesProcessByOldMesCraftId(oldMesCraftId); + if (CollectionUtils.isEmpty(oldMesProcessList)) { + log.info("零件 {} 没有工序数据", newPart.getPartCode()); + return true; + } + + for (DsProcessEntity dsProcessEntity : oldMesProcessList) { + Long oldMesProcessId = dsProcessEntity.getId(); + dsProcessEntity.setId(null); + boolean processSave = processService.save(dsProcessEntity); + if (!processSave) { + log.error("工序同步失败，oldMesProcessId:{}", oldMesProcessId); + // 继续处理下一个工艺，不中断 + continue; + } + // 处理项目尺寸量具 + //项目 + List processProjectList = processProjectService.selectOldMesByPid(oldMesProcessId); + processProjectList.forEach(item -> item.setId(null)); + if(CollectionUtils.isEmpty(processProjectList)){ + log.info("零件 {} 没有检验项目数据", newPart.getPartCode()); + return true; + } + boolean processProjectSaveBatch = processProjectService.saveBatch(processProjectList); + if (!processProjectSaveBatch) { + log.error("项目同步失败，oldMesProcessId:{}", oldMesProcessId); + // 继续处理下一个工艺，不中断 + continue; + } + + //尺寸量具 + List processMeasuringToolList = processMeasuringToolService.selectOldMesByPid(oldMesProcessId); + processMeasuringToolList.forEach(item -> item.setId(null)); + if(CollectionUtils.isEmpty(processMeasuringToolList)){ + log.info("零件 {} 没有尺寸量具数据", newPart.getPartCode()); + return true; + } + boolean measuringToolSaveBatch = processMeasuringToolService.saveBatch(processMeasuringToolList); + if (!measuringToolSaveBatch) { + log.error("尺寸量具同步失败，oldMesProcessId:{}", oldMesProcessId); + // 继续处理下一个工艺，不中断 + continue; + } + + //工装 + List processMoldToolEntityList = processMoldToolService.selectOldMesByPid(oldMesProcessId); + processMoldToolEntityList.forEach(item -> item.setId(null)); + if(CollectionUtils.isEmpty(processMoldToolEntityList)){ + log.info("零件 {} 没有工装数据", newPart.getPartCode()); + return true; + } + boolean processMoldToolSaveBatch = processMoldToolService.saveBatch(processMoldToolEntityList); + if(!processMoldToolSaveBatch){ + log.error("工装同步失败，oldMesProcessId:{}", oldMesProcessId); + // 继续处理下一个工艺，不中断 + continue; + } + } } return true;