From 4683c8a19e593e8f999c6f1a145e0bb73eb20dea Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期四, 12 九月 2024 08:17:12 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
index 403432f..032a946 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
@@ -405,11 +405,12 @@
{
Id=device.Id,
Text=device.Text,
+ TaskNo=task.TaskNo,
OrderNo=task.OrderNo,
LotNo=task.LotNo,
SkuNo=task.SkuNo,
SkuName=task.SkuName,
- LineNO=task.LineNO,
+ LineNo=task.LineNo,
Status =task.Status,
PZNo=task.PZNo,
Qty=task.Qty
--
Gitblit v1.8.0