Browse Source

【产品导入】导入表格产品型号允许加入空格

dongbw 7 years ago
parent
commit
42cc6b065c

+ 1 - 1
src/main/java/com/uas/platform/b2c/core/utils/RegexConstant.java

@@ -38,7 +38,7 @@ public class RegexConstant {
     /**
      * 判断是否只包含数字,英文,英文特殊字符
      */
-    public static final String LetterAndDigitAndEnglishSpecialCharacter = "^[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~@#¥%……&*——+|_\\-A-Za-z0-9]+$";
+    public static final String LetterAndDigitAndEnglishSpecialCharacter = "^[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~@#¥%……&*——+|_\\- A-Za-z0-9]+$";
 
     /**
      * 验证字符串是否为数字

+ 1 - 1
src/main/java/com/uas/platform/b2c/prod/commodity/model/ReleaseProductByBatch.java

@@ -523,7 +523,7 @@ public class ReleaseProductByBatch implements Serializable {
 
 	public void setCodeByExcel(Object value) {
 		if (!StringUtils.isEmpty(value)) {
-			String code = value.toString();
+			String code = value.toString().trim();
 			Matcher matcher = codePattern.matcher(code);
 			if (!matcher.find()) {
 				addErrmsg(ErrorInfoConstant.CODE_PATTERN_INFO.getInfo());