优化

Service/MyTask/SwapOrderSettleAnAccountTask.cs

@@ -83,16 +83,19 @@ public class SwapOrderSettleAnAccountTask : ITask
                 // 电量费用
                 decimal? electricCharge = (upNominalEnergy - downNominalEnergy) * electricityTotalFee;
 
-                var matchingOrder = swapOrderList.FirstOrDefault(order => order.Sn == swapOrderBattery.SwapOrderSn);
+                if (upNominalEnergy != null && downNominalEnergy != null && electricCharge != null)
-                if (matchingOrder != null)
                 {
-                    matchingOrder.ServiceTotalFee = serviceTotalFee;
+                    var matchingOrder = swapOrderList.FirstOrDefault(order => order.Sn == swapOrderBattery.SwapOrderSn);
-                    matchingOrder.ElectricityTotalFee = electricCharge;
+                    if (matchingOrder != null)
-                    matchingOrder.AppendTotalFee = appendTotalFee;
+                    {
-                    matchingOrder.TotalFee = matchingOrder.ServiceTotalFee + matchingOrder.ElectricityTotalFee +
+                        matchingOrder.ServiceTotalFee = serviceTotalFee;
-                                             matchingOrder.AppendTotalFee;
+                        matchingOrder.ElectricityTotalFee = electricCharge;
-                    // 标记换电订单已经算了订单价钱
+                        matchingOrder.AppendTotalFee = appendTotalFee;
-                    swapOrderBattery.SettleAnAccountFlag = 1;
+                        matchingOrder.TotalFee = matchingOrder.ServiceTotalFee + matchingOrder.ElectricityTotalFee +
+                                                 matchingOrder.AppendTotalFee;
+                        // 标记换电订单已经算了订单价钱
+                        swapOrderBattery.SettleAnAccountFlag = 1;
+                    }  
                 }
             }
             

WebStarter/Program.cs

@@ -227,6 +227,7 @@ TaskInit.Init();
 var supportedCultures = new List<CultureInfo>
 {
     new CultureInfo("en"),
+    new CultureInfo("id"),
     new CultureInfo("zh")
 };
 

WebStarter/Resources/Controllers.SwapMonitorController.en.resx

@@ -43,48 +43,48 @@
     </resheader>
 
     <data name="0" xml:space="preserve">
-    <value>Masa luang</value>
+    <value>Idel</value>
   </data>
     <data name="1" xml:space="preserve">
-    <value>Kendaraan tiba Radar pintu masuk mendeteksikendaraan masuk</value>
+    <value>RadarInFlag</value>
   </data>
     <data name="2" xml:space="preserve">
-    <value>Deteksi status PLC</value>
+    <value>Plc</value>
   </data>
     <data name="3" xml:space="preserve">
-    <value>Pemindaian RFID selesai</value>
+    <value>RfidReadFlag</value>
   </data>
     <data name="4" xml:space="preserve">
-    <value>Deteksi radar kedua kali</value>
+    <value>Carradar</value>
   </data>
     <data name="5" xml:space="preserve">
-    <value>Kendaraan sampai di lokasi</value>
+    <value>SelectPackSuccess</value>
   </data>
     <data name="6" xml:space="preserve">
-    <value>Pemilihan selesai</value>
+    <value>CarInPositionFlag</value>
   </data>
     <data name="7" xml:space="preserve">
-    <value>Kendaraan membuka kunci</value>
+    <value>VelUnlockFlag</value>
   </data>
     <data name="8" xml:space="preserve">
-    <value>Mengeluarkan pemilihan PLC</value>
+    <value>DistributeSelectPackFlag</value>
   </data>
     <data name="9" xml:space="preserve">
-    <value>Mulai ganti baterai</value>
+    <value>StartSwappingFlag</value>
   </data>
     <data name="10" xml:space="preserve">
-    <value>Pelepasan baterai lama selesai</value>
+    <value>UnOldBatteryFlag</value>
   </data>
     <data name="11" xml:space="preserve">
-    <value>Pemasangan baterai baru selesai</value>
+    <value>InstallNewBatteryFlag</value>
   </data>
     <data name="12" xml:space="preserve">
-    <value>Instalasi selesai</value>
+    <value>FinishNewBatteryFlag</value>
   </data>
     <data name="13" xml:space="preserve">
-    <value>Kendaraan terkunci</value>
+    <value>VelLockFlag</value>
   </data>
     <data name="14" xml:space="preserve">
-    <value>Penggantian baterai selesai ( Kendaraan pergi )</value>
+    <value>RadarOutFlag</value>
   </data>
 </root>

