2

schangxiang@126.com

2025-05-11 4d916744ba1ba9066d1ecf809f43ddddb817b26b

 PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs

@@ -10,12 +10,6 @@
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;

namespace CMS.Plugin.PipeLineLems.Application.Implements;

@@ -25,18 +19,17 @@
public class WorkPlanAppService : CMSPluginAppService, IWorkPlanAppService
{
    private readonly IWorkPlanRepository workPlanRepository;
    private readonly IServiceProvider _serviceProvider;
    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, SharedService sharedService)
    public WorkPlanAppService(IWorkPlanRepository _WorkPlanRepository, SharedService sharedService, IServiceProvider serviceProvider)
    {
        workPlanRepository = _WorkPlanRepository;
        _serviceProvider = serviceProvider;
        _sharedService = sharedService;
        _serviceProvider = serviceProvider;
    }

    /// <summary> 
@@ -154,6 +147,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;
@@ -180,7 +175,6 @@
        updateObj.OuterDiameter = input.OuterDiameter;
        updateObj.Thickness = input.Thickness;
        updateObj.Material = input.Material;
     
        updateObj.ProcessRouteNumber = input.ProcessRouteNumber;
        updateObj.PlannedStartTime = input.PlannedStartTime;
        updateObj.PlannedEndTime = input.PlannedEndTime;
@@ -303,30 +297,11 @@
    /// <exception cref="UserFriendlyException"></exception> 
    public async Task ImportAsync(WorkPlansImportModel input)
    {

        //转换数据
        var result = ObjectMapper.Map<List<WorkPlansImportModel.WorkPlanImportModel>, List<WorkPlanInput>>(input.WorkPlans);

        //await CreatebyApsAsync(result);
        await _sharedService.CommonCreatebyApsAsync(result, _serviceProvider, this);
    }


    public async Task<MesOrderResponse> CreatebyApsAsync(List<WorkPlanInput> input)
    {
        var response=await _sharedService.CommonCreatebyApsAsync(input, _serviceProvider, this);
       
        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)>();
@@ -367,6 +342,8 @@
    //                var workPlanUpdateDto = new WorkPlanUpdateDto
    //                {
    //                    TaskCode = impItem.TaskCode,
        //WorkPlanStatus = impItem.WorkPlanStatus,
        //CallMaterialStatus = impItem.CallMaterialStatus,
    //                    DataIdentifier = impItem.DataIdentifier,
    //                    MaterialMode = impItem.MaterialMode,
    //                    Length = impItem.Length,
@@ -393,7 +370,6 @@
    //                    OuterDiameter = impItem.OuterDiameter,
    //                    Thickness = impItem.Thickness,
    //                    Material = impItem.Material,
    //                    HasMainSignature = impItem.HasMainSignature,
    //                    ProcessRouteNumber = impItem.ProcessRouteNumber,
    //                    PlannedStartTime = impItem.PlannedStartTime,
    //                    PlannedEndTime = impItem.PlannedEndTime,
@@ -410,6 +386,8 @@
    //                var workPlanCreateDto = new WorkPlanCreateDto
    //                {
    //                    TaskCode = impItem.TaskCode,
        //WorkPlanStatus = impItem.WorkPlanStatus,
        //CallMaterialStatus = impItem.CallMaterialStatus,
    //                    DataIdentifier = impItem.DataIdentifier,
    //                    MaterialMode = impItem.MaterialMode,
    //                    Length = impItem.Length,
@@ -436,7 +414,6 @@
    //                    OuterDiameter = impItem.OuterDiameter,
    //                    Thickness = impItem.Thickness,
    //                    Material = impItem.Material,
    //                    HasMainSignature = impItem.HasMainSignature,
    //                    ProcessRouteNumber = impItem.ProcessRouteNumber,
    //                    PlannedStartTime = impItem.PlannedStartTime,
    //                    PlannedEndTime = impItem.PlannedEndTime,
@@ -478,7 +455,7 @@
    //            throw new UserFriendlyException(errorMsg);
    //        }
    //    }
    //}
    }

    /// <summary> 
    /// 导出作业计划表 
@@ -523,6 +500,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, "切割位置");
@@ -533,7 +512,6 @@
        Check.NotNull(input.PipeWallThickness, "套管直径(mm)");
        Check.NotNull(input.OuterDiameter, "外径(mm)");
        Check.NotNull(input.Thickness, "壁厚(mm)");
        Check.NotNull(input.HasMainSignature, "是否主支管");

        return Task.CompletedTask;
    }