From 2a5b19cfdf31a9499404bae2e695aa2402df3e63 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 15 九月 2023 17:27:40 +0800
Subject: [PATCH] 校验允许母料型号中间存在空格

---
 src/main/java/com/whyc/service/ProductService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/whyc/service/ProductService.java b/src/main/java/com/whyc/service/ProductService.java
index e79178e..7a2090c 100644
--- a/src/main/java/com/whyc/service/ProductService.java
+++ b/src/main/java/com/whyc/service/ProductService.java
@@ -235,12 +235,13 @@
                         product.setParentCode(sheet.getRow(2).getCell(1).getStringCellValue());
                         product.setParentName(sheet.getRow(2).getCell(2).getStringCellValue());
                         String parentModel = sheet.getRow(2).getCell(3).getStringCellValue();
-                        String regexStr = "[\\/*?\"|:<>\\\\ \t]";
+                        parentModel = parentModel.trim();
+                        String regexStr = "[\\/*?\"|:<>\t]";
                         boolean matches = Pattern.compile(regexStr).matcher(parentModel).find();
                         if(!matches) {
                             product.setParentModel(parentModel);
                         }else{
-                            return response.set(1,false,"姣嶆枡鍨嬪彿鍖呭惈闈炴硶瀛楃:\\/*?\"|:<>鎴栫┖鏍�");
+                            return response.set(1,false,"姣嶆枡鍨嬪彿鍖呭惈闈炴硶瀛楃:\\/*?\"|:<>鎴栧墠缃┖鏍�");
                         }
                     }
                     ProductBom bom = new ProductBom();

--
Gitblit v1.9.1