From e4b32b6358c5b48b6f63d8e3d8830260ea5cd7df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 19 Jun 2025 16:59:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E5=85=A5=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API/Wood.Service/Controllers/CherySupplierConDateService.cs | 6 ++++-- API/Wood.Service/Controllers/NormalBaseController.cs | 3 +++ API/Wood.Service/Datas/SupplierEmployeeDtService.cs | 3 +++ API/Wood.Service/Datas/SupplierInfoDtService.cs | 3 +++ .../Datas/SupplierProAttachmentDataDtService.cs | 2 ++ .../Datas/SupplierProProcessEquipmentDtService.cs | 3 +++ 6 files changed, 18 insertions(+), 2 deletions(-) diff --git a/API/Wood.Service/Controllers/CherySupplierConDateService.cs b/API/Wood.Service/Controllers/CherySupplierConDateService.cs index e4e0338..9917a7b 100644 --- a/API/Wood.Service/Controllers/CherySupplierConDateService.cs +++ b/API/Wood.Service/Controllers/CherySupplierConDateService.cs @@ -53,6 +53,8 @@ namespace TaskManager.Controllers return new JsonResult(new { Code = 400, Message = "请检查需求发布版次、供应商代码、零件号、工厂代码、起始日期、反馈结果不能为空!" }); } + + var taskId = Guid.NewGuid(); var task = new TaskSub(); @@ -61,8 +63,8 @@ namespace TaskManager.Controllers task.Subscriber = "Chery"; task.TableName = "SUPPLIER_CON_DATE"; task.DataCount = entites.Count; - task.Domain = "1"; - task.Site = "1"; + task.Domain = "安通林"; + task.Site = "安通林"; task.FailedCount = 0; task.CreateTime = DateTime.Now; task.CreateUser = "admin"; diff --git a/API/Wood.Service/Controllers/NormalBaseController.cs b/API/Wood.Service/Controllers/NormalBaseController.cs index a4e1295..a0c4135 100644 --- a/API/Wood.Service/Controllers/NormalBaseController.cs +++ b/API/Wood.Service/Controllers/NormalBaseController.cs @@ -32,6 +32,9 @@ namespace Wood.Service.Controllers protected readonly IServiceProvider _builder; protected readonly IConfiguration _configuration; protected readonly IRepository _repository; + protected readonly string VendCode="8EG"; + + diff --git a/API/Wood.Service/Datas/SupplierEmployeeDtService.cs b/API/Wood.Service/Datas/SupplierEmployeeDtService.cs index 4c3f4a6..8dccd6f 100644 --- a/API/Wood.Service/Datas/SupplierEmployeeDtService.cs +++ b/API/Wood.Service/Datas/SupplierEmployeeDtService.cs @@ -90,12 +90,15 @@ namespace Wood.Service.Datas foreach (var empDtObj in entityLst) { SUPPLIER_EMPLOYEE empObj = EntityMapper.Trans(empDtObj); + + empDtObj.SupplierCode = VendCode; empObj.TaskId = taskSubObj.TaskId; await _supplierEmployeeRepository.AddAsync(empObj); } foreach (var empDtObj in entityLst) { + empDtObj.SupplierCode = VendCode; //以“供应商代码+工厂代码+车间代码+产线代码+工位代码+操作人员账号”为唯一标识，做新增或者更新存储 var firstObj = _context.Set().FirstOrDefault( itm => itm.SupplierCode == empDtObj.SupplierCode diff --git a/API/Wood.Service/Datas/SupplierInfoDtService.cs b/API/Wood.Service/Datas/SupplierInfoDtService.cs index c8ca4d3..5edea39 100644 --- a/API/Wood.Service/Datas/SupplierInfoDtService.cs +++ b/API/Wood.Service/Datas/SupplierInfoDtService.cs @@ -90,11 +90,14 @@ namespace Wood.Service.Datas { SUPPLIER_INFO empObj = EntityMapper.Trans(empDtObj); empObj.TaskId = taskSubObj.TaskId; + empDtObj.SupplierCode = VendCode; + await _supplierInfoRepository.AddAsync(empObj); } foreach (var empDtObj in entityLst) { + empDtObj.SupplierCode = VendCode; //以“供应商代码+工厂代码+车间代码+产线代码+工位代码”为唯一标识，做新增或更新存储 var firstObj = _context.Set().FirstOrDefault( itm => itm.SupplierCode == empDtObj.SupplierCode diff --git a/API/Wood.Service/Datas/SupplierProAttachmentDataDtService.cs b/API/Wood.Service/Datas/SupplierProAttachmentDataDtService.cs index 003a4fe..e20bd09 100644 --- a/API/Wood.Service/Datas/SupplierProAttachmentDataDtService.cs +++ b/API/Wood.Service/Datas/SupplierProAttachmentDataDtService.cs @@ -91,11 +91,13 @@ namespace Wood.Service.Datas { SUPPLIER_PRO_ATTACHMENT_DATA empObj = EntityMapper.Trans(empDtObj); empObj.TaskId = taskSubObj.TaskId; + empObj.SupplierCode = VendCode; await _supplierProAttachmentDataRepository.AddAsync(empObj); } foreach (var empDtObj in entityLst) { + empDtObj.SupplierCode = VendCode; //存储新增数据 var ret = await base.Create(empDtObj); } diff --git a/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs b/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs index d4ac2ff..f50fad5 100644 --- a/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs +++ b/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs @@ -91,11 +91,14 @@ namespace Wood.Service.Datas { SUPPLIER_PRO_PROCESS_EQUIPMENT empObj = EntityMapper.Trans(empDtObj); empObj.TaskId = taskSubObj.TaskId; + + empObj.SupplierCode = VendCode; await _supplierProProcessEquipmentRepository.AddAsync(empObj); } foreach (var empDtObj in entityLst) { + empDtObj.SupplierCode = VendCode; //以供应商代码+奇瑞零件号+工艺编码+工艺版本为唯一数据，做新增或者更新存储 var firstObj = _context.Set().FirstOrDefault( itm => itm.SupplierCode == empDtObj.SupplierCode