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

油漆实验室，批量变动，定时任务变动

Browse Source
This commit is contained in:
赵正易
2025-03-19 13:13:40 +08:00
parent 0e4d7e11d2
commit 9b1c8b2b5a
9 changed files with 104 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ZR.Admin.WebApi/Controllers/System/TasksController.cs
View File

@@ -87,8 +87,10 @@ namespace ZR.Admin.WebApi.Controllers
throw new CustomException($"程序集或者类名不能为空");
}
//从 Dto 映射到 实体
var tasksQz = parm.Adapt<SysTasks>().ToCreate();
tasksQz.Create_by = HttpContext.GetName();
//tasksQz.Create_by = HttpContext.GetName();
tasksQz.Create_by = "admin";
tasksQz.ID = SnowFlakeSingle.Instance.NextId().ToString();
return SUCCESS(_tasksQzService.AddTasks(tasksQz));
@@ -127,7 +129,8 @@ namespace ZR.Admin.WebApi.Controllers
throw new CustomException($"该任务正在运行中，请先停止在更新");
}
var model = parm.Adapt<SysTasks>();
model.Update_by = HttpContextExtension.GetName(HttpContext);
model.Update_by = "admin";
//model.Update_by = HttpContextExtension.GetName(HttpContext);
int response = _tasksQzService.UpdateTasks(model);
if (response > 0)
{

23
ZR.Admin.WebApi/Controllers/mes/ql/PainLab03Controller.cs
View File

@@ -50,6 +50,28 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
return ToResponse(new ApiResult(200, "success", ret));
}
/// <summary>
/// 根据工单自动生成批处理记录
/// </summary>
/// <param name="actionDate">执行时间</param>
/// <returns></returns>
[HttpGet("AddBatchListByWorkOrder")]
public IActionResult AddBatchListByWorkOrder(DateTime actionDate)
{
try
{
int ret = plBatchService.CreatePLBatchRecordsByWorkOrder(actionDate);
return ToResponse(new ApiResult(200, "success", ret));
}
catch (Exception e)
{
return ToResponse(new ApiResult(500, "error", e.Message));
throw;
}
}
/// <summary>
/// 删除测试数据记录
/// </summary>
@@ -89,6 +111,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.ql
PLBatch pLBatch = new PLBatch();
pLBatch.Id = pLBatchDto.Id;
pLBatch.IdGroup = pLBatchDto.plIdGroup;
pLBatch.Workorder = pLBatchDto.Workorder;
pLBatch.Description = pLBatchDto.Description;
pLBatch.Code = pLBatchDto.plCode;
pLBatch.Dt = pLBatchDto.plDt;

22
ZR.Admin.WebApi/Extensions/EntityExtension.cs
View File

@@ -14,11 +14,13 @@ namespace ZR.Admin.WebApi.Extensions
types.GetProperty("CreateTime", flag)?.SetValue(source, DateTime.Now, null);
types.GetProperty("CreatedTime", flag)?.SetValue(source, DateTime.Now, null);
types.GetProperty("AddTime", flag)?.SetValue(source, DateTime.Now, null);
types.GetProperty("CreateBy", flag)?.SetValue(source, context.GetName(), null);
types.GetProperty("Create_by", flag)?.SetValue(source, context.GetName(), null);
types.GetProperty("CreatedBy", flag)?.SetValue(source, context.GetName(), null);
types.GetProperty("UserId", flag)?.SetValue(source, context.GetUId(), null);
if(context != null)
{
types.GetProperty("CreateBy", flag)?.SetValue(source, context.GetName(), null);
types.GetProperty("Create_by", flag)?.SetValue(source, context.GetName(), null);
types.GetProperty("CreatedBy", flag)?.SetValue(source, context.GetName(), null);
types.GetProperty("UserId", flag)?.SetValue(source, context.GetUId(), null);
}
return source;
}
@@ -31,10 +33,12 @@ namespace ZR.Admin.WebApi.Extensions
types.GetProperty("UpdateTime", flag)?.SetValue(source, DateTime.Now, null);
types.GetProperty("Update_time", flag)?.SetValue(source, DateTime.Now, null);
types.GetProperty("UpdatedTime", flag)?.SetValue(source, DateTime.Now, null);
types.GetProperty("UpdateBy", flag)?.SetValue(source, context.GetName(), null);
types.GetProperty("Update_by", flag)?.SetValue(source, context.GetName(), null);
types.GetProperty("UpdatedBy", flag)?.SetValue(source, context.GetName(), null);
if(context != null)
{
types.GetProperty("UpdateBy", flag)?.SetValue(source, context.GetName(), null);
types.GetProperty("Update_by", flag)?.SetValue(source, context.GetName(), null);
types.GetProperty("UpdatedBy", flag)?.SetValue(source, context.GetName(), null);
}
return source;
}