Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr

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 = "192.168.249.27:8848";
-    String NACOS_DEV_ADDR = "127.0.0.1:8848";
+//    String NACOS_DEV_ADDR = "127.0.0.1:8848";
 
     /**R
      * nacos prod 地址

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;
+
 	/**
 	 * 量具尺寸
 	 */

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;
+
 }

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")
+	@GetMapping("/syncPart")
-	public R craftDetail() {
+	public R craftDetail(@RequestParam String StartTime,
-		boolean b = dsTaskingService.reworkTask();
+						 @RequestParam String endTime) {
+
+		boolean b = dsTaskingService.syncPart(StartTime,endTime);
 		return R.data(b);
 	}
 

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMeasuringToolMapper.java

@@ -68,4 +68,6 @@ public interface DsProcessMeasuringToolMapper extends BaseMapper<DsProcessMeasur
     List<DsProcessMeasuringToolEntity> selectDsProcessMeasuringToolByProcessIds(@Param("processIds")List<Long> processIds);
 
     List<DsProcessMeasuringToolEntity> selectDsProcessMeasuringToolByProcessId(@Param("processId")Long processId);
+
+    List<DsProcessMeasuringToolEntity> selectOldMesByPid(@Param("oldMesProcessId") Long oldMesProcessId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMoldToolMapper.java

@@ -68,4 +68,6 @@ public interface DsProcessMoldToolMapper extends BaseMapper<DsProcessMoldToolEnt
     List<DsProcessMoldToolEntity> selectDsProcessMoldToolByProcessIds(@Param("processIds")List<Long> processIds);
 
     List<DsProcessMoldToolEntity> selectDsProcessMoldToolByProcessId(@Param("processId")Long processId);
+
+    List<DsProcessMoldToolEntity> selectOldMesByPid(@Param("oldMesProcessId") Long oldMesProcessId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessProjectMapper.java

@@ -75,4 +75,6 @@ public interface DsProcessProjectMapper extends BaseMapper<DsProcessProjectEntit
 	List<DsProcessProjectEntity> selectDsProcessProjectByProcessCode(@Param("projectCode")Long projectCode);
 
     List<DsProcessProjectEntity> selectDsProcessProjectByProcessId(@Param("processId")Long processId);
+
+	List<DsProcessProjectEntity> selectOldMesByPid(@Param("oldMesProcessId") Long oldMesProcessId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java

@@ -129,4 +129,6 @@ public interface DsTaskingMapper extends BaseMapper<DsTaskingEntity> {
 	 * @return
 	 */
 	DsPartEntity getOldMesPartByPartCode(@Param("partCode") String partCode);
+
+	List<DsPartEntity> getOldMesAllPart(@Param("startTime") String startTime,@Param("endTime") String endTime);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMeasuringToolMapper.xml

@@ -8,7 +8,7 @@
         <result column="PROCESS_ID" property="processId"/>
         <result column="PROJECT_CODE" property="projectCode"/>
         <result column="TEST_TYPE" property="testType"/>
-        <result column="TOOL" property="tool"/>
+        <result column="MT_ID" property="mtId"/>
         <result column="TOOL_SIZE" property="toolSize"/>
         <result column="TOOL_INFO" property="toolInfo"/>
         <result column="CREATE_TIME" property="createTime"/>
@@ -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}
     </select>
+    <select id="selectOldMesByPid"
+            resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessMeasuringToolEntity">
+        select * from P_RB_SYNC_MEASURING_TOOL where PROCESS_ID = #{oldMesProcessId}
+    </select>
 
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMoldToolMapper.xml

@@ -20,6 +20,7 @@
         <result column="STATUS" property="status"/>
         <result column="IS_DELETED" property="isDeleted"/>
         <result column="TRIAL_NO" property="trialNo"/>
+        <result column="TI_TYPE" property="tiType"/>
     </resultMap>
 
 
@@ -45,5 +46,9 @@
         SELECT * FROM DS_PROCESS_MOLD_TOOL
         WHERE process_id = #{processId} and is_deleted = 0
     </select>
+    <select id="selectOldMesByPid"
+            resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessMoldToolEntity">
+        select * from P_RB_SYNC_PROCESS_TOOLS_INFO where PROCESS_ID = #{oldMesProcessId}
+    </select>
 
 </mapper>

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}
     </select>
+    <select id="selectOldMesByPid"
+            resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessProjectEntity">
+        select * from P_RB_SYNC_PROCESS_PROJECT where PROCESS_ID = #{oldMesProcessId}
+    </select>
 
 
 </mapper>

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}
     </select>
 
+    <select id="getOldMesAllPart" resultType="org.springblade.desk.dashboard.pojo.entity.DsPartEntity">
+       SELECT * FROM P_RB_SYNC_PART
+        WHERE UPDATE_TIME BETWEEN to_date(#{startTime}, 'YYYY-MM-DD HH24:MI:SS')
+            AND to_date(#{endTime}, 'YYYY-MM-DD HH24:MI:SS');
+    </select>
+
 </mapper>

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMeasuringToolService.java

@@ -91,4 +91,11 @@ public interface IDsProcessMeasuringToolService extends BaseService<DsProcessMea
 	 * @return
 	 */
 	boolean saveReworkProcessMeasuringTool(PrReworkProcessVO prReworkProcess, List<DsProcessMeasuringToolVO> processMeasuringToolVOList);
+
+	/**
+	 * 查询老mes尺寸量具信息
+	 * @param oldMesProcessId
+	 * @return
+	 */
+    List<DsProcessMeasuringToolEntity> selectOldMesByPid(Long oldMesProcessId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessMoldToolService.java

@@ -90,4 +90,11 @@ public interface IDsProcessMoldToolService extends BaseService<DsProcessMoldTool
 	 * @return
 	 */
     boolean saveReworkProcessMoldTool(PrReworkProcessVO prReworkProcess, List<DsProcessMoldToolVO> processMoldToolVOList);
+
+	/**
+	 * 查询老mes工装
+	 * @param oldMesProcessId
+	 * @return
+	 */
+	List<DsProcessMoldToolEntity> selectOldMesByPid(Long oldMesProcessId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessProjectService.java

@@ -97,4 +97,11 @@ public interface IDsProcessProjectService extends BaseService<DsProcessProjectEn
 	 * @return
 	 */
 	boolean saveReworkProcessProjectSave(PrReworkProcessVO prReworkProcess, List<DsProcessProjectVO> processProjectVOList);
+
+	/**
+	 * 根据老mes工序ID 查询项目
+	 * @param oldMesProcessId
+	 * @return
+	 */
+    List<DsProcessProjectEntity> selectOldMesByPid(Long oldMesProcessId);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsTaskingService.java

@@ -230,4 +230,9 @@ public interface IDsTaskingService extends BaseService<DsTaskingEntity> {
 	 */
 	boolean syncTasking();
 
+	/**
+	 * 同步零件
+	 * @return
+	 */
+	boolean syncPart(String startTime, String endTime);
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMeasuringToolServiceImpl.java

@@ -110,5 +110,10 @@ public class DsProcessMeasuringToolServiceImpl extends BaseServiceImpl<DsProcess
 		return true;
 	}
 
+	@Override
+	public List<DsProcessMeasuringToolEntity> selectOldMesByPid(Long oldMesProcessId) {
+		return dsProcessMeasuringToolMapper.selectOldMesByPid(oldMesProcessId);
+	}
+
 
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessMoldToolServiceImpl.java

@@ -81,4 +81,9 @@ public class DsProcessMoldToolServiceImpl extends BaseServiceImpl<DsProcessMoldT
 		return true;
 	}
 
+	@Override
+	public List<DsProcessMoldToolEntity> selectOldMesByPid(Long oldMesProcessId) {
+		return baseMapper.selectOldMesByPid(oldMesProcessId);
+	}
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessProjectServiceImpl.java

@@ -113,4 +113,9 @@ public class DsProcessProjectServiceImpl extends BaseServiceImpl<DsProcessProjec
 		return true;
 	}
 
+	@Override
+	public List<DsProcessProjectEntity> selectOldMesByPid(Long oldMesProcessId) {
+		return processProjectMapper.selectOldMesByPid(oldMesProcessId);
+	}
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java

@@ -1551,6 +1551,24 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 		return failCount.get() == 0;
 	}
 
+	@Override
+	public boolean syncPart(String startTime, String endTime) {
+		//查询所有老mes零件
+		List<DsPartEntity> 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<DsTaskingMapper, DsTas
 			log.info("零件 {} 有 {} 个工艺待同步", newPart.getPartCode(), oldCraftList.size());
 
 			for (DsCraftEntity oldCraft : oldCraftList) {
+				Long oldMesCraftId = oldCraft.getId();
 				// 重置工艺ID 不使用老mesID
 				oldCraft.setId(null);
 				oldCraft.setPartId(newPart.getId());
@@ -1757,6 +1776,66 @@ public class DsTaskingServiceImpl extends BaseServiceImpl<DsTaskingMapper, DsTas
 				}
 
 				log.info("工艺同步成功，oldCraftId:{} -> newCraftId:{}", oldMesPartId, oldCraft.getId());
+				
+				//同步工序
+				List<DsProcessEntity> 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<DsProcessProjectEntity> 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<DsProcessMeasuringToolEntity> 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<DsProcessMoldToolEntity> 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;