!11 优化商品导入功能

Merge pull request !11 from 码农的春天/master

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.jsh</groupId>
   <artifactId>jshERP</artifactId>
-  <version>2017.10.13</version>
+  <version>2017.10.23</version>
   <packaging>war</packaging>  
   <name>jshERP</name> 
   <url>http://git.oschina.net/jishenghua/JSH_ERP</url>

src/main/java/com/jsh/util/MaterialConstants.java

@@ -31,55 +31,45 @@ public interface MaterialConstants
          */
         public static final int EXCEL_CATEGORY = 1;
 
-        /**
-         * 颜色
-         */
-        public static final int EXCEL_COLOR = 2;
-
         /**
          * 型号
          */
-        public static final int EXCEL_MODEL = 3;
+        public static final int EXCEL_MODEL = 2;
-
-        /**
-         * 规格
-         */
-        public static final int EXCEL_STANDARD = 4;
 
         /**
          * 安全存量
          */
-        public static final int EXCEL_SAFETY_STOCK = 5;
+        public static final int EXCEL_SAFETY_STOCK = 3;
 
         /**
          * 单位
          */
-        public static final int EXCEL_UNIT = 6;
+        public static final int EXCEL_UNIT = 4;
 
         /**
          * 零售价
          */
-        public static final int EXCEL_RETAILPRICE = 7;
+        public static final int EXCEL_RETAILPRICE = 5;
 
         /**
          * 最低售价
          */
-        public static final int EXCEL_LOWPRICE = 8;
+        public static final int EXCEL_LOWPRICE = 6;
 
         /**
-         * 预设售价一
+         * 预计采购价
          */
-        public static final int EXCEL_PRESETPRICEONE = 9;
+        public static final int EXCEL_PRESETPRICEONE = 7;
 
         /**
-         * 预设售价二
+         * 批发价
          */
-        public static final int EXCEL_PRESETPRICETWO = 10;
+        public static final int EXCEL_PRESETPRICETWO = 8;
 
         /**
          * 备注
          */
-        public static final int EXCEL_REMARK = 11;
+        public static final int EXCEL_REMARK = 9;
 
         /**
          * 表头