From 394f2a0d9982204e26af2ae8df4692b1a6cbb97a Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Wed, 28 Jul 2021 08:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PodTemplateServiceImpl.java        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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 4b26e9f0..917a6dbb 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
@@ -25,6 +25,7 @@ import com.foreverwin.mesnac.meapi.dto.WorkCenterDto;
 import com.foreverwin.mesnac.meapi.model.*;
 import com.foreverwin.mesnac.meapi.service.*;
 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.service.LoadInventoryService;
 import com.foreverwin.mesnac.production.service.PodTemplateService;
@@ -75,6 +76,8 @@ public class PodTemplateServiceImpl implements PodTemplateService {
     @Autowired
     private BomComponentService bomComponentService;
     @Autowired
+    private SfcDataAssembleMapper sfcDataAssembleMapper;
+    @Autowired
     private InspectionTaskService inspectionTaskService;
     @Autowired
     private InspectionItemService inspectionItemService;
@@ -260,6 +263,16 @@ public class PodTemplateServiceImpl implements PodTemplateService {
                     throw new BaseException("自检任务不合格，不能完成请检查");
                 }
             }
+            //是否装配完成
+            List<Map<String, Object>> assembleList = sfcDataAssembleMapper.querySfcAssemble(HandleEnum.SFC_DISPATCH.getHandle(site,dispatchNo));
+            if (assembleList!=null&&assembleList.size()>0){
+                for (Map<String,Object> objectMap:assembleList){
+                    String  isAssemble= (String) objectMap.get("IS_ASSEMBLE");
+                    if (!isAssemble.equals("GREEN")){
+                        throw new BaseException("未装配完成");
+                    }
+                }
+            }
             //物料消耗
             materialConsumption(site, operation, HandleEnum.SFC.getHandle(site, sfc), stepId, resrce);
             try {