diff --git a/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/API/Wood.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user index 595ac54..fa4421d 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-07-01T10:51:45.0206266Z||;True|2025-06-30T15:39:43.7918723+08:00||;True|2025-06-30T14:40:36.2678533+08:00||;True|2025-06-30T14:22:36.2631903+08:00||;True|2025-06-30T09:23:23.0780295+08:00||;True|2025-06-28T10:37:00.4525422+08:00||;True|2025-06-27T14:51:18.0006510+08:00||;True|2025-06-27T14:46:36.7189818+08:00||;True|2025-06-25T10:54:54.0406425+08:00||;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||; + True|2025-07-02T02:15:44.3531626Z||;True|2025-07-02T10:14:19.3576521+08:00||;True|2025-07-01T18:51:45.0206266+08:00||;True|2025-06-30T15:39:43.7918723+08:00||;True|2025-06-30T14:40:36.2678533+08:00||;True|2025-06-30T14:22:36.2631903+08:00||;True|2025-06-30T09:23:23.0780295+08:00||;True|2025-06-28T10:37:00.4525422+08:00||;True|2025-06-27T14:51:18.0006510+08:00||;True|2025-06-27T14:46:36.7189818+08:00||;True|2025-06-25T10:54:54.0406425+08:00||;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/CheryRecurringJobInputPageExtendController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs index 8ec0555..44a6277 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs @@ -385,6 +385,7 @@ namespace TaskManager.Controllers createtask.ReadState = true; createtask.WriteState = true; await _jobDbContext.AddAsync(task); + _jobDbContext.SaveChanges(); // 提交事务 await transaction.CommitAsync(); diff --git a/API/Wood.Service/Controllers/CherySupplierMrpDataService.cs b/API/Wood.Service/Controllers/CherySupplierMrpDataService.cs index 15a061c..fcd581e 100644 --- a/API/Wood.Service/Controllers/CherySupplierMrpDataService.cs +++ b/API/Wood.Service/Controllers/CherySupplierMrpDataService.cs @@ -98,8 +98,8 @@ namespace TaskManager.Controllers itm.VentureSpecific = ""; itm.Measures = ""; itm.StartDate = first.StartDate; - itm.QuantityMeet1 = first.QuantityDemand1 == null ? first.QuantityDemand1.Value : 0; - itm.QuantityMeet2 = first.QuantityDemand2 == null ? first.QuantityDemand2.Value : 0; + itm.QuantityMeet1 = first.QuantityDemand1 != null ? first.QuantityDemand1.Value : 0; + itm.QuantityMeet2 = first.QuantityDemand2 != null ? first.QuantityDemand2.Value : 0; itm.QuantityMeet3 = first.QuantityDemand3; itm.QuantityMeet4 = first.QuantityDemand4; itm.QuantityMeet5 = first.QuantityDemand5; diff --git a/API/Wood.Service/Controllers/CherySupplierPoService.cs b/API/Wood.Service/Controllers/CherySupplierPoService.cs index 4898e51..ef9932c 100644 --- a/API/Wood.Service/Controllers/CherySupplierPoService.cs +++ b/API/Wood.Service/Controllers/CherySupplierPoService.cs @@ -60,12 +60,12 @@ namespace TaskManager.Controllers itm.SupplierCode = "8EG"; itm.PurchaseOrder = first.PurchaseOrder; itm.SerialNumber =first.SerialNumber; - itm.QuantityMeet = first.QuantityDelivery == null ? first.QuantityDelivery.Value : 0; + itm.QuantityMeet = first.QuantityDelivery != null ? first.QuantityDelivery.Value : 0; itm.FeedbackResults = "0"; itm.VentureType = ""; itm.VentureSpecific = ""; itm.Measures = ""; - + itm.CreationTime = DateTime.Now; } diff --git a/API/Wood.Service/Controllers/RecurringJobBaseController.cs b/API/Wood.Service/Controllers/RecurringJobBaseController.cs index f276a26..5eb4724 100644 --- a/API/Wood.Service/Controllers/RecurringJobBaseController.cs +++ b/API/Wood.Service/Controllers/RecurringJobBaseController.cs @@ -27,13 +27,23 @@ namespace TaskManager.Controllers [AllowAnonymous] public class RecurringJobBaseController :ControllerBase, IDoExecute, IScoped { - protected string appKey = "8EG72d84c872668401"; - protected string appSecret = "d092b9df0d504726a3790d7ad6172cc3"; - +#if DEBUG + protected string appKey = "8EG566b9bedd2bf46d"; + protected string appSecret = "48edc4425647425d87f806a1ba492580"; +#else + + protected string appKey = "8EG72d84c872668401"; + protected string appSecret = "d092b9df0d504726a3790d7ad6172cc3"; +#endif + + + + + + + - //protected string appKey = "8EG566b9bedd2bf46d"; - //protected string appSecret = "48edc4425647425d87f806a1ba492580"; protected readonly HttpClient _httpClient; protected readonly JobDbContext _jobDbContext; protected string Client { set; get; } = "Chery";