Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6

hwh

2024-09-10 1a7b7c3d3370d9033e0b90a8e74e3acfb5709139

 Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs

@@ -403,15 +403,16 @@
                .OrderBy((device, task) => device.CreateTime)
                .Select((device, task) => new WcsDeviceTaskOrderDto()
                {
                    Id = device.Id,
                    Text = device.Text,
                    OrderNo = task.OrderNo,
                    LotNo = task.LotNo,
                    SkuNo = task.SkuNo,
                    SkuName = task.SkuName,
                    Status = task.Status,
                    LineNO = task.LineNO,
                    Qty = task.Qty
                    Id=device.Id,
                    Text=device.Text,
                    OrderNo=task.OrderNo,
                    LotNo=task.LotNo,
                    SkuNo=task.SkuNo,
                    SkuName=task.SkuName,
                    LineNO=task.LineNO,
                    Status =task.Status,
                    PZNo=task.PZNo,
                    Qty=task.Qty
                })
                .ToListAsync();
    }