222

schangxiang@126.com

2025-05-16 1ad40156ec25db1b9d90c3f94819434e20d52b00

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

@@ -34,12 +34,20 @@
public class SharedService : CMSPluginAppService
{


    /// <summary>
    /// 分拣功能
    /// </summary>
    /// <param name="_serviceProvider"></param>
    /// <param name="input"></param>
    /// <param name="myCurrentUser"></param>
    /// <returns></returns>
    public async Task<MesOrderResponse> CommonPick(IServiceProvider _serviceProvider, PickInput input, MyCurrentUser myCurrentUser)
    {
        //1、记录分拣记录表
        //2、更新作业计划表的状态 =已分拣
        //3、写入 分拣变量
        //4、写入追溯报表
        //5、物料组盘

        VariableService _variableService = _serviceProvider.GetRequiredService<VariableService>();
        var _workSectionManager = _serviceProvider.GetRequiredService<IWorkSectionManager>();
@@ -48,13 +56,13 @@
        var materialProvider = _serviceProvider.GetRequiredService<IMaterialProvider>();
        var workPlanAppService = _serviceProvider.GetRequiredService<IWorkPlanAppService>();

        Dictionary<string, object?> keyValuePairs = new Dictionary<string, object?>
                    {
                        { "分拣托盘号","托盘1"},
                        { "分拣方向", "短管装配"},
                        { "分拣人", myCurrentUser.UserAccount }
                    };
        _variableService.WriteValueAsync(keyValuePairs);
        //Dictionary<string, object?> keyValuePairs = new Dictionary<string, object?>
        //            {
        //                { "分拣托盘号","托盘1"},
        //                { "分拣方向", "短管装配"},
        //                { "分拣人", myCurrentUser.UserAccount }
        //            };
        //_variableService.WriteValueAsync(keyValuePairs);

        //根据工序名获取工序对象
        var workSection = await _workSectionManager.GetByNameAsync("分拣工序");
@@ -89,26 +97,76 @@
        var firstWorkPlans = await workPlanAppService.GetListByFilterAsync(x => x.PipeSpecCode == input.PipeSpecCode);

        var firstWorkPlan = await workPlanAppService.GetSingleByFilterAsync(x => x.PipeSpecCode == input.PipeSpecCode);
        var rawPipe_DataIdentifier = await materialProvider.FindByNameAsync("分拣原料管标识");
        var rawPipe_MaterialMode = await materialProvider.FindByNameAsync("分拣原料管型号");
        var rawPipe_DataIdentifier = await materialProvider.FindByNameAsync("原料管标识");
        var rawPipe_MaterialMode = await materialProvider.FindByNameAsync("原料管型号");
        var rawPipe_Batch = await materialProvider.FindByNameAsync("原料管批次");
        List<TraceMaterialModel> _MaterialParams = new List<TraceMaterialModel>();
        _MaterialParams.Add(new TraceMaterialModel()
        foreach (var item in workSection.MaterialParameters)
        {
            Key = "分拣原料管标识",
            Quantity = 1,
            MaterialId = rawPipe_DataIdentifier.MaterialId,
            MaterialDetailId = rawPipe_DataIdentifier.MaterialDetails.First().Id,
            Value = firstWorkPlan.DataIdentifier,
            if (item.Name == "原料管型号")
            {
                _MaterialParams.Add(new TraceMaterialModel()
                {
                    Key = item.Key,
                    Quantity = 1,
                    MaterialId = rawPipe_MaterialMode.MaterialId,
                    MaterialDetailId = rawPipe_MaterialMode.MaterialDetails.First().Id,
                    Value = firstWorkPlan.MaterialMode

        });
        _MaterialParams.Add(new TraceMaterialModel()
                });
            }
            if (item.Name == "原料管标识")
            {
                _MaterialParams.Add(new TraceMaterialModel()
                {
                    Key = item.Key,
                    Quantity = 1,
                    MaterialId = rawPipe_DataIdentifier.MaterialId,
                    MaterialDetailId = rawPipe_DataIdentifier.MaterialDetails.First().Id,
                    Value = firstWorkPlan.DataIdentifier,

                });
            }
            if (item.Name == "原料管批次")
            {
                _MaterialParams.Add(new TraceMaterialModel()
                {
                    Key = item.Key,
                    Quantity = 1,
                    MaterialId = rawPipe_Batch.MaterialId,
                    MaterialDetailId = rawPipe_Batch.MaterialDetails.First().Id,
                    Value = "111",//批次暂时写死

                });
            }
        };

        //配置过程参数(采集参数、配方参数)
        traceModel.Params = new List<TraceParamModel>();
        foreach (var item in workSection.ProcessParameters)
        {
            Key = "分拣原料管型号",
            Quantity = 1,
            MaterialId = rawPipe_MaterialMode.MaterialId,
            MaterialDetailId = rawPipe_MaterialMode.MaterialDetails.First().Id,
            Value = firstWorkPlan.MaterialMode
        });
            string _value = "";
            if (item.Name == "分拣方向")
            {
                _value = "短管装配";
            }
            if (item.Name == "分拣托盘号")
            {
                _value = input.ContinerNo;
            }
            if (item.Name == "分拣人")
            {
                _value = myCurrentUser.UserAccount;
            }
            //item.Key
            TraceParamModel traceParamModel = new TraceParamModel()
            {
                Key = item.Key,
                Value = _value
            };
            traceModel.Params.Add(traceParamModel);
        };

        traceModel.MaterialParams = _MaterialParams;

        await traceProvider.CreateTraceAsync(traceModel);
