|
|
@@ -109,8 +109,9 @@ public class toolscode extends Controller {
|
|
|
skuquerySQL.setWhere("t1.sku", rows.toArrayList("sku"));
|
|
|
Rows skuRows = skuquerySQL.query();
|
|
|
RowsMap skuRowsMap = skuRows.toRowsMap("sku");
|
|
|
+ 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", "错误信息:商品编号，序列号不能为空");
|
|
|
@@ -119,9 +120,13 @@ public class toolscode extends Controller {
|
|
|
// msg = "手机号，省市县及来源不能为空";
|
|
|
} else {
|
|
|
if (itemRowsMap.containsKey(row.getString("itemno"))) {
|
|
|
- if (skuRowsMap.containsKey(row.getString("sku"))) {
|
|
|
+ if (skuRowsMap.containsKey(sku)) {
|
|
|
+ iserr = true;
|
|
|
+ row.put("msg", "错误信息:序列号" + sku + "已存在");
|
|
|
+ rowserr.add(row);
|
|
|
+ }else if(rowsMap.get(sku).size()>1){
|
|
|
iserr = true;
|
|
|
- row.put("msg", "错误信息:序列号" + row.getString("sku") + "已存在");
|
|
|
+ row.put("msg", "错误信息:序列号" + sku + "在excel中重复存在");
|
|
|
rowserr.add(row);
|
|
|
} else {
|
|
|
row.put("itemid", itemRowsMap.get(row.getString("itemno")).get(0).getString("itemid"));
|
|
|
@@ -145,7 +150,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"));
|
|
|
+ sqlFactoryupload.addParameter("sku", row.getString("sku").replaceAll(" ", ""));
|
|
|
sqlFactoryupload.addParameter("sa_itemskuid", sa_itemskuid);
|
|
|
sqlFactoryupload.addParameter("islimit", 0);
|
|
|
sqlFactoryupload.addParameter("sys_enterpriseid", 0);
|
