取样费用方法更改

取样并样程序/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);
         }
 
+        /// <summary>
+        /// 获取检验费
+        /// </summary>
+        /// <param name="plate"></param>
+        /// <param name="ORD_save"></param>
+        /// <returns></returns>
+        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> 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<data> doHttpPost(string postDataStr)
         {
             //RequestEntity result = new RequestEntity(); //声明返回参数实体类

取样并样程序/SubResult/SubResult/obj/Debug/SubResult.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-6c28706979d1cb80596039ef40f69d7b2571b4db
+6969e6d8c48e39a0daef9103d8ba54f0509f2a29

取样并样程序/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