RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/doan-tech/zhuangpei-mesbackend

Browse Source
This commit is contained in:
赵正易 2024-08-15 10:57:12 +08:00
commit c65e6625db
5 changed files with 75 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
DOAN.Admin.WebApi/Controllers/JobKanban/LoginOrSetController.cs
View File

@ -131,7 +131,7 @@ namespace DOAN.Admin.WebApi.Controllers.JobKanban
return SUCCESS(response);
}
/// <summary>
/// 完成 工单和报工
/// 完成 工单和报工 (废弃)
/// </summary>
/// <param name="workorder"></param>
/// <returns></returns>
@ -147,6 +147,23 @@ namespace DOAN.Admin.WebApi.Controllers.JobKanban
var response = _LoginOrSetService.FinishWorkOrder(reportWork);
return SUCCESS(response);
}
/// <summary>
/// TODO 完成 工单和报工 (启用)
/// </summary>
/// <param name="workorder"></param>
/// <returns></returns>
[HttpPost("finish_workorder2")]
public IActionResult FinishWorkOrder2([FromBody] ProReportworkDto3 reportWorkDto)
{
if (reportWorkDto == null)
{
return SUCCESS(null);
}
ProReportwork reportWork = reportWorkDto.Adapt<ProReportwork>();
reportWork.ToCreate(HttpContext);
var response = _LoginOrSetService.FinishWorkOrder(reportWork);
return SUCCESS(response);
}
// 获取今日总任务数 ，剩余任务数

28
DOAN.Model/MES/product/Dto/ProReportworkDto.cs
View File

@ -75,5 +75,33 @@ namespace DOAN.Model.MES.product.Dto
}
public class ProReportworkDto3
{
public string FkWorkorder { get; set; }
public int? DispatchNum { get; set; }
public int? FinishedNum { get; set; }
public string GroupCode { get; set; }
//组id
public string Group_Schedule_Id { get; set; }
public string LineCode { get; set; }
/// <summary>
/// 工艺路线id
/// </summary>
public int Fk_route_id { get; set; }
//public string CreatedBy { get; set; }
}
}

15
DOAN.Model/MES/product/ProReportwork.cs
View File

@ -42,20 +42,25 @@ namespace DOAN.Model.MES.product
[SugarColumn(ColumnName = "group_code")]
public string GroupCode { get; set; }
/// <summary>
/// 组id
/// </summary>
[SugarColumn(ColumnName = "fk_group_schedule_id")]
public string Group_Schedule_Id { get; set; }
/// <summary>
/// 线code
/// </summary>
[SugarColumn(ColumnName = "line_code")]
public string LineCode { get; set; }
/// <summary>
/// 班组长
/// 工艺路线id
/// </summary>
[SugarColumn(ColumnName = "group_leader")]
public string GroupLeader { get; set; }
[SugarColumn(ColumnName = "fk_route_id")]
public int Fk_route_id { get; set; }
/// <summary>
/// 创建人
/// </summary>

31
DOAN.Service/JobKanban/LoginOrSetService.cs
View File

@ -162,22 +162,23 @@ namespace DOAN.Service.JobKanban
workorderStatus.CreatedTime = DateTime.Now;
Context.Insertable(workorderStatus).ExecuteCommand();
reportWorkDto.Id = XueHua;
reportWorkDto.DispatchNum = DispatchNum;
Context.Storageable(reportWorkDto)
.WhereColumns(it => it.FkWorkorder)
.ExecuteCommand();
});
ProReportwork reportWork = new ProReportwork();
reportWork.Id = XueHua;
reportWork.FkWorkorder = reportWorkDto.FkWorkorder;
reportWork.DispatchNum = DispatchNum;
reportWork.FinishedNum = reportWorkDto.FinishedNum;
reportWork.GroupCode = reportWorkDto.GroupCode;
reportWork.LineCode = reportWorkDto.LineCode;
reportWork.GroupLeader = reportWorkDto.GroupLeader;
reportWork.CreatedTime = DateTime.Now;
reportWork.CreatedBy = reportWorkDto.CreatedBy;
Context.Storageable(reportWork)
.WhereColumns(it => it.FkWorkorder)
.ExecuteCommand();
//ProReportwork reportWork = new ProReportwork();
//reportWork.Id = XueHua;
//reportWork.FkWorkorder = reportWorkDto.FkWorkorder;
//reportWork.DispatchNum = DispatchNum;
//reportWork.FinishedNum = reportWorkDto.FinishedNum;
//reportWork.GroupCode = reportWorkDto.GroupCode;
//reportWork.LineCode = reportWorkDto.LineCode;
//reportWork.GroupLeader = reportWorkDto.GroupLeader;
//reportWork.CreatedTime = DateTime.Now;
//reportWork.CreatedBy = reportWorkDto.CreatedBy;
return result;
}

6
DOAN.Service/MES/product/ProReportworkService.cs
View File

@ -31,7 +31,7 @@ namespace DOAN.Service.MES.product
/// <returns></returns>
public PagedInfo<ProReportworkDto> GetList(ProReportworkQueryDto parm)
{
if(parm.TimeRange.Length == 2)
if(parm.TimeRange!=null&&parm.TimeRange.Length == 2)
{
parm.TimeRange[0]= parm.TimeRange[0].Date;
parm.TimeRange[1]= parm.TimeRange[1].Date.AddDays(1);
@ -41,8 +41,8 @@ namespace DOAN.Service.MES.product
.AndIF(!string.IsNullOrEmpty(parm.FkWorkorder),it=>it.FkWorkorder.Contains(parm.FkWorkorder))
.AndIF(!string.IsNullOrEmpty(parm.GroupCode),it=>it.GroupCode==parm.FkWorkorder)
.AndIF(!string.IsNullOrEmpty(parm.LineCode),it=>it.LineCode==parm.FkWorkorder)
.AndIF(parm.TimeRange.Length == 2 && parm.TimeRange[0]>DateTime.MinValue,it=>it.CreatedTime>= parm.TimeRange[0])
.AndIF(parm.TimeRange.Length == 2 && parm.TimeRange[1]>DateTime.MinValue,it=>it.CreatedTime<= parm.TimeRange[1])
.AndIF(parm.TimeRange != null && parm.TimeRange.Length == 2 && parm.TimeRange[0]>DateTime.MinValue,it=>it.CreatedTime>= parm.TimeRange[0])
.AndIF(parm.TimeRange != null && parm.TimeRange.Length == 2 && parm.TimeRange[1]>DateTime.MinValue,it=>it.CreatedTime<= parm.TimeRange[1])
;
var response = Queryable()