Browse Source

1:修改上传模板的信息
2:规格的长度限制为20个字符

yujia 7 years ago
parent
commit
1247e82aca

+ 18 - 0
src/main/java/com/uas/platform/b2c/fa/payment/utils/StringUtils.java

@@ -99,4 +99,22 @@ public class StringUtils {
 		builder.deleteCharAt(builder.length() - 1);
 		return builder.toString();
 	}
+
+
+
+	/**
+	 *	截取指定字节长度的字符串忽略编码格式
+	 *
+	 * @param original 截取的字符串
+	 * @param length 截取的字节长度
+	 * @return
+	 */
+	public static String cutOutStringIgnoreEncode(String original, int length) {
+		if (org.springframework.util.StringUtils.isEmpty(original)) {
+			return original;
+		} else {
+			String substring = original.substring(0, length);
+			return substring;
+		}
+	}
 }

+ 1 - 1
src/main/java/com/uas/platform/b2c/prod/commodity/constant/UploadConstant.java

@@ -138,5 +138,5 @@ public final class UploadConstant {
     /**
      * 规格的最大长度
      */
-    public static final int SPEC_MAX_BYTE = 80;
+    public static final int SPEC_MAX_BYTE = 20;
 }

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

@@ -680,12 +680,8 @@ public class ReleaseProductByBatch implements Serializable {
 	 */
 	public void setSpecByExcel(Object value) {
 		if (!StringUtils.isEmpty(value)) {
-			try {
-				String str = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(value.toString(), UploadConstant.SPEC_MAX_BYTE);
+				String str = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutStringIgnoreEncode(value.toString(), UploadConstant.SPEC_MAX_BYTE);
 				setSpec(str);
-			} catch (UnsupportedEncodingException e) {
-				throw new RuntimeException(e + "指定字符集不支持");
-			}
 		}
 	}
 

+ 1 - 4
src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -298,11 +298,8 @@ public class GoodsServiceImpl implements GoodsService {
 //            throw new IllegalOperatorException("包装信息只能包含中文和英文");
 //        }
         if (!StringUtils.isEmpty(goods.getSpec())) {
-            try {
-                String spec = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutString(goods.getSpec().toString(), UploadConstant.SPEC_MAX_BYTE);
+                String spec = com.uas.platform.b2c.fa.payment.utils.StringUtils.cutOutStringIgnoreEncode(goods.getSpec().toString(), UploadConstant.SPEC_MAX_BYTE);
                 goods.setSpec(spec);
-            } catch (Exception e) {
-            }
         }
         if (StringUtils.isEmpty(goods.getProduceDate())) {
             throw new IllegalOperatorException("型号" + goods.getCode()+"品牌" + goods.getBrandNameEn() +"的产品生产日期为空");

BIN
src/main/resources/jxls-tpl/trade/releaseByBatch-rmb.xls


BIN
src/main/resources/jxls-tpl/trade/releaseByBatchError-rmb.xls


BIN
src/main/resources/jxls-tpl/trade/releaseByBatchError-usd.xls


BIN
src/main/resources/jxls-tpl/trade/releasebyBatch-usd.xls