From f2a5a09c879849110b42c46297ab4c080500e61d Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 03 四月 2025 07:28:03 +0800
Subject: [PATCH] Merge branch 'master' of http://159.223.171.199:10439/r/JiuMuMES
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/ProjectServiceImpl.java | 80 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 77 insertions(+), 3 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/ProjectServiceImpl.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/ProjectServiceImpl.java
index b23b380..8458e56 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/ProjectServiceImpl.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/service/impl/ProjectServiceImpl.java
@@ -1,11 +1,17 @@
package com.mes.md.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.mes.md.entity.Project;
-import com.mes.md.mapper.ProjectMapper;
-import com.mes.md.service.ProjectService;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.md.entity.*;
+import com.mes.md.mapper.*;
+import com.mes.md.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* <p>
@@ -18,4 +24,72 @@
@Service
public class ProjectServiceImpl extends MPJBaseServiceImpl<ProjectMapper, Project> implements ProjectService {
+ @Autowired
+ KBBTJPDrawingBPMapper kBBTJPDrawingBPMapper;
+
+ @Autowired
+ PrimitiveTaskService primitiveTaskService;
+ @Autowired
+ TaskingService taskingService;
+
+ @Autowired
+ PrimitiveTaskMapper primitiveTaskMapper;
+ @Autowired
+ TaskingMapper taskingMapper;
+
+ @Autowired
+ KBBTJPDrawingBPService kBBTJPDrawingBPService;
+
+ @Autowired
+ LineConfigurationService lineConfigurationService;
+
+ //鏍囧噯瀵煎叆宸ョ▼ 鏁版嵁
+ @Override
+ public boolean insertProjectStandard() {
+ //
+ try {
+ //鑾峰彇鏈�鏂版湰鍦版湭娣诲姞鐨勬暟鎹�
+ List<KBBTJPDrawingBP> kBBTJPDrawingBP=kBBTJPDrawingBPMapper.selectJoinList(KBBTJPDrawingBP.class,new MPJLambdaWrapper<KBBTJPDrawingBP>()
+ .selectAll(KBBTJPDrawingBP.class)
+ .eq(KBBTJPDrawingBP::getIsWorking,0)
+ .eq(KBBTJPDrawingBP::getTaskType,"鏍囧噯")
+ .orderByAsc(KBBTJPDrawingBP::getCreateDate)
+ .orderByAsc(KBBTJPDrawingBP::getTaskSequence));
+ List<PrimitiveTask> list=new ArrayList();
+ for (KBBTJPDrawingBP item:kBBTJPDrawingBP){
+ PrimitiveTask primitiveTask= kBBTJPDrawingBPService.convertListPrimitiveTask(item);
+ if(primitiveTask!=null){
+ //primitiveTaskMapper.insert(primitiveTask);
+ list.add(primitiveTask);
+ }
+ }
+ if(list.size()>0){
+ primitiveTaskService.saveBatch(list);
+ }
+
+ }catch (Exception e){
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * 鎵爜鐨勭幓鐠冩坊鍔犲埌鏁版嵁鍒版湰鍦�
+ * @param scan_id
+ * @return
+ */
+ @Override
+ public int insertProjectCustomization(String scan_id) {
+ //鏌ヨ鎵爜鏁版嵁 娣诲姞鍒板師鏁版嵁
+ try {
+ List<KBBTJPDrawingBP> kBBTJPDrawingBP=kBBTJPDrawingBPService.findScanIdKBBTJPDrawingBP(scan_id);
+ for (KBBTJPDrawingBP item:kBBTJPDrawingBP){
+ PrimitiveTask primitiveTask= kBBTJPDrawingBPService.convertListPrimitiveTask(item);
+ return primitiveTaskMapper.insert(primitiveTask);
+ }
+ }catch (Exception e){
+ return 0;
+ }
+ return 0;
+ }
}
--
Gitblit v1.8.0