@@ -379,9 +437,9 @@
    /// <param name="_serviceProvider">服务提供者</param>
    /// <returns>操作结果</returns>
    /// <exception cref="UserFriendlyException">当数据不存在或状态不允许叫料时抛出</exception>
    public async Task<MesOrderResponse> CallMaterialByDataIdentifier(Guid id, IServiceProvider _serviceProvider)
    public async Task<MesOrderResponse> CallMaterial(CallMaterialByDataIdentifierInput input, IServiceProvider _serviceProvider, MyCurrentUser myCurrentUser)
    {
        if (string.IsNullOrEmpty(id.ToString()))
        if (string.IsNullOrEmpty(input.Id.ToString()))
        {
            throw new UserFriendlyException("原料标识不能为空");
        }
@@ -393,7 +451,7 @@

        // 查找数据

        var callMaterialOrder = await callMaterialOrderRepository.GetAsync(id);
        var callMaterialOrder = await callMaterialOrderRepository.GetAsync(input.Id);
        if (callMaterialOrder == null)
        {
            throw new UserFriendlyException($"找不到叫料记录");
@@ -405,7 +463,10 @@
            throw new UserFriendlyException($"原料标识为 '{callMaterialOrder.DataIdentifier}' 的叫料记录状态为 '{callMaterialOrder.CallMaterialStatus}'，不允许叫料");
        }

        //TODO:这里调用wms的叫料接口

        // 更新数据
        callMaterialOrder.MaterialBatch = GenerateRandomBatch();//wms返回的原料批次
        callMaterialOrder.WmsRetResult = "成功";
        callMaterialOrder.WmsTaskNo = GenerateRandomTaskNo();
        callMaterialOrder.CallMaterialStatus = Domain.Shared.Enums.CallMaterialStatusEnum.叫料完成;
@@ -414,7 +475,7 @@
        await callMaterialOrderRepository.UpdateAsync(callMaterialOrder);

        //更新作业计划表
        var workPlanList = await workPlanRepository.FindByDataIdentifierAsync(callMaterialOrder.DataIdentifier);
        var workPlanList = await workPlanRepository.GetListByFilterAsync(x => x.DataIdentifier == callMaterialOrder.DataIdentifier);
        foreach (var item in workPlanList)
        {
            item.CallMaterialStatus = Domain.Shared.Enums.CallMaterialStatusEnum.叫料完成;
@@ -426,6 +487,7 @@
        var callMaterialOrderRecord = new CallMaterialOrderRecord()
        {
            CallMaterialStatus = Domain.Shared.Enums.CallMaterialStatusEnum.叫料完成,
            MaterialBatch = callMaterialOrder.MaterialBatch,
            MaterialMode = callMaterialOrder.MaterialMode,
            DataIdentifier = callMaterialOrder.DataIdentifier,
            Quantity = 1,
@@ -471,4 +533,13 @@
        // 生成前缀
        return $"WMS{timestamp}";
    }

    private string GenerateRandomBatch()
    {
        // 获取当前时间戳（从1970-01-01 00:00:00 UTC到现在的秒数）
        long timestamp = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();

        // 生成前缀
        return $"Batch{timestamp}";
    }
}