（当前和历史坯料计划的坯料来源都是新料，或者当前坯料计划坯料来源不是新料）

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsBlankOrderDao.java

@@ -189,8 +189,8 @@ public interface ApsBlankOrderDao extends BaseMapper<ApsBlankOrderDo> {
     @Select("select * from aps_process_operation_process_equ where DELETED = 0 ORDER BY PLANSTARTDATE DESC LIMIT 1")
     ApsProcessOperationProcessEquDo selectLatestEqu();
 
-    @Select("select ID,CRAFTROUTEID from aps_blank_order where DELETED='0' and IFNULL(CRAFTROUTEID,'')!='' and IFNULL(PROCESSDESC,'')=#{processdesc} order by MODIFYDATE desc limit 1")
-    ApsBlankOrderDo getHistoryBlank(@Param("processdesc") String processdesc);
+    @Select("select ID,CRAFTROUTEID from aps_blank_order where DELETED='0' and IFNULL(CRAFTROUTEID,'')!='' and IFNULL(PROCESSDESC,'')=#{processdesc} ${xlstr} order by MODIFYDATE desc limit 1")
+    ApsBlankOrderDo getHistoryBlank(@Param("processdesc") String processdesc,@Param("xlstr") String xlstr);
 
     void updateProcessOutputBatchById(@Param("list") List<ApsProcessOutputProductDo> list);
 

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -2681,7 +2681,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
         //自动匹配工艺路线 && apsProductionOrderDo.getAuditstatus().equals("待制定坯料计划")
         if (checkLevel == 1 && idmatureprocess && StringUtils.isEmpty(apsBlankOrderDo.getCraftrouteid())) {
-            ApsBlankOrderDo historyBlank = apsBlankOrderDao.getHistoryBlank(endProcessDesc);
+            String xlstr="";
+            if(apsBlankOrderDo.getBlankcomefrom().equals("新料")){
+                xlstr="and IFNULL(BLANKCOMEFROM,'')='新料'";
+            }
+            ApsBlankOrderDo historyBlank = apsBlankOrderDao.getHistoryBlank(endProcessDesc,xlstr);
             if (historyBlank != null) {
                 Map<String, Object> processMap = new HashMap<>();
                 Map<String, Object> blankMap = new HashMap<>();