From 1f1b1f9a3dcc2151c7c25589e2507b1ddf81a2c2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 11 9月 2024 14:24:39 +0800
Subject: [PATCH] 增加来源
---
iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs | 7 +++++++
iWara.SCADA.Code/iWare.Wms.EntityFramework.Core/dbsettings.json | 5 +----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs
index 9633936..f5a2fc7 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs
@@ -239,6 +239,13 @@
.Select(s => new WorkPieceProcessOutput
{
Id = s.a.Id,
+
+ DataCapturePointCname = s.a.DataCapturePointCname,
+ UpdateDataCapturePointCname = s.a.UpdateDataCapturePointCname,
+ QualityNoOkReason = s.a.QualityNoOkReason,
+ CreateUserName = s.a.CreatedUserName,
+ UpdatedUserName = s.a.UpdatedUserName,
+
WorkPieceID = s.a.WorkPieceID,
WorkingProcedureCurrent = s.a.WorkingProcedureCurrent,
EquipmentID = s.a.EquipmentID,
diff --git a/iWara.SCADA.Code/iWare.Wms.EntityFramework.Core/dbsettings.json b/iWara.SCADA.Code/iWare.Wms.EntityFramework.Core/dbsettings.json
index 34e5ee1..1831657 100644
--- a/iWara.SCADA.Code/iWare.Wms.EntityFramework.Core/dbsettings.json
+++ b/iWara.SCADA.Code/iWare.Wms.EntityFramework.Core/dbsettings.json
@@ -15,10 +15,7 @@
//"MultiTenantConnection": "Data Source=localhost;Database=Admin.NET_SaaS;User ID=root;Password=123456;pooling=true;port=3306;sslmode=none;CharSet=utf8;"
//MSSQL杩炴帴瀛楃涓�
- //"DefaultConnection": "Server=.;Database=iWare.WMS;User=sa;Password=123abc.com;MultipleActiveResultSets=True;"
- //"DefaultConnection": "Server=82.156.32.44;Database=iWare.WMS;User=sa;Password=123abc.com;MultipleActiveResultSets=True;"
- //"DefaultConnection": "Server=192.168.216.203;Database=iWare.SCADA;User=sa;Password=123abc.com;MultipleActiveResultSets=True;"
- "DefaultConnection": "Server=.;Database=iWare.SCADA;User=sa;Password=123abc.com;MultipleActiveResultSets=True;"
+ "DefaultConnection": "Server=192.168.216.203;Database=iWare.SCADA;User=sa;Password=123abc.com;MultipleActiveResultSets=True;"
//"MultiTenantConnection": "Server=localhost;Database=Admin.NET_SaaS;User=sa;Password=123456;MultipleActiveResultSets=True;"
}
}
\ No newline at end of file
--
Gitblit v1.9.3