Merge branch 'master' into wxw

wxw

2024-09-25 54728bfad5a2b222ff26e4f6be26bd239b3c5720

 Admin.NET/WCS.Application/Service/WcsCheckTask/WcsCheckTaskService.cs

@@ -6,6 +6,7 @@

using Admin.NET.Core.Service;
using AngleSharp.Dom;
using DocumentFormat.OpenXml.Vml.Office;
using Elastic.Clients.Elasticsearch.Tasks;
using Microsoft.AspNetCore.Http;
using WCS.Application.Entity;
@@ -147,13 +148,13 @@
    }

    /// <summary>
    /// 手动绑定任务到PLC
    /// 手动绑定任务
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "BindTaskForPLC")]
    [DisplayName("手动绑定任务到PLC")]
    [DisplayName("手动绑定任务")]
    public async Task BindTaskForPLC(BindTaskPLCInput input)
    {
        var deviceInfo = await _wcsDeviceRep.GetByIdAsync(input.deviceId);
@@ -211,6 +212,11 @@
        #endregion
    }

    /// <summary>
    /// 任务结批
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    [HttpPost]
    [ApiDescriptionSettings(Name = "CloseTaskForPLC")]
    [DisplayName("任务结批")]
@@ -253,6 +259,31 @@
                //更新分拣任务
                await _wcsCheckTaskRep.AsUpdateable(item).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
            }

            //Service.WcsDevice.Dto.WcsDeviceTaskOrderDto order=  await _wcsDeviceRep.Context.Queryable<WcsDevice>()
            //    .InnerJoin<WcsPlc>((device, plc) => device.PlcId == plc.Id)
            //    .LeftJoin<WcsCheckTask>((device, plc, task) => device.StationNum == task.Port)
            //    .Where((device, plc, task) => device.PlcId == 1000 && task.Port=="")
            //    .Select((device, plc, task) => new Service.WcsDevice.Dto.WcsDeviceTaskOrderDto()
            //    {
            //        Id = device.Id,
            //        Text = device.Text,
            //        TaskNo = task.TaskNo,
            //        OrderNo = task.OrderNo,
            //        LotNo = task.LotNo,
            //        SkuNo = task.SkuNo,
            //        SkuName = task.SkuName,
            //        LineNo = task.LineNo,
            //        Status = task.Status,
            //        PZNo = task.PZNo,
            //        Qty = task.Qty,

            //        Type = plc.Type
            //    })
            //    .FirstAsync();
            ////下发分拣任务
            //HubUtil.PublicCheckTask(order.Adapt<Service.WcsDevice.Dto.WcsDeviceTaskOrderDto>());

            #endregion                      
        }  
    }