Merge remote-tracking branch 'origin/master'

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

@@ -81,7 +81,11 @@ public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper,
         if(StringUtil.isEmpty(taskHandle)){
             throw new BaseException("保存失败,请先进行检索数据!");
         }
-        if(StringUtil.notBlank(task.getResult())){
+        InspectionTask byId = getById(taskHandle);
+        if (byId==null){
+            throw new BaseException("未找到检验任务");
+        }
+        if(StringUtil.notBlank(byId.getResult())){
             throw new BaseException("检验任务已经保存完成!");
         }
         task.setComments((String) paramMap.get("COMMENTS"));

meapi/src/main/resources/mapper/BomComponentMapper.xml

@@ -695,15 +695,15 @@
         SELECT BC.handle,BC.qty,RS.STEP_ID,OP.OPERATION,BC.COMPONENT_GBO,TP.VALUE ACCESSORY_TYPE
    		FROM SFC SFC
    		JOIN SFC_ROUTING SRI ON SRI.SFC_BO =SFC.HANDLE
-   		JOIN SFC_ROUTER SR ON SRI.HANDLE =SR.SFC_ROUTING_BO
+   		JOIN SFC_ROUTER SR ON SRI.HANDLE =SR.SFC_ROUTING_BO AND SR.IN_USE = 'true'
         JOIN ROUTER_STEP rs ON RS.ROUTER_BO =SR.ROUTER_BO
         JOIN ROUTER_OPERATION ro ON rs.HANDLE =ro.ROUTER_STEP_BO
         JOIN SFC_BOM SB ON SFC.HANDLE =SB.SFC_BO
         JOIN BOM_COMPONENT BC ON SB.BOM_BO =BC.BOM_BO
         LEFT JOIN CUSTOM_FIELDS TP ON BC.COMPONENT_GBO =TP.HANDLE AND TP."ATTRIBUTE"='ACCESSORY_TYPE'
-        LEFT JOIN CUSTOM_FIELDS CF ON BC.HANDLE =CF.HANDLE AND RS.STEP_ID=CF.VALUE AND CF."ATTRIBUTE"='STEP_ID'
+        JOIN CUSTOM_FIELDS CF ON BC.HANDLE =CF.HANDLE AND RS.STEP_ID=CF.VALUE AND CF."ATTRIBUTE"='STEP_ID'
         JOIN BOM_OPERATION BO ON BC.HANDLE =BO.BOM_COMPONENT_BO AND BO.OPERATION_BO = RO.OPERATION_BO
-        JOIN OPERATION OP ON OP.HANDLE= BO.OPERATION_BO OR ('OperationBO:' || #{site}  || ',' || OP.OPERATION  || ',#' = BO.OPERATION_BO AND OP.CURRENT_REVISION = 'true')
+        JOIN OPERATION OP ON OP.HANDLE= BO.OPERATION_BO OR ('OperationBO:' || OP.SITE  || ',' || OP.OPERATION  || ',#' = BO.OPERATION_BO AND OP.CURRENT_REVISION = 'true')
         WHERE SFC.HANDLE=#{sfcBo}
     </select>
 </mapper>

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 {