From 34f22dd5f386f225131447247a1d1ad098e4ddc7 Mon Sep 17 00:00:00 2001
From: 展杰 <1240968267@qq.com>
Date: 星期三, 21 八月 2024 11:03:10 +0800
Subject: [PATCH] womcab 添加损耗字段
---
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/appsettings.json | 4
MESApplication/bin/Debug/net8.0/log/2024081909.log | 3
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MES.Service/Dto/webApi/ErpCAB.cs | 6
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MESApplication.xml | 51 +++++++-----
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MES.Service/service/WomcaaManager.cs | 13 +--
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/MESApplication.dll | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/MESApplication.pdb | 0
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.xml | 51 +++++++-----
MES.Service/Dto/webApi/ErpCAA.cs | 6
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/bin/Debug/net8.0/MESApplication.xml | 51 +++++++-----
MES.Service/Modes/Womcab.cs | 12 +++
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/appsettings.json | 4
MESApplication/appsettings.json | 4
31 files changed, 125 insertions(+), 82 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpCAA.cs b/MES.Service/Dto/webApi/ErpCAA.cs
index a16c917..234bacc 100644
--- a/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/MES.Service/Dto/webApi/ErpCAA.cs
@@ -34,7 +34,7 @@
public string? FSrcSplitBillNo { get; set; }
public string? FDESCRIPTION { get; set; }
- public string? planId { get; set; }
- public string? planSeq { get; set; }
- public string? planNum { get; set; }
+ public string? PLAN_ID { get; set; }
+ public string? PLAN_SEQ { get; set; }
+ public string? PLAN_NUM { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpCAB.cs b/MES.Service/Dto/webApi/ErpCAB.cs
index 68314e2..220da75 100644
--- a/MES.Service/Dto/webApi/ErpCAB.cs
+++ b/MES.Service/Dto/webApi/ErpCAB.cs
@@ -12,7 +12,6 @@
public string? FLot { get; set; }
public string? FStockID { get; set; }
public string? FIssueType { get; set; }
- public string? F_UNW_Text_tpgy { get; set; } //1
public string? FUnitID { get; set; }
public string? FSupplyType { get; set; }
public string? FStdQty { get; set; }
@@ -21,8 +20,9 @@
public string? FDenominator { get; set; }
public string? FChildSupplyOrgId { get; set; }
public string? FSUPPLYORG { get; set; }
- public string FENTRYID { get; set; }
+ public string FENTRYID { get; set; }
public string? FID { get; set; }
-
public string? FSeq { get; set; }
+ public string? SCRAPQTY { get; set; }
+ public string? SCRAPRATE { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcab.cs b/MES.Service/Modes/Womcab.cs
index 109dc84..277f35b 100644
--- a/MES.Service/Modes/Womcab.cs
+++ b/MES.Service/Modes/Womcab.cs
@@ -152,4 +152,16 @@
/// </summary>
[SugarColumn(ColumnName = "DENOMINATOR")]
public string? Denominator { get; set; }
+
+ /// <summary>
+ /// 鍒嗗瓙
+ /// </summary>
+ [SugarColumn(ColumnName = "SCRAPQTY")]
+ public string? Scrapqty { get; set; }
+
+ /// <summary>
+ /// 鍒嗘瘝
+ /// </summary>
+ [SugarColumn(ColumnName = "SCRAPRATE")]
+ public string? Scraprate { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index ec453be..10f8cd2 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index 79b9937..8ebd739 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.dll b/MES.Service/bin/Release/net8.0/MES.Service.dll
index f6b6dfe..4f74eae 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.pdb b/MES.Service/bin/Release/net8.0/MES.Service.pdb
index fdf27e8..668f6a7 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 8e52cfb..1e2727b 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -23,9 +23,7 @@
{
var womErpCaa = wom.ErpCaa;
var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa);
- var mesWomcabs =
- MapErpCABtoWomcab(wom.ErpCabs);
-
+ var mesWomcabs =MapErpCABtoWomcab(wom.ErpCabs);
return UseTransaction(db =>
{
switch (womErpCaa.Type)
@@ -49,11 +47,9 @@
List<Womcab> mesWomcabs)
{
if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
-
if (mesWomcabs.Count > 0)
db.Deleteable<Womcab>()
.Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
-
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
if (orUpdate && baOrUpdate) return true;
@@ -109,9 +105,9 @@
CloseType = dto.FCloseType,
SrcSplitBillno = dto.FSrcSplitBillNo,
Caa016 = dto.FDESCRIPTION,
- Caa018 = Convert.ToDecimal(dto.planId),
- Caa019 = Convert.ToDecimal(dto.planSeq),
- Caa020 = dto.planNum
+ Caa018 = Convert.ToDecimal(dto.PLAN_ID),
+ Caa019 = Convert.ToDecimal(dto.PLAN_SEQ),
+ Caa020 = dto.PLAN_NUM
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
@@ -144,7 +140,6 @@
Lot = dto.FLot,
DepotCode = dto.FStockID,
IssueType = dto.FIssueType,
- Cab008 = dto.F_UNW_Text_tpgy,
Cab009 = dto.FUnitID,
SupplyType = dto.FSupplyType,
Cab012 = !string.IsNullOrEmpty(dto.FStdQty)
diff --git a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
index 134aedd..e173f82 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\Tools\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2024-08-17T02:57:05.6670396Z||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
+ <History>True|2024-08-20T09:12:00.2924570Z||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/MESApplication/appsettings.json b/MESApplication/appsettings.json
index e6f9f02..d3d3f6f 100644
--- a/MESApplication/appsettings.json
+++ b/MESApplication/appsettings.json
@@ -8,8 +8,8 @@
},
"AllowedHosts": "*",
"AppSettings": {
- "TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
- "ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
+ "TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfo",
+ "ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfo",
"DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_prd; Password=xmprd"
}
}
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index ec453be..10f8cd2 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index 79b9937..8ebd739 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index 06283fc..9ae27a1 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index 9de805b..030469c 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index 567b365..9a26650 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.xml b/MESApplication/bin/Debug/net8.0/MESApplication.xml
index 6289586..57c4b2f 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.xml
@@ -6,26 +6,26 @@
<members>
<member name="T:MESApplication.Controllers.Base.LoginController">
<summary>
- 鐢ㄦ埛
+ 鐢ㄦ埛
</summary>
</member>
<member name="M:MESApplication.Controllers.Base.LoginController.login(MES.Service.Dto.base.LoginModel)">
<summary>
- 鐧诲綍
+ 鐧诲綍
</summary>
<param name="model"></param>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.Base.LoginController.resetPassword(Newtonsoft.Json.Linq.JObject)">
<summary>
- 閲嶈瀵嗙爜
+ 閲嶈瀵嗙爜
</summary>
<param name="data"></param>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.Base.LoginController.getUserMenu(Newtonsoft.Json.Linq.JObject)">
<summary>
- 鐢ㄦ埛鑿滃崟
+ 鐢ㄦ埛鑿滃崟
</summary>
<param name="data"></param>
<returns></returns>
@@ -747,6 +747,17 @@
<member name="M:MESApplication.Controllers.QC.MesLineUserController.Update(MES.Service.Modes.MesLineUser)">
<summary>
淇敼
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.QC.XJController.getDaa001(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ 鑾峰彇宸ュ崟
+ </summary>
+ </member>
+ <member name="M:MESApplication.Controllers.QC.XJController.getBoardItem(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ 鏍规嵁浜х嚎鑾峰彇鐗╂枡缂栫爜 lineNo
</summary>
<returns></returns>
</member>
@@ -1472,22 +1483,29 @@
</member>
<member name="T:MESApplication.ActionFilter">
<summary>
- 鏂规硶杩囨护鍣�
+ 鏂规硶杩囨护鍣�
</summary>
</member>
<member name="P:MESApplication.ActionFilter.LoggerMonitor">
<summary>
- 鐩戞帶鏃ュ織
+ 鐩戞帶鏃ュ織
</summary>
</member>
<member name="P:MESApplication.ActionFilter.LoggerError">
<summary>
- 閿欒鏃ュ織
+ 閿欒鏃ュ織
</summary>
+ </member>
+ <member name="M:MESApplication.ActionFilter.OnActionExecuting(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext)">
+ <summary>
+ 鏂规硶鎵ц鍓�
+ </summary>
+ <param name="context"></param>
+ <exception cref="T:System.NotImplementedException"></exception>
</member>
<member name="M:MESApplication.ActionFilter.CreateRequestLogText(System.String,System.String,System.String,System.String,System.String)">
<summary>
- 鍒涘缓璇锋眰鏃ュ織鏂囨湰
+ 鍒涘缓璇锋眰鏃ュ織鏂囨湰
</summary>
<param name="method"></param>
<param name="controllerName"></param>
@@ -1497,7 +1515,7 @@
</member>
<member name="M:MESApplication.ActionFilter.CreateResponseLogText(System.String,System.String,System.String,System.Object)">
<summary>
- 鍒涘缓鍝嶅簲鏃ュ織鏂囨湰
+ 鍒涘缓鍝嶅簲鏃ュ織鏂囨湰
</summary>
<param name="method"></param>
<param name="controllerName"></param>
@@ -1505,16 +1523,9 @@
<param name="result"></param>
<returns></returns>
</member>
- <member name="M:MESApplication.ActionFilter.OnActionExecuting(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext)">
- <summary>
- 鏂规硶鎵ц鍓�
- </summary>
- <param name="context"></param>
- <exception cref="T:System.NotImplementedException"></exception>
- </member>
<member name="M:MESApplication.ErrorLog.Write(System.String,System.String,System.Exception)">
<summary>
- 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
+ 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
</summary>
<param name="moduleName">妯″潡鍚嶅瓧</param>
<param name="message">閿欒鏂囨湰淇℃伅</param>
@@ -1522,21 +1533,21 @@
</member>
<member name="M:MESApplication.ErrorLog.Write(System.String,System.Exception)">
<summary>
- 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
+ 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
</summary>
<param name="moduleName">妯″潡鍚嶅瓧</param>
<param name="ex">寮傚父</param>
</member>
<member name="M:MESApplication.ErrorLog.Write(System.String)">
<summary>
- 鍐欏叆杩囩▼鏁版嵁鎴栬鏄庡埌鏂囦欢涓紝浠ヤ究璺熻釜
+ 鍐欏叆杩囩▼鏁版嵁鎴栬鏄庡埌鏂囦欢涓紝浠ヤ究璺熻釜
</summary>
<param name="moduleName">妯″潡鍚嶅瓧</param>
<param name="ex">寮傚父</param>
</member>
<member name="M:MESApplication.ErrorLog.LogToFile(System.String,System.String)">
<summary>
- 鏂囨湰鍐欏叆
+ 鏂囨湰鍐欏叆
</summary>
<param name="logMessage"></param>
</member>
diff --git a/MESApplication/bin/Debug/net8.0/log/2024081909.log b/MESApplication/bin/Debug/net8.0/log/2024081909.log
new file mode 100644
index 0000000..245f0ad
--- /dev/null
+++ b/MESApplication/bin/Debug/net8.0/log/2024081909.log
@@ -0,0 +1,3 @@
+2024-08-19 09:27:50:549 鎺ュ彛寮傚父锛歿"InnerException":null,"StackTrace":null,"Source":null,"Sql":null,"Parametres":null,"Message":"涓枃鎻愮ず : 杩炴帴鏁版嵁搴撹繃绋嬩腑鍙戠敓閿欒锛屾鏌ユ湇鍔″櫒鏄惁姝ｅ父杩炴帴瀛楃涓叉槸鍚︽纭紝閿欒淇℃伅锛歄racle Communication: Failed to connect to server or failed to parse connect stringDbType=\"Oracle\";ConfigId=\"\".\r\nEnglish Message : Connection open error . Oracle Communication: Failed to connect to server or failed to parse connect stringDbType=\"Oracle\";ConfigId=\"\" ","Data":{},"HelpLink":null,"HResult":-2146233088}
+2024-08-19 09:27:50:557 寮傚父鎻愮ず淇℃伅锛�"涓枃鎻愮ず : 杩炴帴鏁版嵁搴撹繃绋嬩腑鍙戠敓閿欒锛屾鏌ユ湇鍔″櫒鏄惁姝ｅ父杩炴帴瀛楃涓叉槸鍚︽纭紝閿欒淇℃伅锛歄racle Communication: Failed to connect to server or failed to parse connect stringDbType=\"Oracle\";ConfigId=\"\".\r\nEnglish Message : Connection open error . Oracle Communication: Failed to connect to server or failed to parse connect stringDbType=\"Oracle\";ConfigId=\"\" "
+==================================================================================================================================
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index f6b6dfe..4f74eae 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.pdb b/MESApplication/bin/Release/net8.0/MES.Service.pdb
index fdf27e8..668f6a7 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.dll b/MESApplication/bin/Release/net8.0/MESApplication.dll
index 5b8645b..a7fa172 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.exe b/MESApplication/bin/Release/net8.0/MESApplication.exe
index 9de805b..030469c 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.pdb b/MESApplication/bin/Release/net8.0/MESApplication.pdb
index a916a5f..77021cb 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.xml b/MESApplication/bin/Release/net8.0/MESApplication.xml
index 6289586..57c4b2f 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Release/net8.0/MESApplication.xml
@@ -6,26 +6,26 @@
<members>
<member name="T:MESApplication.Controllers.Base.LoginController">
<summary>
- 鐢ㄦ埛
+ 鐢ㄦ埛
</summary>
</member>
<member name="M:MESApplication.Controllers.Base.LoginController.login(MES.Service.Dto.base.LoginModel)">
<summary>
- 鐧诲綍
+ 鐧诲綍
</summary>
<param name="model"></param>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.Base.LoginController.resetPassword(Newtonsoft.Json.Linq.JObject)">
<summary>
- 閲嶈瀵嗙爜
+ 閲嶈瀵嗙爜
</summary>
<param name="data"></param>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.Base.LoginController.getUserMenu(Newtonsoft.Json.Linq.JObject)">
<summary>
- 鐢ㄦ埛鑿滃崟
+ 鐢ㄦ埛鑿滃崟
</summary>
<param name="data"></param>
<returns></returns>
@@ -747,6 +747,17 @@
<member name="M:MESApplication.Controllers.QC.MesLineUserController.Update(MES.Service.Modes.MesLineUser)">
<summary>
淇敼
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.QC.XJController.getDaa001(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ 鑾峰彇宸ュ崟
+ </summary>
+ </member>
+ <member name="M:MESApplication.Controllers.QC.XJController.getBoardItem(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ 鏍规嵁浜х嚎鑾峰彇鐗╂枡缂栫爜 lineNo
</summary>
<returns></returns>
</member>
@@ -1472,22 +1483,29 @@
</member>
<member name="T:MESApplication.ActionFilter">
<summary>
- 鏂规硶杩囨护鍣�
+ 鏂规硶杩囨护鍣�
</summary>
</member>
<member name="P:MESApplication.ActionFilter.LoggerMonitor">
<summary>
- 鐩戞帶鏃ュ織
+ 鐩戞帶鏃ュ織
</summary>
</member>
<member name="P:MESApplication.ActionFilter.LoggerError">
<summary>
- 閿欒鏃ュ織
+ 閿欒鏃ュ織
</summary>
+ </member>
+ <member name="M:MESApplication.ActionFilter.OnActionExecuting(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext)">
+ <summary>
+ 鏂规硶鎵ц鍓�
+ </summary>
+ <param name="context"></param>
+ <exception cref="T:System.NotImplementedException"></exception>
</member>
<member name="M:MESApplication.ActionFilter.CreateRequestLogText(System.String,System.String,System.String,System.String,System.String)">
<summary>
- 鍒涘缓璇锋眰鏃ュ織鏂囨湰
+ 鍒涘缓璇锋眰鏃ュ織鏂囨湰
</summary>
<param name="method"></param>
<param name="controllerName"></param>
@@ -1497,7 +1515,7 @@
</member>
<member name="M:MESApplication.ActionFilter.CreateResponseLogText(System.String,System.String,System.String,System.Object)">
<summary>
- 鍒涘缓鍝嶅簲鏃ュ織鏂囨湰
+ 鍒涘缓鍝嶅簲鏃ュ織鏂囨湰
</summary>
<param name="method"></param>
<param name="controllerName"></param>
@@ -1505,16 +1523,9 @@
<param name="result"></param>
<returns></returns>
</member>
- <member name="M:MESApplication.ActionFilter.OnActionExecuting(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext)">
- <summary>
- 鏂规硶鎵ц鍓�
- </summary>
- <param name="context"></param>
- <exception cref="T:System.NotImplementedException"></exception>
- </member>
<member name="M:MESApplication.ErrorLog.Write(System.String,System.String,System.Exception)">
<summary>
- 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
+ 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
</summary>
<param name="moduleName">妯″潡鍚嶅瓧</param>
<param name="message">閿欒鏂囨湰淇℃伅</param>
@@ -1522,21 +1533,21 @@
</member>
<member name="M:MESApplication.ErrorLog.Write(System.String,System.Exception)">
<summary>
- 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
+ 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
</summary>
<param name="moduleName">妯″潡鍚嶅瓧</param>
<param name="ex">寮傚父</param>
</member>
<member name="M:MESApplication.ErrorLog.Write(System.String)">
<summary>
- 鍐欏叆杩囩▼鏁版嵁鎴栬鏄庡埌鏂囦欢涓紝浠ヤ究璺熻釜
+ 鍐欏叆杩囩▼鏁版嵁鎴栬鏄庡埌鏂囦欢涓紝浠ヤ究璺熻釜
</summary>
<param name="moduleName">妯″潡鍚嶅瓧</param>
<param name="ex">寮傚父</param>
</member>
<member name="M:MESApplication.ErrorLog.LogToFile(System.String,System.String)">
<summary>
- 鏂囨湰鍐欏叆
+ 鏂囨湰鍐欏叆
</summary>
<param name="logMessage"></param>
</member>
diff --git a/MESApplication/bin/Release/net8.0/appsettings.json b/MESApplication/bin/Release/net8.0/appsettings.json
index e6f9f02..d3d3f6f 100644
--- a/MESApplication/bin/Release/net8.0/appsettings.json
+++ b/MESApplication/bin/Release/net8.0/appsettings.json
@@ -8,8 +8,8 @@
},
"AllowedHosts": "*",
"AppSettings": {
- "TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
- "ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
+ "TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfo",
+ "ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfo",
"DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_prd; Password=xmprd"
}
}
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index f6b6dfe..4f74eae 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
index fdf27e8..668f6a7 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
index 5b8645b..a7fa172 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
index 9de805b..030469c 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
index a916a5f..77021cb 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.xml b/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
index 6289586..57c4b2f 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.xml
@@ -6,26 +6,26 @@
<members>
<member name="T:MESApplication.Controllers.Base.LoginController">
<summary>
- 鐢ㄦ埛
+ 鐢ㄦ埛
</summary>
</member>
<member name="M:MESApplication.Controllers.Base.LoginController.login(MES.Service.Dto.base.LoginModel)">
<summary>
- 鐧诲綍
+ 鐧诲綍
</summary>
<param name="model"></param>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.Base.LoginController.resetPassword(Newtonsoft.Json.Linq.JObject)">
<summary>
- 閲嶈瀵嗙爜
+ 閲嶈瀵嗙爜
</summary>
<param name="data"></param>
<returns></returns>
</member>
<member name="M:MESApplication.Controllers.Base.LoginController.getUserMenu(Newtonsoft.Json.Linq.JObject)">
<summary>
- 鐢ㄦ埛鑿滃崟
+ 鐢ㄦ埛鑿滃崟
</summary>
<param name="data"></param>
<returns></returns>
@@ -747,6 +747,17 @@
<member name="M:MESApplication.Controllers.QC.MesLineUserController.Update(MES.Service.Modes.MesLineUser)">
<summary>
淇敼
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.QC.XJController.getDaa001(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ 鑾峰彇宸ュ崟
+ </summary>
+ </member>
+ <member name="M:MESApplication.Controllers.QC.XJController.getBoardItem(Newtonsoft.Json.Linq.JObject)">
+ <summary>
+ 鏍规嵁浜х嚎鑾峰彇鐗╂枡缂栫爜 lineNo
</summary>
<returns></returns>
</member>
@@ -1472,22 +1483,29 @@
</member>
<member name="T:MESApplication.ActionFilter">
<summary>
- 鏂规硶杩囨护鍣�
+ 鏂规硶杩囨护鍣�
</summary>
</member>
<member name="P:MESApplication.ActionFilter.LoggerMonitor">
<summary>
- 鐩戞帶鏃ュ織
+ 鐩戞帶鏃ュ織
</summary>
</member>
<member name="P:MESApplication.ActionFilter.LoggerError">
<summary>
- 閿欒鏃ュ織
+ 閿欒鏃ュ織
</summary>
+ </member>
+ <member name="M:MESApplication.ActionFilter.OnActionExecuting(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext)">
+ <summary>
+ 鏂规硶鎵ц鍓�
+ </summary>
+ <param name="context"></param>
+ <exception cref="T:System.NotImplementedException"></exception>
</member>
<member name="M:MESApplication.ActionFilter.CreateRequestLogText(System.String,System.String,System.String,System.String,System.String)">
<summary>
- 鍒涘缓璇锋眰鏃ュ織鏂囨湰
+ 鍒涘缓璇锋眰鏃ュ織鏂囨湰
</summary>
<param name="method"></param>
<param name="controllerName"></param>
@@ -1497,7 +1515,7 @@
</member>
<member name="M:MESApplication.ActionFilter.CreateResponseLogText(System.String,System.String,System.String,System.Object)">
<summary>
- 鍒涘缓鍝嶅簲鏃ュ織鏂囨湰
+ 鍒涘缓鍝嶅簲鏃ュ織鏂囨湰
</summary>
<param name="method"></param>
<param name="controllerName"></param>
@@ -1505,16 +1523,9 @@
<param name="result"></param>
<returns></returns>
</member>
- <member name="M:MESApplication.ActionFilter.OnActionExecuting(Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext)">
- <summary>
- 鏂规硶鎵ц鍓�
- </summary>
- <param name="context"></param>
- <exception cref="T:System.NotImplementedException"></exception>
- </member>
<member name="M:MESApplication.ErrorLog.Write(System.String,System.String,System.Exception)">
<summary>
- 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
+ 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
</summary>
<param name="moduleName">妯″潡鍚嶅瓧</param>
<param name="message">閿欒鏂囨湰淇℃伅</param>
@@ -1522,21 +1533,21 @@
</member>
<member name="M:MESApplication.ErrorLog.Write(System.String,System.Exception)">
<summary>
- 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
+ 鍐欏叆鎿嶄綔鏃ュ織鍒版枃浠朵腑
</summary>
<param name="moduleName">妯″潡鍚嶅瓧</param>
<param name="ex">寮傚父</param>
</member>
<member name="M:MESApplication.ErrorLog.Write(System.String)">
<summary>
- 鍐欏叆杩囩▼鏁版嵁鎴栬鏄庡埌鏂囦欢涓紝浠ヤ究璺熻釜
+ 鍐欏叆杩囩▼鏁版嵁鎴栬鏄庡埌鏂囦欢涓紝浠ヤ究璺熻釜
</summary>
<param name="moduleName">妯″潡鍚嶅瓧</param>
<param name="ex">寮傚父</param>
</member>
<member name="M:MESApplication.ErrorLog.LogToFile(System.String,System.String)">
<summary>
- 鏂囨湰鍐欏叆
+ 鏂囨湰鍐欏叆
</summary>
<param name="logMessage"></param>
</member>
diff --git a/MESApplication/bin/Release/net8.0/publish/appsettings.json b/MESApplication/bin/Release/net8.0/publish/appsettings.json
index e6f9f02..d3d3f6f 100644
--- a/MESApplication/bin/Release/net8.0/publish/appsettings.json
+++ b/MESApplication/bin/Release/net8.0/publish/appsettings.json
@@ -8,8 +8,8 @@
},
"AllowedHosts": "*",
"AppSettings": {
- "TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
- "ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
+ "TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfo",
+ "ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfo",
"DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_prd; Password=xmprd"
}
}
--
Gitblit v1.9.3