diff --git a/DOAN.Admin.WebApi/Controllers/Bydlms/BydWorkorderController.cs b/DOAN.Admin.WebApi/Controllers/Bydlms/BydWorkorderController.cs index cd66a5a..7eb6ba7 100644 --- a/DOAN.Admin.WebApi/Controllers/Bydlms/BydWorkorderController.cs +++ b/DOAN.Admin.WebApi/Controllers/Bydlms/BydWorkorderController.cs @@ -1,9 +1,9 @@ -using Microsoft.AspNetCore.Mvc; -using DOAN.Model.Bydlms.Dto; -using DOAN.Model.Bydlms; -using DOAN.Service.Bydlms.IBydlmsService; -using DOAN.Admin.WebApi.Filters; using Azure; +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.Bydlms; +using DOAN.Model.Bydlms.Dto; +using DOAN.Service.Bydlms.IBydlmsService; +using Microsoft.AspNetCore.Mvc; //创建时间:2025-02-19 namespace DOAN.Admin.WebApi.Controllers.Bydlms @@ -37,9 +37,9 @@ namespace DOAN.Admin.WebApi.Controllers.Bydlms try { var modalList = parm.Data.Adapt>(); - var response = _BydWorkorderService.AddBydWorkorderList(modalList,parm.LineCode); + var response = _BydWorkorderService.AddBydWorkorderList(modalList, parm.LineCode); Dictionary result = new Dictionary(); - + if (response) { result.Add("code", "000000"); @@ -56,10 +56,10 @@ namespace DOAN.Admin.WebApi.Controllers.Bydlms catch (Exception ex) { Dictionary errorResult = new Dictionary - { - { "code", "999999" }, - { "mesg", ex.Message } - }; + { + { "code", "999999" }, + { "mesg", ex.Message } + }; return StatusCode(500, errorResult); // 返回异常响应 } } @@ -78,7 +78,6 @@ namespace DOAN.Admin.WebApi.Controllers.Bydlms return SUCCESS(response); } - /// /// 查询生产工单详情 /// @@ -90,7 +89,7 @@ namespace DOAN.Admin.WebApi.Controllers.Bydlms public IActionResult GetBydWorkorder(string Id) { var response = _BydWorkorderService.GetInfo(Id); - + var info = response.Adapt(); return SUCCESS(info); } @@ -112,8 +111,6 @@ namespace DOAN.Admin.WebApi.Controllers.Bydlms return SUCCESS(response); } - - /// /// 更新生产工单 /// @@ -138,7 +135,7 @@ namespace DOAN.Admin.WebApi.Controllers.Bydlms [ActionPermissionFilter(Permission = "bydworkorder:delete")] [Log(Title = "生产工单", BusinessType = BusinessType.DELETE)] [Verify] - public IActionResult DeleteBydWorkorder([FromRoute]string ids) + public IActionResult DeleteBydWorkorder([FromRoute] string ids) { var idArr = Tools.SplitAndConvert(ids); @@ -153,8 +150,8 @@ namespace DOAN.Admin.WebApi.Controllers.Bydlms [HttpGet("move_up")] public IActionResult MOVEUP(string OrderCode) { - var response = _BydWorkorderService.MOVEUP(OrderCode); - return SUCCESS(response); + var response = _BydWorkorderService.MOVEUP(OrderCode); + return SUCCESS(response); } /// @@ -169,16 +166,13 @@ namespace DOAN.Admin.WebApi.Controllers.Bydlms return SUCCESS(response); } - //TODO 产线获取当前生产工单和下一个工单 //bydlms/BydWorkorderget_workorder_producting?line_code="" [HttpGet("get_workorder_producting")] - public IActionResult GetWorkOrderProducting(string line_code) + public IActionResult GetWorkOrderProducting(string line_code) { var response = _BydWorkorderService.GetWorkOrderProducting(line_code); return SUCCESS(response); } - - } -} \ No newline at end of file +} diff --git a/DOAN.Service/Bydlms/BydWorkorderService.cs b/DOAN.Service/Bydlms/BydWorkorderService.cs index f19a7c6..ccdfcfc 100644 --- a/DOAN.Service/Bydlms/BydWorkorderService.cs +++ b/DOAN.Service/Bydlms/BydWorkorderService.cs @@ -106,11 +106,11 @@ namespace DOAN.Service.Bydlms ) .AndIF( parm.OrderStartTimeQueryStart > DateTime.MinValue, - it => it.OrderStartTime01 > parm.OrderStartTimeQueryStart + it => it.OrderStartTime01 >= parm.OrderStartTimeQueryStart ) .AndIF( - parm.OrderStartTimeQueryStart > DateTime.MinValue, - it => it.OrderStartTime01 < parm.OrderStartTimeQueryStart + parm.OrderStartTimeQueryEnd > DateTime.MinValue, + it => it.OrderStartTime01 <= parm.OrderStartTimeQueryEnd ); return predicate; diff --git a/DOAN.Tasks/TaskScheduler/Job_SyncForward.cs b/DOAN.Tasks/TaskScheduler/Job_SyncForward.cs index 1744fd2..95725ee 100644 --- a/DOAN.Tasks/TaskScheduler/Job_SyncForward.cs +++ b/DOAN.Tasks/TaskScheduler/Job_SyncForward.cs @@ -225,10 +225,10 @@ namespace DOAN.Tasks.TaskScheduler // 确保响应状态码成功 if (!response.IsSuccessStatusCode || response == null) { - Console.WriteLine($"==1===请求响应失败,状态码: {response.StatusCode}"); - Console.WriteLine($"==2===请求响应失败,发送url: {url}"); - Console.WriteLine($"==3===请求响应失败,发送body内容: {jsonData}"); - Console.WriteLine($"==4===请求响应失败,请求内容: {response.RequestMessage}"); + // Console.WriteLine($"==1===请求响应失败,状态码: {response.StatusCode}"); + // Console.WriteLine($"==2===请求响应失败,发送url: {url}"); + // Console.WriteLine($"==3===请求响应失败,发送body内容: {jsonData}"); + // Console.WriteLine($"==4===请求响应失败,请求内容: {response.RequestMessage}"); Console.WriteLine($"==5===请求响应失败,返回内容Content: {responseBody}"); throw new HttpRequestException($"请求发送失败: {responseBody}"); }