调整官品管理上架模板

src/main/java/com/uas/platform/b2c/prod/commodity/constant/ErrorInfoConstant.java

@@ -33,8 +33,10 @@ public enum  ErrorInfoConstant {
     CODE_LENGTH_INFO("产品型号不能超过100字符"),
     CODE_EMPTY_INFO("产品型号不能为空"),
 
-    BRAND_LENGTH_INFO("品牌名称不能超过50个字符或25个汉字"),
-    BRAND_EMPTY_INFO("英文品牌不能为空"),
+    BRAND_LENGTH_INFO("英文/中文品牌名称不能超过50个字符或25个汉字"),
+    BRAND_EMPTY_INFO("英文/中文品牌名称不能为空"),
+    KIND_EMPTY_INFO("类目(产品名称)不能为空"),
+    KIND_LENGTH_INFO("类目(产品名称)不能超过20个字符"),
     BREAK_UP_INFO("请选择可拆卖情况是或否"),
     RESERVE_NUMBER_INFO("库存须填写小于10亿的正整数"),
     PRODUCE_DATE_INFO("生产日期不能为空"),

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

@@ -20,123 +20,124 @@ public final class UploadConstant {
      */
     public static final int EXCEL_MAX_ROW = 2000;
 
+    /**
+     * 英文品牌名
+     */
+    public static final int BRAND_ENGLISH = 0;
+
+    /**
+     * 类目
+     */
+    public static final int KIND = 1;
+
     /**
      * 产品型号
      */
-    public static final int PRODUCT_CODE = 0;
+    public static final int PRODUCT_CODE = 2;
+
 
     /**
-     * 英文品牌名
+     * 规格
      */
-    public static final int BRAND_ENGLISH = 1;
+    public static final int SPEC = 3;
+
 
     /**
      * 是否拆卖
      */
-    public static final int BREAK_UP = 2;
+    public static final int BREAK_UP = 4;
 
     /**
      * 规则数据（个人）
      */
-    public static final int SPECIFICATION = 2;
+    public static final int SPECIFICATION = 3;
 
     /**
      * 库存数量
      */
-    public static final int RESERVE_NUMBER = 3;
+    public static final int RESERVE_NUMBER = 5;
 
     /**
      * 生产日期
      */
-    public static final int PRODUCE_DATE = 4;
+    public static final int PRODUCE_DATE = 6;
 
     /**
      * 包装方式
      */
-    public static final int PACKAGE_METHOD = 5;
+    public static final int PACKAGE_METHOD = 7;
 
     /**
      * 最小交期
      */
-    public static final int MIN_DELIVERY = 6;
+    public static final int MIN_DELIVERY = 8;
 
     /**
      * 最大交期
      */
-    public static final int MAX_DELIVERY = 7;
-
-    /**
-     * 规格
-     */
-    public static final int SPEC = 8;
-
+    public static final int MAX_DELIVERY = 9;
     /**
      * 最小包装数量
      */
-    public static final int PACKAGE_NUMBER = 9;
+    public static final int PACKAGE_NUMBER = 10;
 
     /**
      * 最小起订量
      */
-    public static final int BUY_MIN_QTY = 10;
+    public static final int BUY_MIN_QTY = 11;
 
     /**
      * 分段价格开始
      */
-    public static final int PRICE_START = 11;
+    public static final int PRICE_START = 12;
 
     /**
      * 第二个分段
      */
-    public static final int QTY_SECOND_START = 12;
+    public static final int QTY_SECOND_START = 13;
 
     /**
      * 第二个分段
      */
-    public static final int PRICE_SECOND = 13;
+    public static final int PRICE_SECOND = 14;
 
     /**
      * 第三个分段
      */
-    public static final int QTY_THIRD_START = 14;
+    public static final int QTY_THIRD_START = 15;
 
     /**
      * 第三个分段
      */
-    public static final int PRICE_THIRD = 15;
-
-    /**
-     * 分段价格结束
-     */
-    public static final int PRICE_END = 14;
+    public static final int PRICE_THIRD = 16;
 
     /**
      * 自定义标签
      */
-    public static final int CUSTOM_LABEL = 16;
+    public static final int CUSTOM_LABEL = 17;
 
     /**
      * 导入表的最大列数
      */
-    public static final int TOTAL_COLUMN = 17;
+    public static final int TOTAL_COLUMN = 18;
 
     /**
      * 用户可能直接用导入失败的表格进行导入
      */
-    public static final int MAX_TOTAL_COLUMN = 18;
+    public static final int MAX_TOTAL_COLUMN = 19;
 
     /**
      * 个人导入表的最大列数
      */
-    public static final int TOTAL_COLUMN_PERSON = 3;
+    public static final int TOTAL_COLUMN_PERSON = 4;
 
     /**
      * 个人用户可能直接用导入失败的表格进行导入
      */
-    public static final int MAX_TOTAL_COLUMN_PERSON = 4;
+    public static final int MAX_TOTAL_COLUMN_PERSON = 5;
 
     /**
      * 规格的最大长度
      */
-    public static final int SPEC_MAX_BYTE = 20;
+    public static final int SPEC_MAX_BYTE = 50;
 }

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

@@ -578,6 +578,21 @@ public class ReleaseProductByBatch implements Serializable {
 		setB2cBranden(StringUtilB2C.toEnglish(StringUtilB2C.getStr(value)));
 	}
 
+	public void setKindByExcel(Object value) {
+		if (StringUtils.isEmpty(value)) {
+			addErrmsg(ErrorInfoConstant.KIND_EMPTY_INFO.getInfo());
+		} else {
+			try {
+				if (value.toString().getBytes("GBK").length > 20) {
+					addErrmsg(ErrorInfoConstant.KIND_LENGTH_INFO.getInfo());
+				}
+			} catch (UnsupportedEncodingException e) {
+				throw new RuntimeException(e + "指定字符集不支持");
+			}
+		}
+		setKindName(StringUtilB2C.getStr(value));
+	}
+
 	public void setCodeByExcel(Object value) {
 		if (!StringUtils.isEmpty(value)) {
 			String code = value.toString().trim();

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -707,7 +707,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 
 			Object specCellObj = readWorkBookCell(headerRow.getCell(UploadConstant.SPECIFICATION), Cell.CELL_TYPE_STRING,
 					0, UploadConstant.SPECIFICATION);
-			if (!"规格".equals(StringUtilB2C.getStr(specCellObj))) {
+			if (!"规格(含参数、封装)".equals(StringUtilB2C.getStr(specCellObj))) {
 				throw new IllegalOperatorException("您上传的信息列信息不正确，请与模板的列做比较");
 			}
 		} else {
@@ -958,12 +958,6 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 	private int convertValueToProduct(Row row, ReleaseProductByBatch aProduct, int rowNum, boolean isAPerson) {
 		// 统计为空的个数
 		int result = 0;
-		Object codeValue = readWorkBookCell(row.getCell(UploadConstant.PRODUCT_CODE), Cell.CELL_TYPE_STRING,
-				rowNum, UploadConstant.PRODUCT_CODE);
-		if (StringUtils.isEmpty(codeValue)) {
-			result += 1;
-		}
-		aProduct.setCodeByExcel(codeValue);
 
 		Object brandValue = readWorkBookCell(row.getCell(UploadConstant.BRAND_ENGLISH), Cell.CELL_TYPE_STRING,
 				rowNum, UploadConstant.BRAND_ENGLISH);
@@ -972,6 +966,25 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		}
 		aProduct.setBrandEnByExcel(brandValue);
 
+		Object kindValue = readWorkBookCell(row.getCell(UploadConstant.KIND), Cell.CELL_TYPE_STRING,
+				rowNum, UploadConstant.KIND);
+		if (StringUtils.isEmpty(kindValue)) {
+			result += 1;
+		}
+		aProduct.setKindByExcel(kindValue);
+
+		Object codeValue = readWorkBookCell(row.getCell(UploadConstant.PRODUCT_CODE), Cell.CELL_TYPE_STRING,
+				rowNum, UploadConstant.PRODUCT_CODE);
+		if (StringUtils.isEmpty(codeValue)) {
+			result += 1;
+		}
+		aProduct.setCodeByExcel(codeValue);
+
+
+		Object specValue = readWorkBookCell(row.getCell(UploadConstant.SPEC), Cell.CELL_TYPE_STRING,
+				rowNum, UploadConstant.SPEC);
+		aProduct.setSpecByExcel(specValue);
+
 		if (!isAPerson) {
 			Object breakValue = readWorkBookCell(row.getCell(UploadConstant.BREAK_UP), Cell.CELL_TYPE_STRING,
 					rowNum, UploadConstant.BREAK_UP);
@@ -1013,10 +1026,6 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 				setDeliveryTime(aProduct, minValue, maxValue);
 			}
 
-			Object specValue = readWorkBookCell(row.getCell(UploadConstant.SPEC), Cell.CELL_TYPE_STRING,
-					rowNum, UploadConstant.SPEC);
-			aProduct.setSpecByExcel(specValue);
-
 			Object packageNumValue = readWorkBookCell(row.getCell(UploadConstant.PACKAGE_NUMBER), Cell.CELL_TYPE_STRING,
 					rowNum, UploadConstant.PACKAGE_NUMBER);
 			aProduct.setMinPackageByExcel(packageNumValue);