首检完成

This commit is contained in:
qianhao.xu
2024-01-26 16:59:00 +08:00
parent 9b024fb100
commit 641e9c198a
24 changed files with 359 additions and 52 deletions

View File

@@ -169,6 +169,10 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
IWebHostEnvironment webHostEnvironment = (IWebHostEnvironment)App.ServiceProvider.GetService(typeof(IWebHostEnvironment));
string sFileName = DateTime.Now.ToString("yyyyMMddHHmmss") + formFile.FileName;
string target = Path.Combine(webHostEnvironment.WebRootPath, "workplan", sFileName);
if (!Directory.Exists(target))
{
Directory.CreateDirectory(target);
}
int year = 0;
int week = 0;
using (var stream = formFile.OpenReadStream())
@@ -182,17 +186,18 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
targetFileStream.Write(buffer, 0, bytesRead);
}
//2.0 解析excel
//读取第一行 解析 年和月
var row = stream.Query().Take(1).First();
year = Convert.ToInt32(row.A);
week = Convert.ToInt32(row.B);
//读取列表数据
try
{
//2.0 解析excel
//读取第一行 解析 年和月
var row = stream.Query().Take(1).First();
year = Convert.ToInt32(row.A);
week = Convert.ToInt32(row.B);
var list = stream.Query<ProWorklplan_v2>(sheetName: "Sheet1", startCell: "B3")
.Where(it => it.Partnumber != null)
.Where(it => !it.Partnumber.Contains("合计"))
@@ -203,6 +208,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
it.ToCreate(HttpContext);
it.Year = year;
it.Week = week;
it.NoSchedule = it.RequireNum;
});
string result = proWorkplanService.ImportExceldata(list);
@@ -210,7 +216,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.pro
}
catch (Exception ex)
{
return ToResponse(ResultCode.GLOBAL_ERROR,"模板内容错误,请仔细检测格式,并联系管理员"+ex.Message);
return ToResponse(ResultCode.GLOBAL_ERROR,"内容错误,请仔细检测格式,并联系管理员"+ex.Message);
}
}
return SUCCESS(null);