From 1a7b7c3d3370d9033e0b90a8e74e3acfb5709139 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 10 九月 2024 17:00:17 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6

---
 Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
index b792afd..403432f 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
+++ b/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();
     }

--
Gitblit v1.8.0