|
|
|
@ -377,8 +377,12 @@ public class CommodityServiceImpl implements CommodityService { |
|
|
|
|
} |
|
|
|
|
num++; |
|
|
|
|
} |
|
|
|
|
R ok = R.ok(); |
|
|
|
|
if(resultMap.size() > 0){ |
|
|
|
|
ok = R.error(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return R.ok().put("list", resultMap).put("msg", "导入成功" + num + "条").put("count", commodityCodeList.size()) |
|
|
|
|
return ok.put("list", resultMap).put("msg", "导入成功" + num + "条").put("count", commodityCodeList.size()) |
|
|
|
|
.put("fail", resultMap.size()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|