更新任务查看图片

mes/src/main/java/com/ximai/mes/pro/controller/mobile/ProTaskMobController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.io.unit.DataUnit;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ximai.common.annotation.Log;
 import com.ximai.common.core.controller.BaseController;
@@ -12,9 +13,12 @@ import com.ximai.common.core.page.TableDataInfo;
 import com.ximai.common.enums.BusinessType;
 import com.ximai.common.exception.ServiceException;
 import com.ximai.common.utils.MessageUtils;
+import com.ximai.common.utils.data.StringUtils;
 import com.ximai.mes.pro.domain.ProFeedback;
 import com.ximai.mes.pro.domain.ProProductQrcodeRecord;
 import com.ximai.mes.pro.domain.proWorkOrder.ProWorkorder;
+import com.ximai.mes.pro.domain.productionSolution.ProProductionSolution;
+import com.ximai.mes.pro.domain.productionSolution.ProProductionSolutionProcess;
 import com.ximai.mes.pro.domain.productionSolution.ProProductionSolutionProcessDrawing;
 import com.ximai.mes.pro.domain.task.ProTask;
 import com.ximai.mes.pro.domain.task.ProTaskIssue;
@@ -26,6 +30,8 @@ import com.ximai.mes.pro.domain.vo.task.FeedbackValidateSerialNoParams;
 import com.ximai.mes.pro.dto.productionSolution.ProProductionSolutionProcessDrawingDto;
 import com.ximai.mes.pro.dto.task.ProTaskLinkFile;
 import com.ximai.mes.pro.mapper.proWorkOrder.ProWorkorderMapper;
+import com.ximai.mes.pro.mapper.productionSolution.ProProductionSolutionMapper;
+import com.ximai.mes.pro.mapper.productionSolution.ProProductionSolutionProcessMapper;
 import com.ximai.mes.pro.mapper.task.ProTaskAssistProcessMapper;
 import com.ximai.mes.pro.mapper.task.ProTaskMapper;
 import com.ximai.mes.pro.mapper.task.ProTaskWorkorderMapper;
@@ -37,6 +43,7 @@ import com.ximai.mes.pro.service.IProRecoilMaterialService;
 import com.ximai.mes.pro.service.proWorkOrder.IProWorkOrderProcessToolService;
 import com.ximai.mes.pro.service.proWorkOrder.IProWorkorderService;
 import com.ximai.mes.pro.service.productionSolution.IProProductionSolutionProcessDrawingService;
+import com.ximai.mes.pro.service.productionSolution.IProProductionSolutionProcessService;
 import com.ximai.mes.pro.service.task.IProTaskAssistProcessService;
 import com.ximai.mes.pro.service.task.IProTaskIssueService;
 import com.ximai.mes.pro.service.task.IProTaskService;
@@ -48,6 +55,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.collectingAndThen;
 import static java.util.stream.Collectors.toCollection;
@@ -87,7 +95,10 @@ public class ProTaskMobController extends BaseController {
     private IProProductQrcodeRecordService productQrcodeRecordService;
     @Autowired
     private IProProductionSolutionProcessDrawingService productionSolutionProcessDrawingService;
-
+    @Autowired
+    private IProProductionSolutionProcessService proProductionSolutionProcessService;
+    @Autowired
+    ProProductionSolutionMapper proProductionSolutionMapper;
 
     @GetMapping("/getlist")
     public AjaxResult getIssueList(ProTaskIssue proTaskIssue) {
@@ -119,16 +130,36 @@ public class ProTaskMobController extends BaseController {
         ProTask protask = proTaskService.selectProTaskByTaskId(proTaskQuery.getTaskId());
         ProWorkorder proWorkorder = proWorkorderService.selectListByQw(new QueryWrapper<ProWorkorder>().eq("t1.workorder_code", protask.getArrangeCode()))
                 .stream().findFirst().orElseThrow(()->new ServiceException(MessageUtils.message("pro.workOrder.error.not.exist")));
-        QueryWrapper<ProProductionSolutionProcessDrawing> query = new QueryWrapper<>();
-        query.eq("t1.item_id", proWorkorder.getProductId());
-        List<ProProductionSolutionProcessDrawing> tempList = productionSolutionProcessDrawingService.selectProcessDrawingJoinSolution(query);
-        tempList.stream().filter(s->s!=null).forEach(s -> {
-            ProTaskLinkFile file = new ProTaskLinkFile();
-            file.setFileName(s.getFileOriginalName());
-            file.setFileType("工序图纸");
-            file.setFilePath(s.getFilePath());
-            list.add(file);
-        });
+        QueryWrapper<ProProductionSolutionProcess>  proProductionSolutionProcessQuery = new QueryWrapper<>();
+        proProductionSolutionProcessQuery.eq("production_solution_id",proWorkorder.getProductionSolutionId());
+        proProductionSolutionProcessQuery.eq("process_id",protask.getProcessId());
+        List<ProProductionSolutionProcess>  proProductionSolutionProcesses = proProductionSolutionProcessService.selectProProductionSolutionProcessList(proProductionSolutionProcessQuery);
+        if(proProductionSolutionProcesses.size() > 0){
+            QueryWrapper<ProProductionSolutionProcessDrawing> query = new QueryWrapper<>();
+            query.eq("t1.item_id", proWorkorder.getProductId());
+            query.eq("t1.production_solution_id", proWorkorder.getProductionSolutionId());
+            query.in("t2.production_solution_process_id",proProductionSolutionProcesses.stream()
+                    .map(proProductionSolutionProcess -> proProductionSolutionProcess.getProductionSolutionProcessId()).collect(Collectors.toList()));
+            List<ProProductionSolutionProcessDrawing> tempList = productionSolutionProcessDrawingService.selectProcessDrawingJoinSolution(query);
+            tempList.stream().filter(s->s!=null).forEach(s -> {
+                ProTaskLinkFile file = new ProTaskLinkFile();
+                file.setFileName(s.getFileOriginalName());
+                file.setFileType("工序图纸");
+                file.setFilePath(s.getFilePath());
+                list.add(file);
+            });
+        }
+        ProProductionSolution proProductionSolution = proProductionSolutionMapper.selectProProductionSolutionByProductionSolutionId(proWorkorder.getProductionSolutionId());
+        if(proProductionSolution != null && StringUtils.isNotEmpty(proProductionSolution.getFilePath())){
+            List<Map<String,Object>> fileMap = (List<Map<String, Object>>) JSONArray.parse(proProductionSolution.getFilePath());
+            for (Map<String,Object> map : fileMap){
+                ProTaskLinkFile file = new ProTaskLinkFile();
+                file.setFileName((String) map.get("originalFilename"));
+                file.setFileType("通用图纸");
+                file.setFilePath((String) map.get("filePath"));
+                list.add(file);
+            }
+        }
         return AjaxResult.success(list);
     }
 

mes/src/main/java/com/ximai/mes/pro/service/impl/proWorkOrder/ProWorkorderServiceImpl.java

@@ -1067,7 +1067,7 @@ public class ProWorkorderServiceImpl implements IProWorkorderService {
                 proWorkorder.setAncestors(parent.getAncestors() + "," + parent.getParentId());
             }
         }
-        proWorkorder.setStatus(WorkorderStatusEnum.PUBLISHED.getValue());
+        proWorkorder.setStatus(WorkorderStatusEnum.PREPARE.getValue());
         proWorkorder.createAction();
         proWorkorder.setQuantityProduced(BigDecimal.ZERO);
         proWorkorder.setQuantityQualify(BigDecimal.ZERO);