From f41e22a9a8842ef49b60d63fecdf956f728047e8 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Wed, 1 Sep 2021 13:45:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProdReadyTaskServiceImpl.java       |  2 +-
 .../service/impl/PodTemplateServiceImpl.java         | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
index 3af68b0c..2cff07ce 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
@@ -486,7 +486,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
             labelPrintDto.setBlankingSize(sfcDispatchDto.getBlankingSize());
             // 是否主观件 :辅料类型是9，则为主观件
             String accessory_type = customFieldsMapper.selectCustomFieldsValue(selectCurrent.getHandle(), "ACCESSORY_TYPE");
-            if ("9".equals(accessory_type)){
+            if (StringUtil.notBlank(accessory_type)&&"9".equals(accessory_type)){
                 labelPrintDto.setMainPart(true);
             }else{
                 labelPrintDto.setMainPart(false);
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 29d2d636..161371c8 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
@@ -31,7 +31,6 @@ import com.foreverwin.mesnac.production.mapper.SfcCrossMapper;
 import com.foreverwin.mesnac.production.mapper.SfcDataAssembleMapper;
 import com.foreverwin.mesnac.production.model.LoadInventory;
 import com.foreverwin.mesnac.production.model.SfcHoldLog;
-import com.foreverwin.mesnac.production.model.WorkShopTransfer;
 import com.foreverwin.mesnac.production.service.*;
 import com.foreverwin.modular.core.exception.BaseException;
 import com.foreverwin.modular.core.meext.MEServices;
@@ -90,8 +89,6 @@ public class PodTemplateServiceImpl implements PodTemplateService {
     private LoadInventoryService loadInventoryService;
     @Autowired
     private SfcHoldLogService sfcHoldLogService;
-    @Autowired
-    private WorkShopTransferService workShopTransferService;
 
     @Override
     public Map<String, Object> resrceEnter(WorkCenterDto workCenterDto) {
@@ -208,9 +205,8 @@ public class PodTemplateServiceImpl implements PodTemplateService {
             String dispatchNo = sfcDto.getDispatchNo();
             Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(site, sfc));
             BigDecimal qty = new BigDecimal(sfcServiceById.getQty().toString());
-            WorkShopTransfer transfer = workShopTransferService.sfcEnter(sfc, "OUT");
-            String isOutSource = transfer.getIsOutSource();
-            if (StringUtil.isBlank(isOutSource)||!isOutSource.equals(Constants.STATUS_Y)){
+
+            if (!operation.equals("WX_6106GX")){
                 //是否有互检检验项目
                 List<InspectionItemDetail> inspectionItemDetails = inspectionItemService.selectQualityInspection(sfc, operation, stepId, Constants.INSPECTION_TYPE_H);
                 if (inspectionItemDetails.size() > 0 && inspectionItemDetails.get(0) != null) {
@@ -264,9 +260,7 @@ public class PodTemplateServiceImpl implements PodTemplateService {
         }
         BigDecimal workHour=BigDecimal.ZERO;
         BigDecimal qty = new BigDecimal(sfcServiceById.getQty().toString());
-        WorkShopTransfer transfer = workShopTransferService.sfcEnter(sfc, "OUT");
-        String isOutSource = transfer.getIsOutSource();
-        if (StringUtil.isBlank(isOutSource)||!isOutSource.equals(Constants.STATUS_Y)) {
+        if (!operation.equals("WX_6106GX")) {
             //是否有自检检验项目
             List<InspectionItemDetail> inspectionItemDetails = inspectionItemService.selectQualityInspection(sfc, operation, stepId, Constants.INSPECTION_TYPE_Z);
             if (inspectionItemDetails.size() > 0 && inspectionItemDetails.get(0) != null) {