diff --git a/取样并样程序/SubResult/.vs/SubResult/v17/.suo b/取样并样程序/SubResult/.vs/SubResult/v17/.suo index 9316d02..9e49869 100644 Binary files a/取样并样程序/SubResult/.vs/SubResult/v17/.suo and b/取样并样程序/SubResult/.vs/SubResult/v17/.suo differ diff --git a/取样并样程序/SubResult/SubResult/SurMatSubController.cs b/取样并样程序/SubResult/SubResult/SurMatSubController.cs index e818d31..d306cb8 100644 --- a/取样并样程序/SubResult/SubResult/SurMatSubController.cs +++ b/取样并样程序/SubResult/SubResult/SurMatSubController.cs @@ -944,7 +944,7 @@ namespace ibk.IPD { continue; } - double price = getPrice(plate, ORD_save); + double price = getExperPrice(plate, ORD_save); PDI_SMP_NO pdi = new PDI_SMP_NO(); pdi.TIMESTAMP = GetTimeStamp(); pdi.PLATE_NO = plate.PLATE_NO; @@ -3638,6 +3638,34 @@ namespace ibk.IPD return Math.Round(g_price + p_price, 2); } + /// + /// 获取检验费 + /// + /// + /// + /// + private static double getExperPrice(GP_PLATE plate, BP_ORDER_ITEM ORD_save) + { + double g_price = 78;//默认78元检验费,部分取样没有检验费用 + double p_price = 0; + + //取样价格 + if (!string.IsNullOrEmpty(plate.SMP_NO)) + { + List data = doHttpPost(plate.SMP_NO); + if (data.Count > 0) + { + foreach (var ds in data) + { + p_price += Convert.ToDouble(ds.test_charge); + } + } + } + + //最终价格 + return Math.Round(g_price + p_price, 2); + } + public static List doHttpPost(string postDataStr) { //RequestEntity result = new RequestEntity(); //声明返回参数实体类 diff --git a/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.exe b/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.exe index bde0038..a1a7539 100644 Binary files a/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.exe and b/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.exe differ diff --git a/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.pdb b/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.pdb index 1b724a2..07e29e6 100644 Binary files a/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.pdb and b/取样并样程序/SubResult/SubResult/bin/Debug/SubResult.pdb differ diff --git a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.AssemblyReference.cache b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.AssemblyReference.cache index a5cfbc8..931b790 100644 Binary files a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.AssemblyReference.cache and b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.AssemblyReference.cache differ diff --git a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.CoreCompileInputs.cache b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.CoreCompileInputs.cache index 0eb19b2..434f68d 100644 --- a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.CoreCompileInputs.cache +++ b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6c28706979d1cb80596039ef40f69d7b2571b4db +6969e6d8c48e39a0daef9103d8ba54f0509f2a29 diff --git a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.FileListAbsolute.txt b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.FileListAbsolute.txt index 7acd300..ee3845c 100644 --- a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.FileListAbsolute.txt +++ b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.FileListAbsolute.txt @@ -232,3 +232,29 @@ D:\_NGProject\ipd-file\SubResult\SubResult\bin\Debug\System.Text.Encodings.Web.d D:\_NGProject\ipd-file\SubResult\SubResult\bin\Debug\System.Text.Json.dll D:\_NGProject\ipd-file\SubResult\SubResult\bin\Debug\System.Threading.Tasks.Extensions.dll D:\_NGProject\ipd-file\SubResult\SubResult\bin\Debug\System.ValueTuple.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\log4net.config +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\SubResult.exe.config +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\SubResult.exe +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\SubResult.pdb +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\Google.OrTools.x86.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\Google.OrTools.x86.pdb +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\Google.Protobuf.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\Newtonsoft.Json.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\RestSharp.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\System.Buffers.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\System.Memory.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\System.Numerics.Vectors.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\System.Text.Encodings.Web.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\System.Text.Json.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\System.Threading.Tasks.Extensions.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\System.ValueTuple.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\bin\Debug\System.Net.Http.Formatting.dll +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\obj\Debug\SubResult.csproj.AssemblyReference.cache +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\obj\Debug\SubResult.csproj.SuggestedBindingRedirects.cache +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\obj\Debug\SubResult.exe.config +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\obj\Debug\SubResult.csproj.CoreCompileInputs.cache +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\obj\Debug\SubResult.csproj.CopyComplete +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\obj\Debug\SubResult.exe +D:\_NG_1\NG_Project\取样并样程序\SubResult\SubResult\obj\Debug\SubResult.pdb diff --git a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.exe b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.exe index bde0038..a1a7539 100644 Binary files a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.exe and b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.exe differ diff --git a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.pdb b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.pdb index 1b724a2..07e29e6 100644 Binary files a/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.pdb and b/取样并样程序/SubResult/SubResult/obj/Debug/SubResult.pdb differ