diff --git a/API/TaskManager.Entity/Entity.cs b/API/TaskManager.Entity/Entity.cs
index 5aeb229..d37d487 100644
--- a/API/TaskManager.Entity/Entity.cs
+++ b/API/TaskManager.Entity/Entity.cs
@@ -185,12 +185,7 @@ namespace TaskManager.Entity
[MaxLength(50)]
[ExporterHeader(DisplayName = "业务模块")]
public string? Module { get; set; }
- ///
- /// 任务名称
- ///
-
- [ExporterHeader(DisplayName = "任务ID")]
- public Guid TaskId { get; set; }
+
}
diff --git a/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
index 0ea2f7e..47295a4 100644
--- a/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -3,7 +3,7 @@
<_PublishTargetUrl>D:\QRAPI20250528\API\Wood.Admin.WebApi\bin\Release\net8.0\publish\
- True|2025-06-24T07:53:07.6141315Z||;True|2025-06-24T15:48:22.4116425+08:00||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||;
+ True|2025-06-25T02:54:54.0406425Z||;True|2025-06-24T15:53:07.6141315+08:00||;True|2025-06-24T15:48:22.4116425+08:00||;True|2025-06-24T15:47:33.3794364+08:00||;True|2025-06-24T15:21:28.5600646+08:00||;True|2025-06-23T17:18:30.1990173+08:00||;True|2025-06-23T17:12:33.6485743+08:00||;True|2025-06-19T17:18:07.6086155+08:00||;
\ No newline at end of file
diff --git a/API/Wood.Service/Controllers/CherySupplierSinvDataService.cs b/API/Wood.Service/Controllers/CherySupplierSinvDataService.cs
index 5890169..dae71c8 100644
--- a/API/Wood.Service/Controllers/CherySupplierSinvDataService.cs
+++ b/API/Wood.Service/Controllers/CherySupplierSinvDataService.cs
@@ -6,7 +6,7 @@ using TaskManager.EntityFramework;
namespace TaskManager.Controllers
{
- public class CherySupplierSinvDataService : CheryRecurringJobInputPageController
+ public class CherySupplierSinvDataService : CheryRecurringJobInputPageController
{
public CherySupplierSinvDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository)
{
diff --git a/API/Wood.Service/Controllers/CustomLogService.cs b/API/Wood.Service/Controllers/CustomLogService.cs
index 8eb2fb2..90b7701 100644
--- a/API/Wood.Service/Controllers/CustomLogService.cs
+++ b/API/Wood.Service/Controllers/CustomLogService.cs
@@ -55,196 +55,232 @@ namespace Wood.Service.Controllers
var first = _context.TaskLogs.FirstOrDefault(x => x.UId == long.Parse(uid));
-
+ var flawtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "Uid");
+ requestInputBase.Condition.Filters.Remove(flawtask);
switch (first.TaskName)
{
case "来料检验数据":
var stockService = _builder.GetRequiredService();
- requestInputBase.Condition.Filters.Add(new Filter());
+
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic="and" });
var stockResult = await stockService.GetTaskDataPaged(requestInputBase);
return Ok(stockResult);
-
case "排产数据":
var schedulingService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var schedulingResult = await schedulingService.GetLogDataPaged(requestInputBase);
return Ok(schedulingResult);
case "供应商基础信息":
var supplierInfoService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var supplierInfoResult = await supplierInfoService.GetLogDataPaged(requestInputBase);
return Ok(supplierInfoResult);
case "人员资质信息":
var employeeService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var employeeResult = await employeeService.GetLogDataPaged(requestInputBase);
return Ok(employeeResult);
case "BOM主数据":
var bomService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var bomResult = await bomService.GetLogDataPaged(requestInputBase);
return Ok(bomResult);
case "过程控制项质量数据":
var cpsService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var cpsResult = await cpsService.GetLogDataPaged(requestInputBase);
return Ok(cpsResult);
case "生产过程数据":
var proDataService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var proDataResult = await proDataService.GetLogDataPaged(requestInputBase);
return Ok(proDataResult);
case "产品一次合格率":
var firstPassYieldService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var firstPassYieldResult = await firstPassYieldService.GetLogDataPaged(requestInputBase);
return Ok(firstPassYieldResult);
case "工位一次合格率":
var stationFirstPassYieldService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var stationFirstPassYieldResult = await stationFirstPassYieldService.GetLogDataPaged(requestInputBase);
return Ok(stationFirstPassYieldResult);
case "缺陷业务数据":
var flawService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var flawResult = await flawService.GetLogDataPaged(requestInputBase);
return Ok(flawResult);
case "环境业务数据":
var environmentService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var environmentResult = await environmentService.GetLogDataPaged(requestInputBase);
return Ok(environmentResult);
case "设备OEE达成率":
var oeeAchievementRateService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var oeeAchievementRateResult = await oeeAchievementRateService.GetLogDataPaged(requestInputBase);
return Ok(oeeAchievementRateResult);
case "OEE时间明细":
var oeeTimeDetailsService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var oeeTimeDetailsResult = await oeeTimeDetailsService.GetLogDataPaged(requestInputBase);
return Ok(oeeTimeDetailsResult);
case "物料主数据":
var materialDataService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var materialDataResult = await materialDataService.GetLogDataPaged(requestInputBase);
return Ok(materialDataResult);
case "附件类数据":
var attachmentDataService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var attachmentDataResult = await attachmentDataService.GetLogDataPaged(requestInputBase);
return Ok(attachmentDataResult);
case "工艺装备":
var processEquipmentService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var processEquipmentResult = await processEquipmentService.GetLogDataPaged(requestInputBase);
return Ok(processEquipmentResult);
case "工艺":
var processService = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var processResult = await processService.GetLogDataPaged(requestInputBase);
return Ok(processResult);
case "M+6月物料需求计划风险确认":
var m6RiskService = _builder.GetRequiredService(); // 假设此业务仍使用排产服务
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var m6RiskResult = await m6RiskService.GetLogDataPaged(requestInputBase);
return Ok(m6RiskResult);
case "日物料需求计划风险确认":
var dailyRiskService = _builder.GetRequiredService(); // 假设此业务仍使用排产服务
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var dailyRiskResult = await dailyRiskService.GetLogDataPaged(requestInputBase);
return Ok(dailyRiskResult);
case "采购订单风险确认":
var purchaseOrderRiskService = _builder.GetRequiredService(); // 假设此业务仍使用排产服务
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var purchaseOrderRiskResult = await purchaseOrderRiskService.GetLogDataPaged(requestInputBase);
return Ok(purchaseOrderRiskResult);
case "供应商共享库存-上午":
var morningStockService = _builder.GetRequiredService(); // 假设此业务仍使用排产服务
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var morningStockResult = await morningStockService.GetLogDataPaged(requestInputBase);
return Ok(morningStockResult);
case "供应商共享库存-晚上":
var eveningStockService = _builder.GetRequiredService(); // 假设此业务仍使用排产服务
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var eveningStockResult = await eveningStockService.GetLogDataPaged(requestInputBase);
return Ok(eveningStockResult);
case "整车月度生产计划1":
var service1 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result1 = await service1.GetLogDataPaged(requestInputBase);
return Ok(result1);
case "M+6月物料需求计划1":
var service2 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result2 = await service2.GetLogDataPaged(requestInputBase);
return Ok(result2);
-
case "整车月度生产计划2":
var service3 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result3= await service3.GetLogDataPaged(requestInputBase);
return Ok(result3);
case "M+6月物料需求计划2":
var service4 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result4= await service4.GetLogDataPaged(requestInputBase);
return Ok(result4);
case "日物料需求计划":
var service5 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result5 = await service5.GetLogDataPaged(requestInputBase);
return Ok(result5);
case "计划协议":
var service6 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result6 = await service6.GetLogDataPaged(requestInputBase);
return Ok(result6);
case "采购订单":
var service7 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result7 = await service7.GetLogDataPaged(requestInputBase);
return Ok(result7);
case "过焊装未过总装":
var service8 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result8 = await service8.GetLogDataPaged(requestInputBase);
return Ok(result8);
case "过涂装未过总装":
var service9 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result9 = await service9.GetLogDataPaged(requestInputBase);
return Ok(result9);
case "排序供货":
var service10 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result10 = await service10.GetLogDataPaged(requestInputBase);
return Ok(result10);
case "看板配送单":
var service11 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result11 = await service11.GetLogDataPaged(requestInputBase);
return Ok(result11);
case "退货单":
var service12 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result12 = await service12.GetLogDataPaged(requestInputBase);
return Ok(result12);
case "奇瑞RDC共享库存":
var service13 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result13 = await service13.GetLogDataPaged(requestInputBase);
return Ok(result13);
case "日MRP状态监控":
var service14 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result14 = await service14.GetLogDataPaged(requestInputBase);
return Ok(result14);
case "日MRP预警推移":
var service15 = _builder.GetRequiredService();
+ requestInputBase.Condition.Filters.Add(new Filter() { Action = "==", Column = "TaskId", Value = first.TaskId.ToString(), Logic = "and" });
var result15 = await service15.GetLogDataPaged(requestInputBase);
return Ok(result15);
diff --git a/API/Wood.Service/Controllers/NormalBaseController.cs b/API/Wood.Service/Controllers/NormalBaseController.cs
index 0cec109..a0c4135 100644
--- a/API/Wood.Service/Controllers/NormalBaseController.cs
+++ b/API/Wood.Service/Controllers/NormalBaseController.cs
@@ -24,7 +24,7 @@ using Wood.Util.Filters;
namespace Wood.Service.Controllers
{
- // [AllowAnonymous]
+ [AllowAnonymous]
public class NormalBaseController:ControllerBase,ITransient where T:BaseEntity ,new()
{
diff --git a/API/Wood.Service/Controllers/RecurringJobBaseController.cs b/API/Wood.Service/Controllers/RecurringJobBaseController.cs
index 9f3709e..40e9639 100644
--- a/API/Wood.Service/Controllers/RecurringJobBaseController.cs
+++ b/API/Wood.Service/Controllers/RecurringJobBaseController.cs
@@ -91,6 +91,7 @@ namespace TaskManager.Controllers
//await _logger.AddPostResponse("响应", TaskName, taskid, version, str);
return str;
+
}
catch (HttpRequestException ex)
{