From 85761c962ce27484f8ed2c58425a6ecba1bb14cd Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Tue, 14 Sep 2021 13:40:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=93=8D=E4=BD=9C=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5=E4=B8=AD=E2=80=9CSPECIAL",?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=B8=BAN=E4=B8=8D=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=B8=93=E6=A3=80=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PodTemplateServiceImpl.java  | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

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<String, Object> 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);