From 6ed9bbb397968436af2d0080586b6877e7f1c468 Mon Sep 17 00:00:00 2001 From: wbc <2597324127@qq.com> Date: 星期五, 15 八月 2025 14:59:51 +0800 Subject: [PATCH] 字段修改 --- StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb | 0 StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0 StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache | 2 +- StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0 StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll | 0 StandardPda/.vs/MESApplication/DesignTimeBuild/.dtbcache.v2 | 0 StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache | 2 +- StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll | 0 StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll | 0 StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll | 0 StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll | 0 StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.csproj.CoreCompileInputs.cache | 2 +- StandardPda/MESApplication/appsettings.json | 2 +- StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe | 0 StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll | 0 StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe | 0 StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.CoreCompileInputs.cache | 2 +- StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs | 2 +- StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll | 0 StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0 StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.xml | 12 ++++++++++++ StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs | 2 +- StandardPda/MES.Service/service/WomcaaManager.cs | 2 +- StandardPda/MESApplication/bin/Debug/net8.0/appsettings.json | 2 +- StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache | 0 StandardPda/.vs/MESApplication/v17/.suo | 0 StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb | 0 StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll | 0 StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.xml | 12 ++++++++++++ StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll | 0 30 files changed, 33 insertions(+), 9 deletions(-) diff --git a/StandardPda/.vs/MESApplication/DesignTimeBuild/.dtbcache.v2 b/StandardPda/.vs/MESApplication/DesignTimeBuild/.dtbcache.v2 index dbe2c59..53b6098 100644 --- a/StandardPda/.vs/MESApplication/DesignTimeBuild/.dtbcache.v2 +++ b/StandardPda/.vs/MESApplication/DesignTimeBuild/.dtbcache.v2 Binary files differ diff --git a/StandardPda/.vs/MESApplication/v17/.suo b/StandardPda/.vs/MESApplication/v17/.suo index b89f0f7..cbeaded 100644 --- a/StandardPda/.vs/MESApplication/v17/.suo +++ b/StandardPda/.vs/MESApplication/v17/.suo Binary files differ diff --git a/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll b/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll index 761f5e9..3771fa2 100644 --- a/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll +++ b/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.dll Binary files differ diff --git a/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb index 9f7f49d..f8cad7d 100644 --- a/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb +++ b/StandardPda/MES.Service/bin/Debug/net8.0/MES.Service.pdb Binary files differ diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs index e69b683..8041989 100644 --- a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs +++ b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfo.cs @@ -14,7 +14,7 @@ [assembly: System.Reflection.AssemblyCompanyAttribute("MES.Service")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a0af4ada08919008f7daabde7d00577bf7a592f9")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cb2250fb34378d01b3ec34d1009e86c6bfe266df")] [assembly: System.Reflection.AssemblyProductAttribute("MES.Service")] [assembly: System.Reflection.AssemblyTitleAttribute("MES.Service")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache index c9e7ba1..e3a0c39 100644 --- a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache +++ b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.AssemblyInfoInputs.cache @@ -1 +1 @@ -3eb0884e16c473400adffedf0d962b33c67eee9abab549508dfc7b0ae80d8ef1 +58058214ce34ce869ed20de7353e85ff13f987506b17477849e641b31d729ce7 diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.csproj.CoreCompileInputs.cache b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.csproj.CoreCompileInputs.cache index 260c702..3ca9f63 100644 --- a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.csproj.CoreCompileInputs.cache +++ b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -2c743f87daf9b95646da6bab2fbf10b21ea9ea2df10694e5a3d0302113b939d7 +0ef5e5cd72c6f172770aeeedb62740a524d3796371f76144310000e96d1918c4 diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll index 761f5e9..3771fa2 100644 --- a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll +++ b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.dll Binary files differ diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb index 9f7f49d..f8cad7d 100644 --- a/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb +++ b/StandardPda/MES.Service/obj/Debug/net8.0/MES.Service.pdb Binary files differ diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll b/StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll index 7bcd6ee..7ada571 100644 --- a/StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll +++ b/StandardPda/MES.Service/obj/Debug/net8.0/ref/MES.Service.dll Binary files differ diff --git a/StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll b/StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll index 7bcd6ee..7ada571 100644 --- a/StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll +++ b/StandardPda/MES.Service/obj/Debug/net8.0/refint/MES.Service.dll Binary files differ diff --git a/StandardPda/MES.Service/service/WomcaaManager.cs b/StandardPda/MES.Service/service/WomcaaManager.cs index 99d082b..c003010 100644 --- a/StandardPda/MES.Service/service/WomcaaManager.cs +++ b/StandardPda/MES.Service/service/WomcaaManager.cs @@ -290,7 +290,7 @@ if (mesLinkU9 != null) womcab.Cab003 = mesLinkU9.MesId; if (mesLinkU9_TDL != null) womcab.Substituteditem = Convert.ToInt64(mesLinkU9_TDL.MesId); - if (mesLinkU9_xm != null) entity.Project = mesLinkU9_xm.MesId; + if (mesLinkU9_xm != null) womcab.Project = mesLinkU9_xm.MesId; womcabList.Add(womcab); } diff --git a/StandardPda/MESApplication/appsettings.json b/StandardPda/MESApplication/appsettings.json index 4e25802..d83adde 100644 --- a/StandardPda/MESApplication/appsettings.json +++ b/StandardPda/MESApplication/appsettings.json @@ -10,6 +10,6 @@ "AppSettings": { "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo", "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal", - "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.104 )(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xb_dev; Password=xbdev" + "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.104 )(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xb_prd; Password=xbprd" } } diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll b/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll index 761f5e9..3771fa2 100644 --- a/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll +++ b/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.dll Binary files differ diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb index 9f7f49d..f8cad7d 100644 --- a/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb +++ b/StandardPda/MESApplication/bin/Debug/net8.0/MES.Service.pdb Binary files differ diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll index 51e8d80..574efc2 100644 --- a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll +++ b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.dll Binary files differ diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe index 0fce05d..714175e 100644 --- a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe +++ b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.exe Binary files differ diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb index 158824a..25327bf 100644 --- a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb +++ b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.pdb Binary files differ diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.xml b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.xml index 6ca4669..6fd747b 100644 --- a/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.xml +++ b/StandardPda/MESApplication/bin/Debug/net8.0/MESApplication.xml @@ -1001,6 +1001,18 @@ </summary> <returns></returns> </member> + <member name="M:MESApplication.Controllers.Warehouse.womdaaController.GetTickeInfo(MES.Service.Dto.service.CCLoginDto)"> + <summary> + 鏍规嵁浜ф祴鐧诲綍鍙疯幏鍙栦骇绾跨浉鍏冲伐鍗曚俊鎭� + </summary> + <returns></returns> + </member> + <member name="M:MESApplication.Controllers.Warehouse.womdaaController.AddAsnInfo(MES.Service.Dto.service.AsnInfo)"> + <summary> + 瀛樺偍浜ф祴杩囩珯淇℃伅 + </summary> + <returns></returns> + </member> <member name="M:MESApplication.Controllers.WomcaaController.GetList"> <summary> 鑾峰彇鎵�鏈� diff --git a/StandardPda/MESApplication/bin/Debug/net8.0/appsettings.json b/StandardPda/MESApplication/bin/Debug/net8.0/appsettings.json index 4e25802..d83adde 100644 --- a/StandardPda/MESApplication/bin/Debug/net8.0/appsettings.json +++ b/StandardPda/MESApplication/bin/Debug/net8.0/appsettings.json @@ -10,6 +10,6 @@ "AppSettings": { "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo", "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal", - "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.104 )(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xb_dev; Password=xbdev" + "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.104 )(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xb_prd; Password=xbprd" } } diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs index 866e497..ce39fd3 100644 --- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs +++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfo.cs @@ -14,7 +14,7 @@ [assembly: System.Reflection.AssemblyCompanyAttribute("MESApplication")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a0af4ada08919008f7daabde7d00577bf7a592f9")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cb2250fb34378d01b3ec34d1009e86c6bfe266df")] [assembly: System.Reflection.AssemblyProductAttribute("MESApplication")] [assembly: System.Reflection.AssemblyTitleAttribute("MESApplication")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache index 0bdaba9..4ce5514 100644 --- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache +++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.AssemblyInfoInputs.cache @@ -1 +1 @@ -5f1a3df016d9bc87414a72683a734825dae483f5ecef654ee7e47a637dbbdb51 +1d3411fb669e226b37177323a2aba3d5659f461e273cb5a6b5059209d085a0d4 diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache index ecc4b4c..aefe486 100644 --- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache +++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.AssemblyReference.cache Binary files differ diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.CoreCompileInputs.cache b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.CoreCompileInputs.cache index 5a1ea4e..47e3d5e 100644 --- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.CoreCompileInputs.cache +++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -af275c18a7d397c26000548f163a5b95fe13410b191b9e5ec4d3e996d7799886 +d8007f79098466720c5678a00de08a9d6c73f19883e21f639246474c1ae9336f diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll index 51e8d80..574efc2 100644 --- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll +++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.dll Binary files differ diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb index 158824a..25327bf 100644 --- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb +++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.pdb Binary files differ diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.xml b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.xml index 6ca4669..6fd747b 100644 --- a/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.xml +++ b/StandardPda/MESApplication/obj/Debug/net8.0/MESApplication.xml @@ -1001,6 +1001,18 @@ </summary> <returns></returns> </member> + <member name="M:MESApplication.Controllers.Warehouse.womdaaController.GetTickeInfo(MES.Service.Dto.service.CCLoginDto)"> + <summary> + 鏍规嵁浜ф祴鐧诲綍鍙疯幏鍙栦骇绾跨浉鍏冲伐鍗曚俊鎭� + </summary> + <returns></returns> + </member> + <member name="M:MESApplication.Controllers.Warehouse.womdaaController.AddAsnInfo(MES.Service.Dto.service.AsnInfo)"> + <summary> + 瀛樺偍浜ф祴杩囩珯淇℃伅 + </summary> + <returns></returns> + </member> <member name="M:MESApplication.Controllers.WomcaaController.GetList"> <summary> 鑾峰彇鎵�鏈� diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe b/StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe index 0fce05d..714175e 100644 --- a/StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe +++ b/StandardPda/MESApplication/obj/Debug/net8.0/apphost.exe Binary files differ diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll b/StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll index 33f858b..558667b 100644 --- a/StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll +++ b/StandardPda/MESApplication/obj/Debug/net8.0/ref/MESApplication.dll Binary files differ diff --git a/StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll b/StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll index 33f858b..558667b 100644 --- a/StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll +++ b/StandardPda/MESApplication/obj/Debug/net8.0/refint/MESApplication.dll Binary files differ -- Gitblit v1.9.3