From 6fe443c4d26f0ec5cbcc2864a0dd9ab781c59761 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 20 5月 2025 14:30:39 +0800
Subject: [PATCH] 222
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs | 260 ++++++++++++++++++++++++++-------------------------
1 files changed, 134 insertions(+), 126 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs
index 934ce7c..00a7296 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkTaskAppService.cs
@@ -145,44 +145,48 @@
updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
- updateObj.Son_TaskCode = input.Son_TaskCode;
- updateObj.TaskCode = input.TaskCode;
- updateObj.WorkPlanStatus = input.WorkPlanStatus;
- updateObj.CallMaterialStatus = input.CallMaterialStatus;
- updateObj.DataIdentifier = input.DataIdentifier;
- updateObj.MaterialMode = input.MaterialMode;
- updateObj.Length = input.Length;
- updateObj.MarkingContent = input.MarkingContent;
- updateObj.MarkingPosition = input.MarkingPosition;
- updateObj.CuttingPosition = input.CuttingPosition;
- updateObj.Quantity = input.Quantity;
- updateObj.FlangeThickness = input.FlangeThickness;
- updateObj.FlangeInnerDiameter = input.FlangeInnerDiameter;
- updateObj.WeldingHeatInput = input.WeldingHeatInput;
- updateObj.PipeAllowableStress = input.PipeAllowableStress;
- updateObj.PipeDiameter = input.PipeDiameter;
- updateObj.PipeWallThickness = input.PipeWallThickness;
- updateObj.FactoryCode = input.FactoryCode;
- updateObj.ProductCode = input.ProductCode;
- updateObj.WorkstationCode = input.WorkstationCode;
- updateObj.EquipmentCode = input.EquipmentCode;
- updateObj.ProdLineCode = input.ProdLineCode;
- updateObj.ShipNumber = input.ShipNumber;
- updateObj.ProjectNumber = input.ProjectNumber;
- updateObj.ProcessName = input.ProcessName;
- updateObj.PipeFittingCode = input.PipeFittingCode;
- updateObj.PreSerialNumber = input.PreSerialNumber;
- updateObj.PipeSpecCode = input.PipeSpecCode;
- updateObj.PipeSectionName = input.PipeSectionName;
- updateObj.OuterDiameter = input.OuterDiameter;
- updateObj.Thickness = input.Thickness;
- updateObj.Material = input.Material;
- updateObj.ProcessRouteNumber = input.ProcessRouteNumber;
- updateObj.PlannedStartTime = input.PlannedStartTime;
- updateObj.PlannedEndTime = input.PlannedEndTime;
- updateObj.TeamInfo = input.TeamInfo;
- updateObj.Timestamp = input.Timestamp;
- updateObj.Remark = input.Remark;
+
+ // 鎵归噺璧嬪�兼墍鏈夊彲鏄犲皠瀛楁锛堥�氳繃鍖垮悕瀵硅薄锛�
+ updateObj = ObjectMapper.Map(input, updateObj); // 绛夋晥浜庢墜鍔ㄨ祴鍊兼墍鏈夊尮閰嶅瓧娈�
+ //updateObj.Id = id;
+ //updateObj.Son_TaskCode = input.Son_TaskCode;
+ //updateObj.TaskCode = input.TaskCode;
+ //updateObj.WorkPlanStatus = input.WorkPlanStatus;
+ //updateObj.CallMaterialStatus = input.CallMaterialStatus;
+ //updateObj.DataIdentifier = input.DataIdentifier;
+ //updateObj.MaterialMode = input.MaterialMode;
+ //updateObj.Length = input.Length;
+ //updateObj.MarkingContent = input.MarkingContent;
+ //updateObj.MarkingPosition = input.MarkingPosition;
+ //updateObj.CuttingPosition = input.CuttingPosition;
+ //updateObj.Quantity = input.Quantity;
+ //updateObj.FlangeThickness = input.FlangeThickness;
+ //updateObj.FlangeInnerDiameter = input.FlangeInnerDiameter;
+ //updateObj.WeldingHeatInput = input.WeldingHeatInput;
+ //updateObj.PipeAllowableStress = input.PipeAllowableStress;
+ //updateObj.PipeDiameter = input.PipeDiameter;
+ //updateObj.PipeWallThickness = input.PipeWallThickness;
+ //updateObj.FactoryCode = input.FactoryCode;
+ //updateObj.ProductCode = input.ProductCode;
+ //updateObj.WorkstationCode = input.WorkstationCode;
+ //updateObj.EquipmentCode = input.EquipmentCode;
+ //updateObj.ProdLineCode = input.ProdLineCode;
+ //updateObj.ShipNumber = input.ShipNumber;
+ //updateObj.ProjectNumber = input.ProjectNumber;
+ //updateObj.ProcessName = input.ProcessName;
+ //updateObj.PipeFittingCode = input.PipeFittingCode;
+ //updateObj.PreSerialNumber = input.PreSerialNumber;
+ //updateObj.PipeSpecCode = input.PipeSpecCode;
+ //updateObj.PipeSectionName = input.PipeSectionName;
+ //updateObj.OuterDiameter = input.OuterDiameter;
+ //updateObj.Thickness = input.Thickness;
+ //updateObj.Material = input.Material;
+ //updateObj.ProcessRouteNumber = input.ProcessRouteNumber;
+ //updateObj.PlannedStartTime = input.PlannedStartTime;
+ //updateObj.PlannedEndTime = input.PlannedEndTime;
+ //updateObj.TeamInfo = input.TeamInfo;
+ //updateObj.Timestamp = input.Timestamp;
+ //updateObj.Remark = input.Remark;
updateObj.LastModifierName = input.LastModifierName;//淇敼浜�
@@ -326,7 +330,7 @@
Check.NotNull(input, nameof(input));
var workTaskCreateDtos = new List<(int RowIndex, WorkTaskCreateDto Item)>();
- var workTaskUpdateDtos = new List<(int RowIndex, Guid Id, WorkTaskUpdateDto Item)>();
+ var workTaskUpdateDtos = new List<(int RowIndex, Guid Id, WorkTask Item)>();
var importItems = input.WorkTasks;
if (importItems != null && importItems.Any())
@@ -360,95 +364,99 @@
var oldWorkTask = await _workTaskRepository.FindByNameAsync(impItem.Son_TaskCode);
if (oldWorkTask != null)
{
- var workTaskUpdateDto = new WorkTaskUpdateDto
- {
- Son_TaskCode = impItem.Son_TaskCode,
- TaskCode = impItem.TaskCode,
- WorkPlanStatus = impItem.WorkPlanStatus,
- CallMaterialStatus = impItem.CallMaterialStatus,
- DataIdentifier = impItem.DataIdentifier,
- MaterialMode = impItem.MaterialMode,
- Length = impItem.Length,
- MarkingContent = impItem.MarkingContent,
- MarkingPosition = impItem.MarkingPosition,
- CuttingPosition = impItem.CuttingPosition,
- Quantity = impItem.Quantity,
- FlangeThickness = impItem.FlangeThickness,
- FlangeInnerDiameter = impItem.FlangeInnerDiameter,
- WeldingHeatInput = impItem.WeldingHeatInput,
- PipeAllowableStress = impItem.PipeAllowableStress,
- PipeDiameter = impItem.PipeDiameter,
- PipeWallThickness = impItem.PipeWallThickness,
- FactoryCode = impItem.FactoryCode,
- ProductCode = impItem.ProductCode,
- WorkstationCode = impItem.WorkstationCode,
- EquipmentCode = impItem.EquipmentCode,
- ProdLineCode = impItem.ProdLineCode,
- ShipNumber = impItem.ShipNumber,
- ProjectNumber = impItem.ProjectNumber,
- ProcessName = impItem.ProcessName,
- PipeFittingCode = impItem.PipeFittingCode,
- PreSerialNumber = impItem.PreSerialNumber,
- PipeSpecCode = impItem.PipeSpecCode,
- PipeSectionName = impItem.PipeSectionName,
- OuterDiameter = impItem.OuterDiameter,
- Thickness = impItem.Thickness,
- Material = impItem.Material,
- ProcessRouteNumber = impItem.ProcessRouteNumber,
- PlannedStartTime = impItem.PlannedStartTime,
- PlannedEndTime = impItem.PlannedEndTime,
- TeamInfo = impItem.TeamInfo,
- Timestamp = impItem.Timestamp,
- Remark = impItem.Remark,
+ //var workTaskUpdateDto = new WorkTaskUpdateDto { };
+ oldWorkTask = ObjectMapper.Map(impItem, oldWorkTask); // 绛夋晥浜庢墜鍔ㄨ祴鍊兼墍鏈夊尮閰嶅瓧娈�
+ //var workTaskUpdateDto = new WorkTaskUpdateDto
+ //{
+ // Son_TaskCode = impItem.Son_TaskCode,
+ // TaskCode = impItem.TaskCode,
+ // WorkPlanStatus = impItem.WorkPlanStatus,
+ // CallMaterialStatus = impItem.CallMaterialStatus,
+ // DataIdentifier = impItem.DataIdentifier,
+ // MaterialMode = impItem.MaterialMode,
+ // Length = impItem.Length,
+ // MarkingContent = impItem.MarkingContent,
+ // MarkingPosition = impItem.MarkingPosition,
+ // CuttingPosition = impItem.CuttingPosition,
+ // Quantity = impItem.Quantity,
+ // FlangeThickness = impItem.FlangeThickness,
+ // FlangeInnerDiameter = impItem.FlangeInnerDiameter,
+ // WeldingHeatInput = impItem.WeldingHeatInput,
+ // PipeAllowableStress = impItem.PipeAllowableStress,
+ // PipeDiameter = impItem.PipeDiameter,
+ // PipeWallThickness = impItem.PipeWallThickness,
+ // FactoryCode = impItem.FactoryCode,
+ // ProductCode = impItem.ProductCode,
+ // WorkstationCode = impItem.WorkstationCode,
+ // EquipmentCode = impItem.EquipmentCode,
+ // ProdLineCode = impItem.ProdLineCode,
+ // ShipNumber = impItem.ShipNumber,
+ // ProjectNumber = impItem.ProjectNumber,
+ // ProcessName = impItem.ProcessName,
+ // PipeFittingCode = impItem.PipeFittingCode,
+ // PreSerialNumber = impItem.PreSerialNumber,
+ // PipeSpecCode = impItem.PipeSpecCode,
+ // PipeSectionName = impItem.PipeSectionName,
+ // OuterDiameter = impItem.OuterDiameter,
+ // Thickness = impItem.Thickness,
+ // Material = impItem.Material,
+ // ProcessRouteNumber = impItem.ProcessRouteNumber,
+ // PlannedStartTime = impItem.PlannedStartTime,
+ // PlannedEndTime = impItem.PlannedEndTime,
+ // TeamInfo = impItem.TeamInfo,
+ // Timestamp = impItem.Timestamp,
+ // Remark = impItem.Remark,
- };
+ //};
- workTaskUpdateDtos.Add((impItem.RowIndex, oldWorkTask.Id, workTaskUpdateDto));
+ workTaskUpdateDtos.Add((impItem.RowIndex, oldWorkTask.Id, oldWorkTask));
}
else
{
- var workTaskCreateDto = new WorkTaskCreateDto
- {
- Son_TaskCode = impItem.Son_TaskCode,
- TaskCode = impItem.TaskCode,
- WorkPlanStatus = impItem.WorkPlanStatus,
- CallMaterialStatus = impItem.CallMaterialStatus,
- DataIdentifier = impItem.DataIdentifier,
- MaterialMode = impItem.MaterialMode,
- Length = impItem.Length,
- MarkingContent = impItem.MarkingContent,
- MarkingPosition = impItem.MarkingPosition,
- CuttingPosition = impItem.CuttingPosition,
- Quantity = impItem.Quantity,
- FlangeThickness = impItem.FlangeThickness,
- FlangeInnerDiameter = impItem.FlangeInnerDiameter,
- WeldingHeatInput = impItem.WeldingHeatInput,
- PipeAllowableStress = impItem.PipeAllowableStress,
- PipeDiameter = impItem.PipeDiameter,
- PipeWallThickness = impItem.PipeWallThickness,
- FactoryCode = impItem.FactoryCode,
- ProductCode = impItem.ProductCode,
- WorkstationCode = impItem.WorkstationCode,
- EquipmentCode = impItem.EquipmentCode,
- ProdLineCode = impItem.ProdLineCode,
- ShipNumber = impItem.ShipNumber,
- ProjectNumber = impItem.ProjectNumber,
- ProcessName = impItem.ProcessName,
- PipeFittingCode = impItem.PipeFittingCode,
- PreSerialNumber = impItem.PreSerialNumber,
- PipeSpecCode = impItem.PipeSpecCode,
- PipeSectionName = impItem.PipeSectionName,
- OuterDiameter = impItem.OuterDiameter,
- Thickness = impItem.Thickness,
- Material = impItem.Material,
- ProcessRouteNumber = impItem.ProcessRouteNumber,
- PlannedStartTime = impItem.PlannedStartTime,
- PlannedEndTime = impItem.PlannedEndTime,
- TeamInfo = impItem.TeamInfo,
- Timestamp = impItem.Timestamp,
- Remark = impItem.Remark,
+ var workTaskCreateDto = new WorkTaskCreateDto { };
+ workTaskCreateDto = ObjectMapper.Map(impItem, workTaskCreateDto); // 绛夋晥浜庢墜鍔ㄨ祴鍊兼墍鏈夊尮閰嶅瓧娈�
+ //var workTaskCreateDto = new WorkTaskCreateDto
+ //{
+ // Son_TaskCode = impItem.Son_TaskCode,
+ // TaskCode = impItem.TaskCode,
+ // WorkPlanStatus = impItem.WorkPlanStatus,
+ // CallMaterialStatus = impItem.CallMaterialStatus,
+ // DataIdentifier = impItem.DataIdentifier,
+ // MaterialMode = impItem.MaterialMode,
+ // Length = impItem.Length,
+ // MarkingContent = impItem.MarkingContent,
+ // MarkingPosition = impItem.MarkingPosition,
+ // CuttingPosition = impItem.CuttingPosition,
+ // Quantity = impItem.Quantity,
+ // FlangeThickness = impItem.FlangeThickness,
+ // FlangeInnerDiameter = impItem.FlangeInnerDiameter,
+ // WeldingHeatInput = impItem.WeldingHeatInput,
+ // PipeAllowableStress = impItem.PipeAllowableStress,
+ // PipeDiameter = impItem.PipeDiameter,
+ // PipeWallThickness = impItem.PipeWallThickness,
+ // FactoryCode = impItem.FactoryCode,
+ // ProductCode = impItem.ProductCode,
+ // WorkstationCode = impItem.WorkstationCode,
+ // EquipmentCode = impItem.EquipmentCode,
+ // ProdLineCode = impItem.ProdLineCode,
+ // ShipNumber = impItem.ShipNumber,
+ // ProjectNumber = impItem.ProjectNumber,
+ // ProcessName = impItem.ProcessName,
+ // PipeFittingCode = impItem.PipeFittingCode,
+ // PreSerialNumber = impItem.PreSerialNumber,
+ // PipeSpecCode = impItem.PipeSpecCode,
+ // PipeSectionName = impItem.PipeSectionName,
+ // OuterDiameter = impItem.OuterDiameter,
+ // Thickness = impItem.Thickness,
+ // Material = impItem.Material,
+ // ProcessRouteNumber = impItem.ProcessRouteNumber,
+ // PlannedStartTime = impItem.PlannedStartTime,
+ // PlannedEndTime = impItem.PlannedEndTime,
+ // TeamInfo = impItem.TeamInfo,
+ // Timestamp = impItem.Timestamp,
+ // Remark = impItem.Remark,
- };
+ //};
workTaskCreateDtos.Add((impItem.RowIndex, workTaskCreateDto));
}
@@ -471,16 +479,16 @@
}
// 鏇存柊
- foreach (var workTaskDto in workTaskUpdateDtos)
+ foreach (var oldWorkObj in workTaskUpdateDtos)
{
try
{
- workTaskDto.Item.LastModifierName = myCurrentUser.UserAccount;//淇敼浜�
- await UpdateAsync(workTaskDto.Id, workTaskDto.Item);
+ oldWorkObj.Item.LastModifierName = myCurrentUser.UserAccount;//淇敼浜�
+ await _workTaskRepository.UpdateAsync(oldWorkObj.Item);
}
catch (Exception e)
{
- var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊workTaskDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊oldWorkObj.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
throw new UserFriendlyException(errorMsg);
}
}
--
Gitblit v1.9.3