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

工单对象中 去掉了两个字段 增加了工单状态

Browse Source
This commit is contained in:
xiaowei.song
2023-11-24 08:45:24 +08:00
parent 08ba5f0652
commit add375531b
8 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ZR.Admin.WebApi/Controllers/mes/pro/ProWorkorderController.cs
View File

@@ -39,7 +39,7 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
[HttpGet("getworkorderListwithoutschedule")]
public IActionResult GetWorkorderListWithoutSchedule(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
{
(List<ProWorkorder>, int) data = proWorkorderService.GetWorkorderList(pageNum, pageSize, year, week, date, "0");
(List<ProWorkorder>, int) data = proWorkorderService.GetWorkorderList(pageNum, pageSize, year, week, date, 0);
return ToResponse(new ApiResult(200, "success", data));
}
@@ -56,7 +56,7 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
[HttpGet("getworkorderListwithschedule")]
public IActionResult GetWorkorderListWithSchedule(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
{
(List<ProWorkorder>, int) data = proWorkorderService.GetWorkorderList(pageNum, pageSize, year, week, date, "1");
(List<ProWorkorder>, int) data = proWorkorderService.GetWorkorderList(pageNum, pageSize, year, week, date, 1);
return ToResponse(new ApiResult(200, "success", data));
}

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

@@ -200,7 +200,8 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
{
if(item.Id.Equals(workorderId)) // 找到当前工单ID的对象
{
if(!string.IsNullOrEmpty(item.Isarrange)) isArrange = item.Isarrange;
//if(!string.IsNullOrEmpty(item.Wrokerorder_status)) isArrange = item.Isarrange;
isArrange = item.Wrokerorder_status.ToString();
currentWorkorder = item;
break;
}
@@ -268,10 +269,7 @@ namespace ZR.Admin.WebApi.Controllers.MES.pro
string isArrange = "0";
// 排产状态非空
if (!string.IsNullOrEmpty(lstWorkorder[0].Isarrange))
{
isArrange = lstWorkorder[0].Isarrange;
}
isArrange = lstWorkorder[0].Wrokerorder_status.ToString();
// 排产状态为 0 ，可执行删除
if ("0".Equals(isArrange))

2
ZR.Admin.WebApi/Controllers/mes/qu/QuRoughController.cs
View File

@@ -35,7 +35,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.qu
[HttpGet("getworkorderList")]
public IActionResult GetWorkorderList(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
{
(List<ProWorkorder>, int) data = quRoughService.GetWorkorderList(pageNum, pageSize, year, week, date, "1");
(List<ProWorkorder>, int) data = quRoughService.GetWorkorderList(pageNum, pageSize, year, week, date, 1);
return ToResponse(new ApiResult(200, "success", data));
}