From 4db56b86d54f4f8d5a01ecb7365a30673f5d8fd4 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期四, 12 九月 2024 14:00:39 +0800
Subject: [PATCH] Merge branch 'master' into csc
---
Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
index 6c25547..032a946 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
@@ -403,14 +403,17 @@
.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,
- Qty = task.Qty
+ 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
})
.ToListAsync();
}
--
Gitblit v1.8.0