Skip to content

L
Laisi_AutoMES2
Commit ac84e1b6 by xin.yang
Options

some update

parent b94eaca4
Showing with 7 additions and 7 deletions
Server/Apis/Siger.ApiACC/Controllers/AutomationLocationController.cs
...@@ -90,9 +90,9 @@ namespace Siger.ApiACC.Controllers ...@@ -90,9 +90,9 @@ namespace Siger.ApiACC.Controllers
guid = Guid.NewGuid().ToString(), guid = Guid.NewGuid().ToString(),
locationid = req.locationid.ToInt(), locationid = req.locationid.ToInt(),
fixturetools = fixturetool.guid, fixturetools = fixturetool.guid,
materialid = req.materialid.ToInt(), //materialid = req.materialid.ToInt(),
processid = req.processid.ToInt(), //processid = req.processid.ToInt(),
materialstate = state, //materialstate = state,
attachment = req.fileurl, attachment = req.fileurl,
filename = req.filename, filename = req.filename,
remark = req.remark, remark = req.remark,
...@@ -156,9 +156,9 @@ namespace Siger.ApiACC.Controllers ...@@ -156,9 +156,9 @@ namespace Siger.ApiACC.Controllers
} }
entity.locationid = req.locationid.ToInt(); entity.locationid = req.locationid.ToInt();
entity.fixturetools = fixturetool.guid; entity.fixturetools = fixturetool.guid;
entity.materialid = req.materialid.ToInt(); //entity.materialid = req.materialid.ToInt();
entity.processid = req.processid.ToInt(); //entity.processid = req.processid.ToInt();
entity.materialstate = state; //entity.materialstate = state;
entity.attachment = req.fileurl; entity.attachment = req.fileurl;
entity.filename = req.filename; entity.filename = req.filename;
entity.remark = req.remark; entity.remark = req.remark;
......
Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationFixtureToolsProductRepository.cs
...@@ -40,7 +40,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories ...@@ -40,7 +40,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
productname = p.name, productname = p.name,
remark = q.remark, remark = q.remark,
updator = u.name ?? "", updator = u.name ?? "",
updatetime = q.updatetime.HasValue && q.updatetime > DateTime.MinValue ? q.updatetime.Value.ToString(ParameterConstant.DateTimeFormat) : ""， updatetime = q.updatetime.HasValue && q.updatetime > DateTime.MinValue ? q.updatetime.Value.ToString(ParameterConstant.DateTimeFormat) : "",
fileurl = q.attachment, fileurl = q.attachment,
filename = q.filename filename = q.filename
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment