diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java index 573ae3b8..e4eac07b 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java @@ -68,8 +68,6 @@ public class PodTemplateServiceImpl implements PodTemplateService { @Autowired private SfcService sfcService; @Autowired - private IntegrationLogService integrationLogService; - @Autowired private RouterService routerService; @Autowired private ItemService itemService; @@ -84,19 +82,25 @@ public class PodTemplateServiceImpl implements PodTemplateService { @Autowired private OperationService operationService; @Autowired + private SfcHoldLogService sfcHoldLogService; + @Autowired + private CustomFieldsService customFieldsService; + @Autowired private BomComponentService bomComponentService; @Autowired + private LoadInventoryService loadInventoryService; + @Autowired private SfcDataAssembleMapper sfcDataAssembleMapper; @Autowired private InspectionTaskService inspectionTaskService; @Autowired private InspectionItemService inspectionItemService; @Autowired - private SfcDispatchCommonService sfcDispatchCommonService; - @Autowired - private LoadInventoryService loadInventoryService; + private IntegrationLogService integrationLogService; @Autowired - private SfcHoldLogService sfcHoldLogService; + private SfcDispatchCommonService sfcDispatchCommonService; + + @Override public Map resrceEnter(WorkCenterDto workCenterDto) { @@ -315,8 +319,11 @@ public class PodTemplateServiceImpl implements PodTemplateService { paramMap.put("CATEGORY", Constants.INSPECTION_TYPE_P); inspectionTaskService.createTask(paramMap); } else { + String special = customFieldsService.getCustomFieldsValue(currentRevisionRef.getHandle(), "SPECIAL"); paramMap.put("CATEGORY", Constants.INSPECTION_TYPE_P); - inspectionTaskService.createNewTask(paramMap); + if (StringUtil.isBlank(special)|| !special.equals("N")){ + inspectionTaskService.createNewTask(paramMap); + } } //首件创建 inspectionItemDetails = inspectionItemService.selectQualityInspection(sfc, operation, stepId, Constants.INSPECTION_TYPE_S);