修改产品导入模板

src/main/java/com/uas/platform/b2c/external/erp/product/service/impl/KindServiceImpl.java

@@ -109,37 +109,37 @@ public class KindServiceImpl implements KindService {
         return kindPropertyUas;
     }
 
-    @Override
-    public Map<String, List<KindUas>> getParentsByKindCode(String kindCode) {
-        Map<Long, Kind> maps = new HashMap<>();
-        // 第一步是模糊查询所有的叶子节点
-        Map<String, List<KindUas>> kindMaps = new HashMap<>();
-        List<Kind> kinds = kindDao.findByKindCode(kindCode);
-        for (Kind kind : kinds) {
-            List<Kind> list = getParentsByChildId(kind.getId());
-            List<KindUas> kindUass = new ArrayList<>();
-            for (Kind k : list) {
-                kindUass.add(ModelConverter.convertUas(k));
-            }
-            if (kindMaps.size() > 0 && kindMaps.containsKey(list.get(0).getId())) {
-                Map<Long, KindUas> map = new HashMap<>();
-                for (KindUas k : kindUass) {
-                    map.put(k.getId(), k);
-                }
-                List<KindUas> oldList = kindMaps.get(list.get(0).getId());
-                for (KindUas k : oldList) {
-                    map.put(k.getId(), k);
-                }
-                List<KindUas> newList = new ArrayList<>();
-                for (KindUas k : map.values()) {
-                    newList.add(k);
-                }
-                kindMaps.put(list.get(0).getId().toString(), newList);
-            } else {
-                kindMaps.put(list.get(0).getId().toString(), kindUass);
-            }
-        }
-        return kindMaps;
-    }
+//    @Override
+//    public Map<String, List<KindUas>> getParentsByKindCode(String kindCode) {
+//        Map<Long, Kind> maps = new HashMap<>();
+//        // 第一步是模糊查询所有的叶子节点
+//        Map<String, List<KindUas>> kindMaps = new HashMap<>();
+//        List<Kind> kinds = kindDao.findByKindCode(kindCode);
+//        for (Kind kind : kinds) {
+//            List<Kind> list = getParentsByChildId(kind.getId());
+//            List<KindUas> kindUass = new ArrayList<>();
+//            for (Kind k : list) {
+//                kindUass.add(ModelConverter.convertUas(k));
+//            }
+//            if (kindMaps.size() > 0 && kindMaps.containsKey(list.get(0).getId())) {
+//                Map<Long, KindUas> map = new HashMap<>();
+//                for (KindUas k : kindUass) {
+//                    map.put(k.getId(), k);
+//                }
+//                List<KindUas> oldList = kindMaps.get(list.get(0).getId());
+//                for (KindUas k : oldList) {
+//                    map.put(k.getId(), k);
+//                }
+//                List<KindUas> newList = new ArrayList<>();
+//                for (KindUas k : map.values()) {
+//                    newList.add(k);
+//                }
+//                kindMaps.put(list.get(0).getId().toString(), newList);
+//            } else {
+//                kindMaps.put(list.get(0).getId().toString(), kindUass);
+//            }
+//        }
+//        return kindMaps;
+//    }
 
 }

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

@@ -41,7 +41,7 @@ public class ReleaseProductByBatch implements Serializable {
 
 	static {
 		String[] array = {"Bulk-散装", "Reel-卷装", "Tape/Reel-编带", "Tray-盘装",
-				"Tube-管装", "盒装", "袋装", "罐装", "瓶装", "桶装", "箱装"};
+				"Tube-管装", "盒装", "袋装", "罐装", "瓶装", "桶装", "箱装", "其他"};
 		PACKAGING_LIST = Arrays.asList(array);
 	}
 

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

@@ -1,5 +1,7 @@
 package com.uas.platform.b2c.prod.commodity.service.impl;
 
+import static com.uas.platform.b2c.core.utils.NumberUtil.fractionNumCeil;
+
 import com.alibaba.fastjson.JSON;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.service.EnterpriseService;
@@ -20,7 +22,12 @@ import com.uas.platform.b2c.prod.commodity.dao.ProductDao;
 import com.uas.platform.b2c.prod.commodity.dao.ProductPersonDao;
 import com.uas.platform.b2c.prod.commodity.dao.ProductPrivateDao;
 import com.uas.platform.b2c.prod.commodity.dao.ReleaseProductByBatchDao;
-import com.uas.platform.b2c.prod.commodity.model.*;
+import com.uas.platform.b2c.prod.commodity.model.Goods;
+import com.uas.platform.b2c.prod.commodity.model.GoodsQtyPrice;
+import com.uas.platform.b2c.prod.commodity.model.Product;
+import com.uas.platform.b2c.prod.commodity.model.ProductPerson;
+import com.uas.platform.b2c.prod.commodity.model.ProductPrivate;
+import com.uas.platform.b2c.prod.commodity.model.ReleaseProductByBatch;
 import com.uas.platform.b2c.prod.commodity.service.GoodsService;
 import com.uas.platform.b2c.prod.commodity.service.ReleaseProductByBatchService;
 import com.uas.platform.b2c.prod.commodity.util.GoodsUtil;
@@ -34,10 +41,33 @@ import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.persistence.criteria.CriterionExpression;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.platform.core.persistence.criteria.SimpleExpression;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataAccessException;
@@ -50,22 +80,6 @@ import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import java.math.BigDecimal;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static com.uas.platform.b2c.core.utils.NumberUtil.fractionNumCeil;
-
 @Service
 public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchService {
 
@@ -378,11 +392,11 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 			} else {
 				String title = StringUtilB2C.replaceLineBreak(priceCellObj.toString());
 				if (Currency.USD.equals(currency)) {
-					if (!title.equals("USD单价1")) {
+					if (!title.equals("USD/PCS单价1")) {
 						throw new IllegalOperatorException("您上传的文件表头与美金模板不符");
 					}
 				} else {
-					if (!title.equals("RMB单价1")) {
+					if (!title.equals("RMB/PCS单价1")) {
 						throw new IllegalOperatorException("您上传的文件表头与人民币模板不符");
 					}
 				}

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -39,7 +39,7 @@ define(['app/app', 'jquery-uploadify'], function(app) {
      */
     $scope.maxReserve = 999999999;
 
-    $scope.packageArray = ["请选择", "Bulk-散装", "Reel-卷装", "Tape/Reel-编带", "Tray-盘装", "Tube-管装", "盒装", "袋装", "罐装", "瓶装", "桶装", "箱装"];
+    $scope.packageArray = ["请选择", "Bulk-散装", "Reel-卷装", "Tape/Reel-编带", "Tray-盘装", "Tube-管装", "盒装", "袋装", "罐装", "瓶装", "桶装", "箱装", "其他"];
 
     $scope.showText = function(item) {
       $scope.goods.editPackaging = item;