@ -2318,7 +2318,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
no + + ;
/ / 先查数据字典确认属性 根据属性查横排数 竖排数
String dictType = "bm_prepress_tool" ;
List < DictData > dictDataList = technicalSpecificationMapper . selectDictData ( data . getSite ( ) , dictType ) ;
List < DictData > dictDataList = technicalSpecificationMapper . selectDictData ( data . getSite ( ) , dictType , "" ) ;
if ( dictDataList . isEmpty ( ) ) {
throw new RuntimeException ( "未找到字典类型:" + dictType ) ;
}
@ -2347,7 +2347,22 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
technicalSpecificationMapper . saveBMToolBatch ( tools ) ;
/ / 印版号从Routing的工艺指导中导入 ( 类型是 "Plate no" )
/ / 根据site和字典类型查询字典数据 默认值
List < DictData > dictDataList = technicalSpecificationMapper . selectDictData ( data . getSite ( ) , "routing_work_guide_line" , "Y" ) ;
if ( dictDataList . isEmpty ( ) ) {
return ;
}
/ / 将字典dict_label作为工艺指导名称查指导描述 如果有多条则用 ; 拼接在一起
List < WorkGuidelineVo > lineList = technicalSpecificationMapper . getRoutingGuideLineByLineDesc ( routingDetail . getSite ( ) , routingDetail . getPartNo ( ) , routingDetail . getRoutingRevision ( ) , routingDetail . getRoutingType ( ) , routingDetail . getAlternativeNo ( ) , data . getOperationId ( ) , dictDataList . get ( 0 ) . getDictLabel ( ) ) ;
if ( lineList . isEmpty ( ) ) {
return ;
}
String guildLineText = lineList . stream ( )
. map ( WorkGuidelineVo : : getGuidelineText )
. filter ( StringUtils : : hasText )
. collect ( Collectors . joining ( ";" ) ) ;
/ / 更新印版号
technicalSpecificationMapper . updateBMPrepressDetailPlateNo ( data . getSite ( ) , data . getCodeNo ( ) , guildLineText , data . getCreateBy ( ) ) ;
}
/ * *