WebStarter/Resources/Controllers.SwapMonitorController.id.Designer.cs

@@ -0,0 +1,197 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WebStarter.Resources {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Controllers_SwapMonitorController_id {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Controllers_SwapMonitorController_id() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WebStarter.Resources.Controllers.SwapMonitorController.id", typeof(Controllers_SwapMonitorController_id).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Masa luang.
+        /// </summary>
+        internal static string _0 {
+            get {
+                return ResourceManager.GetString("0", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kendaraan tiba Radar pintu masuk mendeteksikendaraan masuk.
+        /// </summary>
+        internal static string _1 {
+            get {
+                return ResourceManager.GetString("1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Pelepasan baterai lama selesai.
+        /// </summary>
+        internal static string _10 {
+            get {
+                return ResourceManager.GetString("10", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Pemasangan baterai baru selesai.
+        /// </summary>
+        internal static string _11 {
+            get {
+                return ResourceManager.GetString("11", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Instalasi selesai.
+        /// </summary>
+        internal static string _12 {
+            get {
+                return ResourceManager.GetString("12", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kendaraan terkunci.
+        /// </summary>
+        internal static string _13 {
+            get {
+                return ResourceManager.GetString("13", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Penggantian baterai selesai ( Kendaraan pergi ).
+        /// </summary>
+        internal static string _14 {
+            get {
+                return ResourceManager.GetString("14", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Deteksi status PLC.
+        /// </summary>
+        internal static string _2 {
+            get {
+                return ResourceManager.GetString("2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Pemindaian RFID selesai.
+        /// </summary>
+        internal static string _3 {
+            get {
+                return ResourceManager.GetString("3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Deteksi radar kedua kali.
+        /// </summary>
+        internal static string _4 {
+            get {
+                return ResourceManager.GetString("4", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kendaraan sampai di lokasi.
+        /// </summary>
+        internal static string _5 {
+            get {
+                return ResourceManager.GetString("5", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Pemilihan selesai.
+        /// </summary>
+        internal static string _6 {
+            get {
+                return ResourceManager.GetString("6", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Kendaraan membuka kunci.
+        /// </summary>
+        internal static string _7 {
+            get {
+                return ResourceManager.GetString("7", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mengeluarkan pemilihan PLC.
+        /// </summary>
+        internal static string _8 {
+            get {
+                return ResourceManager.GetString("8", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Mulai ganti baterai.
+        /// </summary>
+        internal static string _9 {
+            get {
+                return ResourceManager.GetString("9", resourceCulture);
+            }
+        }
+    }
+}

WebStarter/Resources/Controllers.SwapMonitorController.id.resx

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<root>
+    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+        <xsd:element name="root" msdata:IsDataSet="true">
+            
+        </xsd:element>
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    </resheader>
+    <data name="0" xml:space="preserve">
+    <value>Masa luang</value>
+  </data>
+    <data name="1" xml:space="preserve">
+    <value>Kendaraan tiba Radar pintu masuk mendeteksikendaraan masuk</value>
+  </data>
+    <data name="2" xml:space="preserve">
+    <value>Deteksi status PLC</value>
+  </data>
+    <data name="3" xml:space="preserve">
+    <value>Pemindaian RFID selesai</value>
+  </data>
+    <data name="4" xml:space="preserve">
+    <value>Deteksi radar kedua kali</value>
+  </data>
+    <data name="5" xml:space="preserve">
+    <value>Kendaraan sampai di lokasi</value>
+  </data>
+    <data name="6" xml:space="preserve">
+    <value>Pemilihan selesai</value>
+  </data>
+    <data name="7" xml:space="preserve">
+    <value>Kendaraan membuka kunci</value>
+  </data>
+    <data name="8" xml:space="preserve">
+    <value>Mengeluarkan pemilihan PLC</value>
+  </data>
+    <data name="9" xml:space="preserve">
+    <value>Mulai ganti baterai</value>
+  </data>
+    <data name="10" xml:space="preserve">
+    <value>Pelepasan baterai lama selesai</value>
+  </data>
+    <data name="11" xml:space="preserve">
+    <value>Pemasangan baterai baru selesai</value>
+  </data>
+    <data name="12" xml:space="preserve">
+    <value>Instalasi selesai</value>
+  </data>
+    <data name="13" xml:space="preserve">
+    <value>Kendaraan terkunci</value>
+  </data>
+    <data name="14" xml:space="preserve">
+    <value>Penggantian baterai selesai ( Kendaraan pergi )</value>
+  </data>
+</root>