更新数据

API/TaskManager.Contracts/Dtos/Dtos.cs

@@ -87,7 +87,7 @@ namespace TaskManager.Contracts.Dtos
 
 
 
-        #region 整车月度生产计划Dto
+    #region 整车月度生产计划Dto
         public class SUPPLIER_PRO_PLANING_DTO : PAGE_OUT_DTO
         {
             /// <summary>数据行列表</summary>
@@ -270,10 +270,6 @@ namespace TaskManager.Contracts.Dtos
      
         #endregion
     
-
-
-
-  
     #region M+6月物料需求计划.
 
 

API/TaskManager.EntityFramework/JobDbContext.cs

@@ -2383,9 +2383,9 @@ namespace TaskManager.EntityFramework
                 //班次(白班，晚班，中班)
                 b.Property(e => e.WorkShift).HasColumnType("VARCHAR").HasMaxLength(10).IsRequired();
                 //进工位的时间,格式(yyyy-MM-ddHH:mm:ss)
-                b.Property(e => e.MaterialInputTime).HasColumnType("CHAR").HasMaxLength(19).IsRequired();
+                b.Property(e => e.MaterialInputTime).HasColumnType("VARCHAR").HasMaxLength(19).IsRequired();
                 //出工位的时间,格式(yyyy-MM-ddHH:mm:ss)
-                b.Property(e => e.MaterialOutputTime).HasColumnType("CHAR").HasMaxLength(19).IsRequired();
+                b.Property(e => e.MaterialOutputTime).HasColumnType("VARCHAR").HasMaxLength(19).IsRequired();
                 //装配设备编号
                 b.Property(e => e.VendorFieldNum).HasColumnType("VARCHAR").HasMaxLength(32).IsRequired();
                 //装配设备名称
@@ -2397,9 +2397,9 @@ namespace TaskManager.EntityFramework
                 //最终质量状态,合格与否，NG不合适OK合适
                 b.Property(e => e.FinalQualityStatus).HasColumnType("VARCHAR").HasMaxLength(8).IsRequired();
                 //采集时间,格式(yyyy-MM-ddHH:mm:ss)
-                b.Property(e => e.CollectTime).HasColumnType("CHAR").HasMaxLength(19).IsRequired();
+                b.Property(e => e.CollectTime).HasColumnType("VARCHAR").HasMaxLength(19).IsRequired();
                 //子件绑定扫码时间,格式(yyyy-MM-ddHH:mm:ss)
-                b.Property(e => e.DateTime).HasColumnType("CHAR").HasMaxLength(16).IsRequired();
+                b.Property(e => e.DateTime).HasColumnType("VARCHAR").HasMaxLength(19).IsRequired();
                 //父件硬件版本号
                 b.Property(e => e.ParentHardwareRevision).HasColumnType("VARCHAR").HasMaxLength(64).IsRequired(false);
                 //父件软件版本号

API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs

@@ -49,6 +49,12 @@ namespace TaskManager.Controllers
             _repository = repository;
         }
 
+        protected virtual async Task DtoProperiesConvert(List<TDTO> dtos)
+        {
+
+        }
+
+
         /// <summary>
         /// 手工发送调用接口
         /// </summary>
@@ -264,6 +270,7 @@ namespace TaskManager.Controllers
                                 dto.InjectFrom(itm);
                                 dtos.Add(dto);
                             }
+                            await DtoProperiesConvert(dtos);
                             PagedRequest<TDTO> pagedRequest = new PagedRequest<TDTO>()
                             {
                                 batchNo = GenerateRandomStringWith8EG(),

API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs

@@ -28,6 +28,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using TaskManager.Contracts.Dtos;
 using TaskManager.Entity;
+using TaskManager.Entity.Entitys;
 using TaskManager.EntityFramework;
 using TaskManager.EntityFramework.Repository;
 using Wood.Service;
@@ -156,40 +157,7 @@ namespace TaskManager.Controllers
 
                 string inputjson = GetSerializedInputJson(t, TaskName);
 
-                //if (TaskName == "日物料需求计划风险确认")//格式特殊处理
-                //{
-                //    inputjson = JsonSerializer.Serialize(t,
-                //    new JsonSerializerOptions
-                //    {
-                //        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                //        Converters =
-                //        {
-                //            new DecimalTrimConverter(),
-                //            new InputCustomDateTimeConverter(),
-                //            new InputCustomNullableDateTimeConverter()
-                //        },
-                //        WriteIndented = false,// 可选，用于格式化输出
-                //        Encoder = System.Text.Encodings.Web.JavaScriptEncoder.Create(System.Text.Unicode.UnicodeRanges.All)
-                //    }
-                //    );
-                //}
-                //else
-                //{
-                //        inputjson = JsonSerializer.Serialize(t,
-                //        new JsonSerializerOptions
-                //        {
-                //            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                //            Converters =
-                //            {
-                //                                new DecimalTrimConverter(),
-                //                                new InputCustomDateTimeConverter(),
-                //                                new InputCustomNullableDateTimeConverter()
-                //            },
-                //            WriteIndented = false,// 可选，用于格式化输出
-                //            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-                //        }
-                //        );
-                //}
+          
           
                 var content = await Post(Url, Path, inputjson, taskId, version);
                 if (!string.IsNullOrEmpty(content))
@@ -245,7 +213,14 @@ namespace TaskManager.Controllers
             return sb.ToString();
         }
 
