From 91030ca8300557a1e03e17fb34167c16577aad45 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 12 5月 2025 11:46:16 +0800
Subject: [PATCH] 优化代码
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs | 485 +++++++++++++++++++----------------------------------
1 files changed, 176 insertions(+), 309 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
index dccb3af..b85d09c 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
@@ -10,12 +10,7 @@
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
using Volo.Abp.ObjectMapping;
-using CMS.Plugin.FormulaManagement.Abstractions;
-using CMS.Plugin.OrderManagement.Abstractions.Enums;
-using CMS.Plugin.OrderManagement.Abstractions.Models;
-using CMS.Plugin.OrderManagement.Abstractions;
-using CMS.Plugin.ProductManagement.Abstractions;
-using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Users;
namespace CMS.Plugin.PipeLineLems.Application.Implements;
@@ -25,15 +20,16 @@
public class WorkPlanAppService : CMSPluginAppService, IWorkPlanAppService
{
private readonly IWorkPlanRepository workPlanRepository;
+ private readonly SharedService _sharedService;
private readonly IServiceProvider _serviceProvider;
-
/// <summary>
/// Initializes a new instance of the <see cref="WorkPlanAppService"/> class.
/// </summary>
/// <param name="WorkPlanRepository">The task job repository.</param>
- public WorkPlanAppService(IWorkPlanRepository _WorkPlanRepository, IServiceProvider serviceProvider)
+ public WorkPlanAppService(IWorkPlanRepository _WorkPlanRepository, SharedService sharedService, IServiceProvider serviceProvider)
{
workPlanRepository = _WorkPlanRepository;
+ _sharedService = sharedService;
_serviceProvider = serviceProvider;
}
@@ -45,6 +41,17 @@
public virtual async Task<WorkPlanDto> GetAsync(Guid id)
{
return ObjectMapper.Map<WorkPlan, WorkPlanDto>(await workPlanRepository.GetAsync(id));
+ }
+
+ /// <summary>
+ /// 鎸夌収 鍘熸枡鏍囪 鏌ユ壘浣滀笟璁″垝琛�
+ /// </summary>
+ /// <param name="name"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public virtual async Task<List<WorkPlan>> FindByDataIdentifierAsync(string dataIdentifier)
+ {
+ return await workPlanRepository.FindByDataIdentifierAsync(dataIdentifier);
}
/// <summary>
@@ -118,6 +125,7 @@
var insertObj = ObjectMapper.Map<WorkPlanCreateDto, WorkPlan>(input);
insertObj.Sort = sort;
+ insertObj.CreatorName = "SuperAdmin";
input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
await workPlanRepository.InsertAsync(insertObj);
@@ -152,6 +160,8 @@
input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None);
updateObj.TaskCode = input.TaskCode;
+ updateObj.WorkPlanStatus = input.WorkPlanStatus;
+ updateObj.CallMaterialStatus = input.CallMaterialStatus;
updateObj.DataIdentifier = input.DataIdentifier;
updateObj.MaterialMode = input.MaterialMode;
updateObj.Length = input.Length;
@@ -178,7 +188,6 @@
updateObj.OuterDiameter = input.OuterDiameter;
updateObj.Thickness = input.Thickness;
updateObj.Material = input.Material;
- updateObj.HasMainSignature = input.HasMainSignature;
updateObj.ProcessRouteNumber = input.ProcessRouteNumber;
updateObj.PlannedStartTime = input.PlannedStartTime;
updateObj.PlannedEndTime = input.PlannedEndTime;
@@ -299,310 +308,167 @@
/// <param name="input"></param>
/// <returns></returns>
/// <exception cref="UserFriendlyException"></exception>
- public async Task ImportAsync(WorkPlansImportModel input)
+ public async Task ImportAsync(WorkPlansImportModel input, string userId,string userAccount)
{
-
//杞崲鏁版嵁
var result = ObjectMapper.Map<List<WorkPlansImportModel.WorkPlanImportModel>, List<WorkPlanInput>>(input.WorkPlans);
- await CreatebyApsAsync(result);
+ //await CreatebyApsAsync(result);
+ await _sharedService.CommonCreatebyApsAsync(result, _serviceProvider, this, userId, userAccount);
+ // Check.NotNull(input, nameof(input));
+
+ // var workPlanCreateDtos = new List<(int RowIndex, WorkPlanCreateDto Item)>();
+ // var workPlanUpdateDtos = new List<(int RowIndex, Guid Id, WorkPlanUpdateDto Item)>();
+ // var importItems = input.WorkPlans;
+
+ // if (importItems != null && importItems.Any())
+ // {
+ // #region 瀵煎叆鏍￠獙
+
+ // // 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
+ // var duplicateWorkPlans = importItems.GroupBy(x => x.TaskCode).Where(x => x.Count() > 1).ToList();
+ // if (duplicateWorkPlans?.Any() == true)
+ // {
+ // var duplicateWorkPlanMsgs = duplicateWorkPlans.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
+ // var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWorkPlanMsgs)}锛岀粓姝㈠鍏�";
+ // throw new UserFriendlyException(errorMsg);
+ // }
+
+ // #endregion
+
+ // foreach (var impItem in importItems)
+ // {
+ // if (impItem.TaskCode.IsNullOrWhiteSpace())
+ // {
+ // continue;
+ // }
+
+ // if (impItem.TaskCode.IsNullOrWhiteSpace())
+ // {
+ // var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細WorkPlan鍚嶇О涓嶈兘涓虹┖";
+ // throw new UserFriendlyException(errorMsg);
+ // }
+
+ // var oldWorkPlan = await workPlanRepository.FindByNameAsync(impItem.TaskCode);
+ // if (oldWorkPlan != null)
+ // {
+ // var workPlanUpdateDto = new WorkPlanUpdateDto
+ // {
+ // 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,
+ //WorkpieceName = impItem.WorkpieceName,
+ //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,
+
+ // };
+
+ // workPlanUpdateDtos.Add((impItem.RowIndex, oldWorkPlan.Id, workPlanUpdateDto));
+ // }
+ // else
+ // {
+ // var workPlanCreateDto = new WorkPlanCreateDto
+ // {
+ // 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,
+ //WorkpieceName = impItem.WorkpieceName,
+ //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,
+
+ // };
+
+ // workPlanCreateDtos.Add((impItem.RowIndex, workPlanCreateDto));
+ // }
+ // }
+ // }
+
+ // // 鏂板
+ // foreach (var workPlanDto in workPlanCreateDtos)
+ // {
+ // try
+ // {
+ // await CreateAsync(workPlanDto.Item);
+ // }
+ // catch (Exception e)
+ // {
+ // var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊workPlanDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ // throw new UserFriendlyException(errorMsg);
+ // }
+ // }
+
+ // // 鏇存柊
+ // foreach (var workPlanDto in workPlanUpdateDtos)
+ // {
+ // try
+ // {
+ // await UpdateAsync(workPlanDto.Id, workPlanDto.Item);
+ // }
+ // catch (Exception e)
+ // {
+ // var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊workPlanDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
+ // throw new UserFriendlyException(errorMsg);
+ // }
+ // }
}
-
-
- public async Task<MesOrderResponse> CreatebyApsAsync(List<WorkPlanInput> input)
- {
- if (input == null)
- {
- throw new UserFriendlyException("杈撳叆鍙傛暟涓嶈兘涓虹┖");
- }
-
- if (input.Count == 0)
- {
- throw new UserFriendlyException("杈撳叆鍙傛暟Data涓嶈兘涓虹┖");
- }
-
- var orderManager = _serviceProvider.GetRequiredService<IOrderManager>();
- var productProvider = _serviceProvider.GetRequiredService<IProductProvider>();
- var formulaProvider = _serviceProvider.GetRequiredService<IFormulaProvider>();
- List<OrderModel> orderModels = new List<OrderModel>();
- //鎸夌収浠诲姟缂栧彿鍒嗙粍
- var groupTask = input.GroupBy(x => x.TaskCode);
- foreach (var gTask in groupTask)
- {
- var taskCode = gTask.Key;
- var order = await orderManager.GetByCodeAsync(taskCode);
- if (order != null)
- {
- throw new UserFriendlyException($"浠诲姟缂栧彿[{taskCode}]宸插瓨鍦�");
- }
-
-
- //var product = await productProvider.FindByNameAsync(orderItem.PipeSectionName);
- //if (product == null)
- //{
- // throw new UserFriendlyException($"浜у搧鍚嶇О[{orderItem.PipeSectionName}]涓嶅瓨鍦�");
- //}
-
- //var formula = await formulaProvider.GetFormulaAsync(product.Id);
- //if (formula == null)
- //{
- // throw new UserFriendlyException($"浜у搧鍨嬪彿[{orderItem.MaterialCode}]鏃犲叧鑱旈厤鏂�");
- //}
- //棣栧厛瑕佸垱寤� 鎵撶爜鍒囧壊鐨勫伐鍗�
- var productForCut = await productProvider.FindByNameAsync("鍒囧壊鍘熸枡绠�");
- if (productForCut == null)
- {
- throw new UserFriendlyException($"浜у搧鍚嶇О[鍒囧壊鍘熸枡绠涓嶅瓨鍦�");
- }
- var formulaForCut = await formulaProvider.GetFormulaAsync(productForCut.Id);
- if (formulaForCut == null)
- {
- throw new UserFriendlyException($"浜у搧鍚嶇О[鍒囧壊鍘熸枡绠鏃犲叧鑱旈厤鏂�");
- }
- //鍒嗙粍鏁版嵁
- var group = gTask.ToList().GroupBy(x => x.DataIdentifier);
- foreach (var item in group)
- {
- OrderModel orderModelForCut = new OrderModel()
- {
- Id = Guid.NewGuid(),
- Code = "Cut_" + taskCode,
- Source = "APS鎺ㄩ��",
- PlanStartTime = gTask.ToList().First().PlannedStartTime,
- PlanFinishTime = gTask.ToList().First().PlannedEndTime,
- PlanQty = (ulong)item.ToList().Count,
- Status = OrderStatus.NotActive,
- Product = new AssociationProductModel() { Id = productForCut.Id, Name = productForCut.Name, Model = productForCut.Model, ShortNumber = productForCut.ShortNumber },
- Formula = new AssociationFormulaModel() { Id = formulaForCut.Id, Code = formulaForCut.Code, Name = formulaForCut.Name }
- };
- orderModelForCut.ExtraProperties["OuterDiameter"] = gTask.ToList().First().OuterDiameter;//澶栧緞
- orderModelForCut.ExtraProperties["Material"] = gTask.ToList().First().Material;//鏉愯川
- orderModelForCut.ExtraProperties["Length"] = gTask.ToList().First().Length;//闀垮害
-
- var orderForCut = await orderManager.GetByCodeAsync(orderModelForCut.Code);
- if (orderForCut != null)
- {
- //throw new UserFriendlyException($"宸ュ崟[{orderModelForCut.Code}]宸插瓨鍦�");
- //涓嶅啀鎶涘紓甯革紝鐩存帴璺宠繃
- break;
- }
-
- var orderModelResultForCut = await orderManager.CreateAsync(orderModelForCut);
- if (orderModelResultForCut == null)
- {
- throw new UserFriendlyException($"宸ュ崟[{orderModelForCut.Code}]鍒涘缓澶辫触");
- }
- orderModels.Add(orderModelResultForCut);
-
-
- //OrderModel orderModel = new OrderModel();
- //orderModel.Id = Guid.NewGuid();
- //orderModel.Code = orderItem.TaskCode;
- //orderModel.Source = "APS鎺ㄩ��";
- //orderModel.Product = new AssociationProductModel() { Id = product.Id, Name = product.Name, Model = product.Model, ShortNumber = product.ShortNumber };
- ////orderModel.Formula = new AssociationFormulaModel() { Id = formula.Id, Code = formula.Code, Name = formula.Name };
- //orderModel.PlanStartTime = orderItem.PlannedStartTime;
- //orderModel.PlanFinishTime = orderItem.PlannedEndTime;
- //orderModel.PlanQty = (ulong?)orderItem.OrderQty;
- //orderModel.Status = OrderStatus.NotActive;
- //orderModel.ExtraProperties["Source"] = "ddd";
- //var source = orderModel.ExtraProperties["Source"];
- //var orderModelResult = await orderManager.CreateAsync(orderModel);
- //if (orderModelResult == null)
- //{
- // throw new UserFriendlyException($"宸ュ崟[{orderItem.TaskCode}]鍒涘缓澶辫触");
- //}
- //orderModels.Add(orderModelResult);
- }
-
- }
-
-
- //淇濆瓨鍒拌〃涓�
- foreach (var item in input)
- {
- var insertObj = ObjectMapper.Map<WorkPlanInput, WorkPlanCreateDto>(item);
- //insertObj.OrgMaterialCode = "1111";
- insertObj.Sort = 1;
- await CreateAsync(insertObj);
- }
-
-
- // 鍙戝竷浜嬩欢
- //await _eventBus.PublishAsync(new EntityChangedEto("MESCREATE", input, null, EntityChangeType.Add, true));
-
- var response = new MesOrderResponse
- {
- Code = "000000",
- Data = orderModels,
- Fail = false,
- Mesg = "澶勭悊鎴愬姛",
- Success = true,
- Time = DateTime.UtcNow
- };
- return response;
- }
-
- ///// <summary>
- ///// 瀵煎叆浣滀笟璁″垝琛�
- ///// </summary>
- ///// <param name="input"></param>
- ///// <returns></returns>
- ///// <exception cref="UserFriendlyException"></exception>
- //public async Task ImportAsync(WorkPlansImportModel input)
- //{
- // Check.NotNull(input, nameof(input));
-
- // var workPlanCreateDtos = new List<(int RowIndex, WorkPlanCreateDto Item)>();
- // var workPlanUpdateDtos = new List<(int RowIndex, Guid Id, WorkPlanUpdateDto Item)>();
- // var importItems = input.WorkPlans;
-
- // if (importItems != null && importItems.Any())
- // {
- // #region 瀵煎叆鏍￠獙
-
- // // 鍒ゆ柇鍚嶇О鏄惁閲嶅锛屽苟杈撳嚭绗嚑琛岄噸澶�
- // var duplicateWorkPlans = importItems.GroupBy(x => x.TaskCode).Where(x => x.Count() > 1).ToList();
- // if (duplicateWorkPlans?.Any() == true)
- // {
- // var duplicateWorkPlanMsgs = duplicateWorkPlans.Select(x => $"绗� {string.Join(",", x.Select(x => x.RowIndex))} 琛岋細{x.Key} 鍚嶇О閲嶅");
- // var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝 {string.Join(",", duplicateWorkPlanMsgs)}锛岀粓姝㈠鍏�";
- // throw new UserFriendlyException(errorMsg);
- // }
-
- // #endregion
-
- // foreach (var impItem in importItems)
- // {
- // if (impItem.TaskCode.IsNullOrWhiteSpace())
- // {
- // continue;
- // }
-
- // if (impItem.TaskCode.IsNullOrWhiteSpace())
- // {
- // var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊impItem.RowIndex}琛岋細WorkPlan鍚嶇О涓嶈兘涓虹┖";
- // throw new UserFriendlyException(errorMsg);
- // }
-
- // var oldWorkPlan = await workPlanRepository.FindByNameAsync(impItem.TaskCode);
- // if (oldWorkPlan != null)
- // {
- // var workPlanUpdateDto = new WorkPlanUpdateDto
- // {
- // TaskCode = impItem.TaskCode,
- // 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,
- // WorkpieceName = impItem.WorkpieceName,
- // ProcessName = impItem.ProcessName,
- // PipeFittingCode = impItem.PipeFittingCode,
- // PreSerialNumber = impItem.PreSerialNumber,
- // PipeSpecCode = impItem.PipeSpecCode,
- // PipeSectionName = impItem.PipeSectionName,
- // OuterDiameter = impItem.OuterDiameter,
- // Thickness = impItem.Thickness,
- // Material = impItem.Material,
- // HasMainSignature = impItem.HasMainSignature,
- // ProcessRouteNumber = impItem.ProcessRouteNumber,
- // PlannedStartTime = impItem.PlannedStartTime,
- // PlannedEndTime = impItem.PlannedEndTime,
- // TeamInfo = impItem.TeamInfo,
- // Timestamp = impItem.Timestamp,
- // Remark = impItem.Remark,
-
- // };
-
- // workPlanUpdateDtos.Add((impItem.RowIndex, oldWorkPlan.Id, workPlanUpdateDto));
- // }
- // else
- // {
- // var workPlanCreateDto = new WorkPlanCreateDto
- // {
- // TaskCode = impItem.TaskCode,
- // 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,
- // WorkpieceName = impItem.WorkpieceName,
- // ProcessName = impItem.ProcessName,
- // PipeFittingCode = impItem.PipeFittingCode,
- // PreSerialNumber = impItem.PreSerialNumber,
- // PipeSpecCode = impItem.PipeSpecCode,
- // PipeSectionName = impItem.PipeSectionName,
- // OuterDiameter = impItem.OuterDiameter,
- // Thickness = impItem.Thickness,
- // Material = impItem.Material,
- // HasMainSignature = impItem.HasMainSignature,
- // ProcessRouteNumber = impItem.ProcessRouteNumber,
- // PlannedStartTime = impItem.PlannedStartTime,
- // PlannedEndTime = impItem.PlannedEndTime,
- // TeamInfo = impItem.TeamInfo,
- // Timestamp = impItem.Timestamp,
- // Remark = impItem.Remark,
-
- // };
-
- // workPlanCreateDtos.Add((impItem.RowIndex, workPlanCreateDto));
- // }
- // }
- // }
-
- // // 鏂板
- // foreach (var workPlanDto in workPlanCreateDtos)
- // {
- // try
- // {
- // await CreateAsync(workPlanDto.Item);
- // }
- // catch (Exception e)
- // {
- // var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊workPlanDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- // throw new UserFriendlyException(errorMsg);
- // }
- // }
-
- // // 鏇存柊
- // foreach (var workPlanDto in workPlanUpdateDtos)
- // {
- // try
- // {
- // await UpdateAsync(workPlanDto.Id, workPlanDto.Item);
- // }
- // catch (Exception e)
- // {
- // var errorMsg = $"瀵煎叆澶辫触锛侀厤缃紝绗瑊workPlanDto.RowIndex}琛岋細{e.Message}锛岀粓姝㈠鍏�";
- // throw new UserFriendlyException(errorMsg);
- // }
- // }
- //}
/// <summary>
/// 瀵煎嚭浣滀笟璁″垝琛�
@@ -647,6 +513,8 @@
{
Check.NotNull(input, nameof(input));
Check.NotNullOrWhiteSpace(input.TaskCode, "浠诲姟缂栫爜", 256);
+ Check.NotNull(input.WorkPlanStatus, "璁″垝鐘舵��");
+ Check.NotNull(input.CallMaterialStatus, "鍙枡鐘舵��");
Check.NotNull(input.Length, "闀垮害(mm)");
Check.NotNull(input.MarkingPosition, "鎵撶爜浣嶇疆");
Check.NotNull(input.CuttingPosition, "鍒囧壊浣嶇疆");
@@ -657,7 +525,6 @@
Check.NotNull(input.PipeWallThickness, "濂楃鐩村緞(mm)");
Check.NotNull(input.OuterDiameter, "澶栧緞(mm)");
Check.NotNull(input.Thickness, "澹佸帤(mm)");
- Check.NotNull(input.HasMainSignature, "鏄惁涓绘敮绠�");
return Task.CompletedTask;
}
--
Gitblit v1.9.3