提交更新

API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT_DT.cs → API/TaskManager.Contracts/Dtos/10_17/SUPPLIER_PRO_PROCESS_EQUIPMENT_DT_DTO.cs

@@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
     /// <summary>
     /// 工艺装备
     /// </summary>
-    public class SUPPLIER_PRO_PROCESS_EQUIPMENT_DT 
+    public class SUPPLIER_PRO_PROCESS_EQUIPMENT_DT_DTO 
     {
         /// <summary>
         /// 供应商代码

API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs

@@ -145,13 +145,13 @@ namespace TaskManager.Controllers
                 await _logger.AddError("任务名称或客户端不能为空",taskName);
                 return;
             }
-            var sublist = _jobDbContext.TaskSub.Where(p => p.TaskName == taskName && p.WriteState == false && p.Subscriber == client).ToList();
+            var sublist = _jobDbContext.TaskSub.Where(p => p.TaskName == taskName && p.WriteState == false && p.Subscriber == client ).ToList();
             int pageSize = 1000;
             if (!sublist.Any())
             {
                 foreach (var sub in sublist)
                 {
-                    string querystr = $"select * from {sub.TableName} where TaskId='{sub.TaskId}' and WriteState=0 order by uid";//任务表
+                    string querystr = $"select * from {sub.TableName} where TaskId='{sub.TaskId}' and WriteState=0 and ReadState=1 order by uid";//任务表
 
                     var entites = _jobDbContext.Database.GetDbConnection().Query<T>(querystr);//明细表
                     if (entites.Any())
@@ -164,7 +164,7 @@ namespace TaskManager.Controllers
 
                             var records = entites.Skip((i - 1) * pageSize)
                     .Take(pageSize).ToList();
-                            #region dto转换作为参数发给
+                            #region dto转换作为参数发给客户API 因为实体比DTO字段多
                             List<TDTO> dtos = new List<TDTO>();
                             foreach (var itm in records)
                             {

API/Wood.Service/Controllers/CherySupplierConMmrpService.cs

@@ -1,4 +1,12 @@
-using TaskManager.Entity.Entitys;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Storage;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using Org.BouncyCastle.Bcpg.Sig;
+using SkiaSharp;
+using System.Xml;
+using TaskManager.Entity;
+using TaskManager.Entity.Entitys;
 using TaskManager.EntityFramework;
 
 namespace TaskManager.Controllers
@@ -8,5 +16,62 @@ namespace TaskManager.Controllers
         public CherySupplierConMmrpService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_CON_MMRP> repository) : base(httpClient, jobDbContext, log, repository)
         {
         }
+        /// <summary>
+        /// 审批通过
+        /// </summary>
+        /// <param name="entites"></param>
+        /// <returns></returns>
+        public async Task<ActionResult> Confirm([FromBody]  List<SUPPLIER_CON_MMRP> entites)
+        {
+
+            var taskId = Guid.NewGuid();
+            var task = new TaskSub();
+            task.TaskId = taskId;
+            task.TaskName = TaskName;
+            task.Subscriber = Client;
+            task.TableName = "SUPPLIER_CON_MMRP";
+            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();
+                    new JsonResult(new { Code = 400, Message = ex.Message });
+                }
+            }
+
+            return new JsonResult(new { Code = 200, Message = "修改成功!" }); 
+
+            
+        }
+
+
+
     }
 }

API/Wood.Service/Controllers/CherySupplierMrpMonthService.cs

@@ -21,12 +21,8 @@ namespace TaskManager.Controllers
         }
         protected override async Task CreateTaskAsync(List<SUPPLIER_MRP_MONTH> plist, JobDbContext dbContext)
         {
-            var taskId = Guid.NewGuid();
-            var task = new TaskSub();
-            task.TaskId = taskId;
-            task.TaskName = TaskName;
-            task.Subscriber = Client;
-            task.TableName = "SUPPLIER_CON_MMRP";
+          
+
             if (plist.Count > 0)
             {
                 List<SUPPLIER_CON_MMRP> list = new List<SUPPLIER_CON_MMRP>();
@@ -56,8 +52,16 @@ namespace TaskManager.Controllers
                     con.QuantityMeet12 = p.QuantityDemand12;
                     list.Add(con);
                 });
+           
                 dbContext.BulkInsert(list, new BulkOperationOptions<SUPPLIER_CON_MMRP>() { UseTableLock = false });
             }
+
+
+
+
+
+
+
             return;
         }
     }