From 5999e9c77ee30a7090ed7f6cdd07d82fe9a4015b Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期三, 11 九月 2024 08:44:06 +0800
Subject: [PATCH] Merge branch 'master' into liudl
---
Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs | 18 ++++++++++--------
1 files changed, 10 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..403432f 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
@@ -403,14 +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,
- 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();
}
--
Gitblit v1.8.0