From 54ac4b0f185bc2d73d4e2573269ef0a02300e2d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Wed, 4 Jun 2025 16:29:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CherySupplierConDateService.cs | 6 +- .../Controllers/CherySupplierConPoService.cs | 73 +++++++++++++++++++ .../Controllers/CherySupplierPoService.cs | 62 +++++++++++++++- .../Controllers/SupplierPoService.cs | 6 -- 4 files changed, 137 insertions(+), 10 deletions(-) create mode 100644 API/Wood.Service/Controllers/CherySupplierConPoService.cs delete mode 100644 API/Wood.Service/Controllers/SupplierPoService.cs diff --git a/API/Wood.Service/Controllers/CherySupplierConDateService.cs b/API/Wood.Service/Controllers/CherySupplierConDateService.cs index 9d5c3d9..384ec81 100644 --- a/API/Wood.Service/Controllers/CherySupplierConDateService.cs +++ b/API/Wood.Service/Controllers/CherySupplierConDateService.cs @@ -7,13 +7,13 @@ using TaskManager.EntityFramework; namespace TaskManager.Controllers { - public class SupplierConDateService : CheryRecurringJobInputPageController + public class CherySupplierConDateService : CheryRecurringJobInputPageController { - public SupplierConDateService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository) + public CherySupplierConDateService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository) { } /// - /// 审批通过 + /// 确认提交 /// /// /// diff --git a/API/Wood.Service/Controllers/CherySupplierConPoService.cs b/API/Wood.Service/Controllers/CherySupplierConPoService.cs new file mode 100644 index 0000000..1883c58 --- /dev/null +++ b/API/Wood.Service/Controllers/CherySupplierConPoService.cs @@ -0,0 +1,73 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore.Storage; +using TaskManager.Contracts.Dtos; +using TaskManager.Entity; +using TaskManager.Entity.Entitys; +using TaskManager.EntityFramework; + +namespace TaskManager.Controllers +{ + public class SupplierPoService : CheryRecurringJobInputPageController + { + public SupplierPoService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository) + { + } + /// + /// 确认提交 + /// + /// + /// + [HttpPost] + public async Task Confirm([FromBody] List entites) + { + + var taskId = Guid.NewGuid(); + var task = new TaskSub(); + task.TaskId = taskId; + task.TaskName = TaskName; + task.Subscriber = Client; + task.TableName = "SUPPLIER_CON_PO"; + task.DataCount = entites.Count; + task.Domain = "1"; + task.Site = "1"; + task.FailedCount = 0; + task.CreateTime = DateTime.Now; + task.CreateUser = "admin"; + task.CreationTime = DateTime.Now; + task.SyncedPageCount = 0; + + entites.ForEach(p => + { + p.ReadState = true; + p.TaskId = taskId; + + }); + + using (var transaction = await _jobDbContext.Database.BeginTransactionAsync()) + { + var tran = transaction.GetDbTransaction(); + try + { + await _jobDbContext.BulkUpdateAsync(entites, options => { options.Transaction = tran; }); + await _jobDbContext.AddAsync(task); + _jobDbContext.SaveChanges(); + + // 提交事务 + await transaction.CommitAsync(); + } + catch (Exception ex) + { + await transaction.RollbackAsync(); + return new JsonResult(new { Code = 400, Message = ex.Message }); + } + } + return new JsonResult(new { Code = 200, Message = "修改成功!" }); + } + + + + + + + } +} diff --git a/API/Wood.Service/Controllers/CherySupplierPoService.cs b/API/Wood.Service/Controllers/CherySupplierPoService.cs index dc618bf..c7ac08b 100644 --- a/API/Wood.Service/Controllers/CherySupplierPoService.cs +++ b/API/Wood.Service/Controllers/CherySupplierPoService.cs @@ -1,15 +1,75 @@ -using TaskManager.Contracts.Dtos; +using System.Data.Common; +using TaskManager.Contracts.Dtos; using TaskManager.Controllers; using TaskManager.Entity; +using TaskManager.Entity.Entitys; using TaskManager.EntityFramework; namespace TaskManager.Controllers { + /// + /// 采购订单 + /// public class CherySupplierPoService : CheryRecurringJobOutPageController { public CherySupplierPoService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository repository) : base(httpClient, jobDbContext, log, repository) { } + protected override async Task ConfirmDataInsertAsync(List plist, JobDbContext dbContext, DbTransaction dbTransaction) + { + if (plist.Count > 0) + { + List list = new List(); + plist.ForEach(p => + { + var con = new SUPPLIER_CON_PO(); + + con.SupplierCode = "8EG"; + con.PurchaseOrder =p.PurchaseOrder ; + con.SerialNumber =p.SerialNumber ; + con.QuantityMeet =p.QuantityDelivery ; + con.FeedbackResults ="" ; + con.VentureType ="" ; + con.VentureSpecific ="" ; + con.Measures =""; + + + + + + //con.SupplierCode = "8EG"; + //con.ReleaseEdition = p.ReleaseEdition; + //con.MaterialCode = p.MaterialCode; + //con.PlantId = p.PlantId; + //con.FeedbackResults = "0"; + //con.VentureType = "1"; + //con.VentureSpecific = "1"; + //con.Measures = "1"; + //con.StartMonth = p.StartMonth; + //con.QuantityMeet1 = p.QuantityDemand1; + //con.QuantityMeet2 = p.QuantityDemand2; + //con.QuantityMeet3 = p.QuantityDemand3; + //con.QuantityMeet4 = p.QuantityDemand4; + //con.QuantityMeet5 = p.QuantityDemand5; + //con.QuantityMeet6 = p.QuantityDemand6; + //con.QuantityMeet7 = p.QuantityDemand7; + //con.QuantityMeet8 = p.QuantityDemand8; + //con.QuantityMeet9 = p.QuantityDemand9; + //con.QuantityMeet10 = p.QuantityDemand10; + //con.QuantityMeet11 = p.QuantityDemand11; + //con.QuantityMeet12 = p.QuantityDemand12; + list.Add(con); + }); + + await dbContext.BulkInsertAsync(list, options => { options.Transaction = dbTransaction; options.UseTableLock = false; }); + } + return; + } + + + + + } } diff --git a/API/Wood.Service/Controllers/SupplierPoService.cs b/API/Wood.Service/Controllers/SupplierPoService.cs deleted file mode 100644 index 535dcbf..0000000 --- a/API/Wood.Service/Controllers/SupplierPoService.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace TaskManager.Controllers -{ - public class SupplierPoService - { - } -}