问题处理

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskDetailServiceImpl.java

@@ -909,9 +909,10 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
             productionTaskDetailVo.setProductSpec(productInfo.getSpec());
         }
 
-        //赋值当前工序名称
+        //赋值当前工序信息
         TaskProgress taskProgress = taskProgressService.getById(dto.getTaskProgressId());
         if (ObjectUtil.isNotEmpty(taskProgress)) {
+            productionTaskDetailVo.setProductionProcessesId(taskProgress.getProcessesId());
             productionTaskDetailVo.setProductionProcessesName(productionProcessesMap.get(taskProgress.getProcessesId()));
         }
 //        productionTaskDetailVo.setNextProductionProcessesName(productionProcessesMap.get(productionTaskDetailVo.getNextProductionProcessesId()));

hx-mes/src/main/java/com/fjhx/mes/service/technology/impl/TechnologyServiceImpl.java

@@ -130,6 +130,8 @@ public class TechnologyServiceImpl extends ServiceImpl<TechnologyMapper, Technol
         if (ObjectUtil.isNotEmpty(productList)) {
             List<ProductInfo> productInfos = productInfoService.listByIds(productList);
             result.setApplicableProductsList(productInfos);
+        }else{
+            result.setApplicableProductsList(new ArrayList<>());
         }
 //        //获取工艺线路信息
 //        List<TechnologyProcessLine> processRoute = technologyProcessLineService.list(q -> q.eq(TechnologyProcessLine::getTechnologyId, technology.getId()));
@@ -191,8 +193,8 @@ public class TechnologyServiceImpl extends ServiceImpl<TechnologyMapper, Technol
 //        technologyDto.setProcessRoute(join);
         this.updateById(technologyDto);
 
-        //修改适用产品
-        editProduct(technologyDto);
+//        //修改适用产品
+//        editProduct(technologyDto);
 
         //修改工艺线路列表,只能全删了再创建
         String processRoute;

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderProductionProcessesServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.file.entity.FileInfo;
+import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.entity.ObsFile;
 import com.fjhx.file.service.FileInfoService;
 import com.fjhx.file.utils.ObsFileUtil;
@@ -74,6 +75,23 @@ public class WorkOrderProductionProcessesServiceImpl extends ServiceImpl<WorkOrd
         List<WorkOrderProductionProcesses> workOrderProductionProcessesList = list(q -> q
                 .eq(WorkOrderProductionProcesses::getWorkOrderId, dto.getWorkOrderId())
                 .orderByAsc(WorkOrderProductionProcesses::getSort));
+
+        List<WorkOrderProductionProcessesVo> workOrderProductionProcessesVos = BeanUtil.copyToList(workOrderProductionProcessesList, WorkOrderProductionProcessesVo.class);
+
+
+        if(ObjectUtil.isNotEmpty(workOrderProductionProcessesList)){
+            List<Long> wPPIds = workOrderProductionProcessesList.stream().map(WorkOrderProductionProcesses::getId).collect(Collectors.toList());
+            DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+            Map<Long, List<FileInfo>> fileMap = fileInfoService.mapKGroup(FileInfo::getBusinessId, q -> q.in(FileInfo::getBusinessId, wPPIds));
+            DynamicDataSourceContextHolder.poll();
+
+            for (WorkOrderProductionProcessesVo workOrderProductionProcesses : workOrderProductionProcessesVos) {
+                List<FileInfo> fileInfoVoList = fileMap.get(workOrderProductionProcesses.getId());
+                List<ObsFile> obsFiles = BeanUtil.copyToList(fileInfoVoList, ObsFile.class);
+                workOrderProductionProcesses.setFileList(obsFiles);
+            }
+        }
+
         //如果定制工序信息为空就获取基础工艺工序信息
         if (ObjectUtil.isEmpty(workOrderProductionProcessesList)) {
             List<ProductionProcesses> productionProcesses = productionProcessesService.getBaseProductionProcessesList(workOrder);
@@ -89,7 +107,6 @@ public class WorkOrderProductionProcessesServiceImpl extends ServiceImpl<WorkOrd
                 List<FileInfo> oldFileInfoList = fileInfoService.list(q -> q.in(FileInfo::getBusinessId, productionProcessesIds));
                 DynamicDataSourceContextHolder.poll();
                 if (ObjectUtil.isNotEmpty(oldFileInfoList)) {
-                    oldFileInfoList.forEach(item -> item.setId(null));
                     oldFileInfoMap = oldFileInfoList.stream().collect(Collectors.groupingBy(FileInfo::getBusinessId));
                 }
             }
@@ -139,7 +156,6 @@ public class WorkOrderProductionProcessesServiceImpl extends ServiceImpl<WorkOrd
             }
             return workOrderVo;
         }
-        List<WorkOrderProductionProcessesVo> workOrderProductionProcessesVos = BeanUtil.copyToList(workOrderProductionProcessesList, WorkOrderProductionProcessesVo.class);
 
         workOrderVo.setWorkOrderProductionProcessesList(workOrderProductionProcessesVos);
 
@@ -171,7 +187,7 @@ public class WorkOrderProductionProcessesServiceImpl extends ServiceImpl<WorkOrd
 
             this.saveOrUpdate(workOrderProductionProcesses);
 
-            ObsFileUtil.editFile(workOrderProductionProcesses.getFileList(), workOrderProductionProcesses.getId());
+            ObsFileUtil.copyFileAndSave(workOrderProductionProcesses.getFileList(), workOrderProductionProcesses.getId());
         }
         List<WorkOrderProductionProcesses> workOrderProductionProcessesList1 = BeanUtil.copyToList(workOrderProductionProcessesList, WorkOrderProductionProcesses.class);
         this.editLinked(workOrderProductionProcessesList1, WorkOrderProductionProcesses::getWorkOrderId, dto.getWorkOrderId());