+        protected virtual async  Task DtoProperiesConvert(List<TDTO> dtos) 
+        { 
+
+
 
+        
+        
+        }
         private async Task SyncTaskSubTable(string taskName, string client, List<string> errorList = null)
         {
             var task = _jobDbContext.TaskConifgure.FirstOrDefault(p => p.TaskName == taskName);
@@ -278,6 +253,8 @@ namespace TaskManager.Controllers
                         dto.InjectFrom(itm);
                         dtos.Add(dto);
                     }
+                    await DtoProperiesConvert(dtos);
+
                     PagedRequest<TDTO> pagedRequest = new PagedRequest<TDTO>()
                     {
                         batchNo = GenerateRandomStringWith8EG(),
@@ -310,6 +287,7 @@ namespace TaskManager.Controllers
                               
                                 log.WriteState = true;
                                 log.ReadState = true;
+
                                 logs.Add(log);
                             }
                            await _jobDbContext.BulkInsertAsync(logs);

API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs

@@ -131,14 +131,7 @@ namespace TaskManager.Controllers
                         _jobDbContext.BulkUpdate(existList.ToList());
                         _jobDbContext.BulkInsert(query.ToList());
 
-                    
-
-
-
-
                         //_jobDbContext.BulkInsertOrUpdate
-
-
                         // await _jobDbContext.BulkMergeAsync(list, options => { options.ColumnPrimaryKeyExpression = p => p.Id; options.Transaction = tran; });
                         // await _jobDbContext.BulkMergeAsync(logs, options => { options.ColumnPrimaryKeyExpression = p =>new { p.Id,p.RequestDate };options.Transaction = tran; });
                         //});
@@ -318,9 +311,7 @@ namespace TaskManager.Controllers
                     await _logger.AddSuccess($"所有数据获取完成，总共获取了 {allData.Count} 条记录", TaskName, taskId, version);
                 }
             }
-
             // 首次请求获取总条数和分页信息
-
             return allData;
         }
 

API/Wood.Service/Controllers/CherySupplierBomService.cs

@@ -14,5 +14,14 @@ namespace TaskManager.Controllers
         {
 
         }
+        protected override Task DtoProperiesConvert(List<SUPPLIER_BOM_DTO> dtos)
+        {
+            foreach (var dto in dtos)
+            {
+                dto.DataUpdateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            }
+            return base.DtoProperiesConvert(dtos);
+        }
+
     }
 }

API/Wood.Service/Controllers/CherySupplierConDateService.cs

@@ -19,6 +19,18 @@ namespace TaskManager.Controllers
         {
         }
 
+        protected override Task DtoProperiesConvert(List<SUPPLIER_CON_DATE_DETAIL_DTO> dtos)
+        {
+            dtos.ForEach(dto =>
+            {
+               
+            });
+            return base.DtoProperiesConvert(dtos);
+        }
+
+
+
+
         [HttpGet]
         public async Task<SUPPLIER_MRP_DATE> GetDetialByID(String id)
         {

API/Wood.Service/Controllers/CherySupplierEmployeeService.cs

@@ -15,6 +15,15 @@ namespace TaskManager.Controllers
         {
 
         }
+        protected override Task DtoProperiesConvert(List<SUPPLIER_EMPLOYEE_DTO> dtos)
+        {
+            dtos.ForEach(dto =>
+            { 
+                dto.DataUpdateTime = DateTime.Now;
+            });
+            return base.DtoProperiesConvert(dtos);
+        }
+
         protected override async Task UpdateAfter(List<SUPPLIER_EMPLOYEE> list)
         {
 

API/Wood.Service/Controllers/CherySupplierInfoService.cs

@@ -17,6 +17,17 @@ namespace TaskManager.Controllers
         {
 
         }
+
+        protected override Task DtoProperiesConvert(List<SUPPLIER_INFO_DTO> dtos)
+        {
+            dtos.ForEach(dto =>
+            {
+                dto.DataUpdateTime = DateTime.Now;
+            });
+            return base.DtoProperiesConvert(dtos);
+        }
+
+
         protected override async Task UpdateAfter(List<SUPPLIER_INFO> list)
         {
 

API/Wood.Service/Controllers/CherySupplierPorHSCHEDULService.cs

@@ -14,5 +14,6 @@ namespace TaskManager.Controllers
         public CherySupplierPorHSCHEDULService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_HSCHEDUL> repository) : base(httpClient, jobDbContext, log, repository)
         {
         }
+        
     }
 }

