Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of 192.168.0.36:doan/mes

Browse Source
This commit is contained in:
xiaowei.song
2023-11-15 17:04:45 +08:00
parent cceb0384b1 9a4de72e62
commit cdb98b3748
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs
View File

@@ -168,8 +168,6 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
[HttpPost("importExcel")]
public IActionResult ImportExcel()
{
IFormFileCollection files = Request.Form.Files;
foreach (IFormFile file in files)
{
@@ -193,11 +191,6 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
return null;
}
public IActionResult importTemplate()
{
return null;
}
}
}

1
ZR.Admin.WebApi/Controllers/mes/pro/ProWorkplanController.cs
View File

@@ -174,7 +174,6 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
public IActionResult UpdateWorkorder([FromBody] ProWorkorder proWorkorder)
{
// TODO 判断更新的数量是否超过计划数
int data = 0;
if (proWorkorder != null)
{