外协结算

blade-service/blade-desk/src/main/java/org/springblade/desk/oem/service/impl/OemStatementServiceImpl.java

@@ -1514,7 +1514,7 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
                         statementVO.setPriceSheetList(matchedPriceSheets);
                         // 4.匹配规则，过滤出唯一报价
                         // 涂色标跳过
-                        if (!hasColorCount(statementVO)) {
+                        if (!isTsb(statementVO.getPsName())) {
                             // (1) 供应商代码 + 工序 + 零件号 + 生产标识 + 计划单号 + 现执行价格
                             if (rule1(statementVO, price)) {
                                 continue;
@@ -1557,6 +1557,9 @@ public class OemStatementServiceImpl extends BaseServiceImpl<OemStatementMapper,
         return statementVOS;
     }
 
+    private boolean isTsb(String psName){
+        return "涂色标".equals(psName);
+    }
     /**
      * 获取报价单列表
      *