专检

common/src/main/java/com/foreverwin/mesnac/common/service/InspectionTaskService.java

@@ -35,5 +35,5 @@ public interface InspectionTaskService extends IService<InspectionTask> {
 
     InspectionTask isCreateTask(String site, String category, String sfc, String operation, String stepId);
 
-    void createCompleteTask(Map<String, Object> paramMap);
+    void createNewTask(Map<String, Object> paramMap);
 }

common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java

@@ -264,7 +264,7 @@ public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper,
     }
 
     @Override
-    public void createCompleteTask(Map<String, Object> paramMap) {
+    public void createNewTask(Map<String, Object> paramMap) {
         String site = CommonMethods.getSite();
         String category = (String) paramMap.get("CATEGORY");
         String sfc = (String) paramMap.get("SFC");

production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java

@@ -220,11 +220,15 @@ public class PodTemplateServiceImpl implements PodTemplateService {
             QueryWrapper<InspectionTask> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(InspectionTask.CATEGORY, Constants.INSPECTION_TYPE_P);
             queryWrapper.eq(InspectionTask.SFC, sfc);
-            queryWrapper.ne(InspectionTask.RESULT, Constants.RSESULT_OK);
+            queryWrapper.orderByDesc(InspectionTask.CREATED_DATE_TIME);
             List<InspectionTask> list = inspectionTaskService.list(queryWrapper);
             if (!list.isEmpty()) {
+                InspectionTask inspectionTask = list.get(0);
+                String result = inspectionTask.getResult();
+                if (!inspectionTask.getStatus().equals(Constants.INSPECTION_TASK_STATUS_COMPLETE)||StringUtil.isBlank(result)||!result.equals(Constants.RSESULT_OK)){
                     throw new BaseException("请完成专检检验任务");
                 }
+            }
             try {
                 sfcCrossService.startAction(site, currentRevisionRef.getHandle(), resrce, sfcServiceById.getHandle(), qty);
             } catch (Exception e) {
@@ -289,7 +293,7 @@ public class PodTemplateServiceImpl implements PodTemplateService {
                 inspectionTaskService.createTask(paramMap);
             } else {
                 paramMap.put("CATEGORY", Constants.INSPECTION_TYPE_P);
-                inspectionTaskService.createCompleteTask(paramMap);
+                inspectionTaskService.createNewTask(paramMap);
             }
             //首件创建
             inspectionItemDetails = inspectionItemService.selectQualityInspection(sfc, operation, stepId, Constants.INSPECTION_TYPE_S);