序列号导入重复bug修复

src/custom/restcontroller/webmanage/sale/toolscode/toolscode.java

@@ -78,7 +78,7 @@ public class toolscode extends Controller {
             // 华为云
             e = getExcelAttachment(content.getLong("attachmentid"));
             // 本地
-            //e = getPostExcelFactory();
+            //e = getPostExcel();
 
             // Rows keyRow = dbConnect.runSqlQuery("select fagentnum,faddress from tagents
             // where 1=2");
@@ -109,9 +109,11 @@ public class toolscode extends Controller {
             skuquerySQL.setWhere("t1.sku", rows.toArrayList("sku"));
             Rows skuRows = skuquerySQL.query();
             RowsMap skuRowsMap = skuRows.toRowsMap("sku");
+            for (Row row : rows) {
+                row.put("sku",row.getString("sku").replaceAll(" ", ""));
+            }
             RowsMap rowsMap = rows.toRowsMap("sku");
             for (Row row : rows) {
-                String sku = row.getString("sku").replaceAll(" ", "");
                 if (StringUtils.isEmpty(row.getString("itemno")) || StringUtils.isEmpty(row.getString("sku"))) {
                     iserr = true;
                     row.put("msg", "错误信息:商品编号，序列号不能为空");
@@ -120,13 +122,13 @@ public class toolscode extends Controller {
                     // msg = "手机号，省市县及来源不能为空";
                 } else {
                     if (itemRowsMap.containsKey(row.getString("itemno"))) {
-                        if (skuRowsMap.containsKey(sku)) {
+                        if (skuRowsMap.containsKey(row.getString("sku"))) {
                             iserr = true;
-                            row.put("msg", "错误信息:序列号" + sku + "已存在");
+                            row.put("msg", "错误信息:序列号" + row.getString("sku") + "已存在");
                             rowserr.add(row);
-                        }else if(rowsMap.get(sku).size()>1){
+                        }else if(rowsMap.get(row.getString("sku")).size()>1){
                             iserr = true;
-                            row.put("msg", "错误信息:序列号" + sku + "在excel中重复存在");
+                            row.put("msg", "错误信息:序列号" + row.getString("sku") + "在excel中重复存在");
                             rowserr.add(row);
                         } else {
                             row.put("itemid", itemRowsMap.get(row.getString("itemno")).get(0).getString("itemid"));
@@ -150,7 +152,7 @@ public class toolscode extends Controller {
                     sqlFactoryupload.addParameter("userid", userid);
                     sqlFactoryupload.addParameter("username", username);
                     sqlFactoryupload.addParameter("itemid", row.getString("itemid"));
-                    sqlFactoryupload.addParameter("sku", row.getString("sku").replaceAll(" ", ""));
+                    sqlFactoryupload.addParameter("sku", row.getString("sku"));
                     sqlFactoryupload.addParameter("sa_itemskuid", sa_itemskuid);
                     sqlFactoryupload.addParameter("islimit", 0);
                     sqlFactoryupload.addParameter("sys_enterpriseid", 0);