|
|
@@ -484,7 +484,10 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
var BrandId = 0;
|
|
|
var FromStoreId = 0;
|
|
|
string error = "";
|
|
|
-
|
|
|
+ if (string.IsNullOrEmpty(ExcelData))
|
|
|
+ {
|
|
|
+ return "Warning|" + "请选择要导入的数据";
|
|
|
+ }
|
|
|
ExcelData = HttpUtility.UrlDecode(ExcelData);
|
|
|
JsonData list = JsonMapper.ToObject(ExcelData);
|
|
|
List<string> PosSnList = new List<string>();
|
|
|
@@ -580,7 +583,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
PosMachinesTwo machine = db.PosMachinesTwo.FirstOrDefault(m => m.Id == machinefor.SnId && m.BuyUserId == 0 && m.UserId == 0) ?? new PosMachinesTwo();
|
|
|
if (machine.Id > 0)
|
|
|
{
|
|
|
- if(machine.BrandId != BrandId)
|
|
|
+ if (machine.BrandId != BrandId)
|
|
|
{
|
|
|
return machine.PosSn + "与表格里填写的品牌不一致";
|
|
|
}
|