API/Wood.Service/Controllers/CherySupplierProCpsService.cs

@@ -12,6 +12,16 @@ namespace TaskManager.Controllers
         public CherySupplierProCpsService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_CPS> repository) : base(httpClient, jobDbContext, log, repository)
         {
 
+        }
+        protected override Task DtoProperiesConvert(List<SUPPLIER_PRO_CPS_DTO> dtos)
+        {
+          
+
+
+
+
+            return base.DtoProperiesConvert(dtos);
+            
         }
     }
 }

API/Wood.Service/Controllers/CherySupplierProDataService.cs

@@ -13,5 +13,10 @@ namespace TaskManager.Controllers
         {
 
         }
+        protected override Task DtoProperiesConvert(List<SUPPLIER_PRO_DATA_DTO> dtos)
+        {
+          
+            return base.DtoProperiesConvert(dtos);
+        }
     }
 }

API/Wood.Service/Controllers/CherySupplierProFirstPassyieldService.cs

@@ -13,6 +13,11 @@ namespace TaskManager.Controllers
         {
 
         }
+        protected override Task DtoProperiesConvert(List<SUPPLIER_PRO_FIRST_PASSYIELD_DTO> dtos)
+        {
+          
+            return base.DtoProperiesConvert(dtos);
+        }
 
     }
 }

API/Wood.Service/Controllers/CherySupplierProSchedulingService.cs

@@ -14,6 +14,15 @@ namespace TaskManager.Controllers
         {
 
         }
+        protected override Task DtoProperiesConvert(List<SUPPLIER_PRO_SCHEDULING_DTO> dtos)
+        {
+            dtos.ForEach(dto =>
+            {
+
+               //dto.DataUpdateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            });
+            return base.DtoProperiesConvert(dtos);
+        }
     }
 }
 

API/Wood.Service/Controllers/CherySupplierProStationFirstPassYieldService.cs

@@ -13,5 +13,13 @@ namespace TaskManager.Controllers
         {
 
         }
+        protected override Task DtoProperiesConvert(List<SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO> dtos)
+        {
+            dtos.ForEach(dto =>
+            {
+           
+            });
+            return base.DtoProperiesConvert(dtos);
+        }
     }
 }

API/Wood.Service/Controllers/CherySupplierSinvDataService.cs

@@ -11,5 +11,14 @@ namespace TaskManager.Controllers
         public CherySupplierSinvDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_SINV_DATA> repository) : base(httpClient, jobDbContext, log, repository)
         {
         }
+
+        protected override Task DtoProperiesConvert(List<SUPPLIER_SINV_DATA_DTO> dtos)
+        {
+            dtos.ForEach(dto =>
+            {
+                dto.DataUpdateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            });
+            return base.DtoProperiesConvert(dtos);
+        }
     }
 }

API/Wood.Service/Controllers/TaskConifgureController.cs

@@ -100,8 +100,7 @@ namespace TaskManager.Controllers
                 });
 
             }
-            TaskSub sub = new TaskSub();
-            sub.Subscriber = "Cherry";
+       
             var taskId = Guid.NewGuid();
             var task = new TaskSub();
             task.TaskId = taskId;

API/Wood.Service/SystemManage/RoleService.cs

@@ -77,10 +77,11 @@ namespace Wood.Service.SystemManage
 			return result + 10;
 		}
 
-		[UnitOfWork]
+	
 		public async Task Add(RoleAddParam entity)
 		{
 			await _roleRepository.InsertAsync(entity.Adapt<RoleEntity>());
+		    //var firstEntity=await	_roleRepository.GetFirstAsync(p => p.RoleName == entity.RoleName);
 
 			await _menuAuthorizeRepository.InsertRangeAsync(
 				entity.Menus.Select(it => new MenuAuthorizeEntity() { RoleId = entity.Id, MenuId = it }).ToList()