Bug fix

src/bnhtrade.ComTypeLib/Stock/Stock.cs

@@ -110,14 +110,13 @@ namespace bnhtrade.ComTypeLib
             returnArray[0] = result.ReconciliationComplete;
             returnArray[1] = result.ProgressMessage;
             returnArray[2] = result.CurrentTransactionId;
-            returnArray[3] = result.CurrentTransactionTypeId;
+            returnArray[3] = result.CurrentTransactionTypeCode;
             returnArray[4] = result.LastItemDateTime;
             returnArray[5] = result.ItemsCompleted;
             returnArray[6] = result.ItemsRemaining;
             return returnArray;
 
             //return returnObject;
-
         }
 
         public void UnReconcileSkuTransaction(ConnectionCredential sqlConnCred, int skuTransactionId)

src/bnhtrade.ComTypeLib/bnhtrade.ComTypeLib.csproj

@@ -26,6 +26,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>SecurityRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

src/bnhtrade.Core/Data/Database/Stock/ReadSkuTransaction.cs

@@ -92,13 +92,13 @@ namespace bnhtrade.Core.Data.Database.Stock
             string sql = @"
                 SELECT tblStockSkuTransaction.StockSkuTransactionID AS SkuTransactionId
 	                ,tblStockSkuTransaction.TransactionDate
-	                ,tblStockSkuTransaction.StockSkuTransactionTypeID AS SkuTransactionTypeId
 	                ,tblStockSkuTransaction.ForeignKey
 	                ,tblStockSkuTransaction.Reference
 	                ,tblStockSkuTransaction.Detail
 	                ,tblStockSkuTransaction.Quantity
                     ,tblStockSkuTransaction.IsProcessed
                     ,tblStockSkuTransaction.StockJournalID AS StockJournalId
+	                ,tblStockSkuTransactionType.TypeCode AS SkuTransactionTypeCode
                     ,tblStockSkuTransactionType.TypeName AS SkuTransactionTypeName
 	                ,tblSku.skuSkuNumber AS SkuNumber
 	                ,tblStockSkuTransaction.SkuID

src/bnhtrade.Core/Logic/Stock/SkuTransactionReconcile.cs

@@ -42,7 +42,7 @@ namespace bnhtrade.Core.Logic.Stock
 
         public int CurrentTransactionId { get; private set; }
 
-        public int CurrentTransactionTypeId { get; private set; }
+        public string CurrentTransactionTypeCode { get; private set; }
 
         public Model.Stock.SkuTransaction CurrentSkuTransaction { get; private set; }
 
@@ -54,7 +54,7 @@ namespace bnhtrade.Core.Logic.Stock
             ProgressMessage = null;
             ReconciliationComplete = false;
             CurrentTransactionId = 0;
-            CurrentTransactionTypeId = 0;
+            CurrentTransactionTypeCode = null;
         }
 
         /// <summary>
@@ -109,7 +109,7 @@ namespace bnhtrade.Core.Logic.Stock
                         // setup return values
                         CurrentSkuTransaction = transList[i];
                         CurrentTransactionId = transList[i].SkuTransactionId;
-                        CurrentTransactionTypeId = transList[i].SkuTransactionType.TypeId;
+                        CurrentTransactionTypeCode = transList[i].SkuTransactionType.TypeCode;
                         LastItemDateTime = transList[i].TransactionDate;
 
                         // load type into variable

src/bnhtrade.Core/Model/Stock/SkuTransaction.cs

@@ -14,7 +14,6 @@ namespace bnhtrade.Core.Model.Stock
         private short? quantity = null;
         private int? stockjournalId = null;
         private int? skuTransactionId = null;
-        private int? skuTransactionTypeId = null;
         private int? foreignKey = null;
         private string skuTransactionTypeCode;
         private Model.Stock.SkuTransactionType skuTransactionType;

src/bnhtrade.Core/Test/COM/COMClassLib.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace bnhtrade.Core.Test.COM
+{
+    class COMClassLib
+    {
+
+    }
+}

src/bnhtrade.Core/bnhtrade.Core.csproj

@@ -166,6 +166,7 @@
     <Compile Include="Model\Stock\SkuTransaction.cs" />
     <Compile Include="Test\Account\Account.cs" />
     <Compile Include="Test\AutoExec.cs" />
+    <Compile Include="Test\COM\COMClassLib.cs" />
     <Compile Include="Test\Export\Export.cs" />
     <Compile Include="Test\Import\AmazonSettlement.cs" />
     <Compile Include="Test\InboundShipmentInfo.cs" />

src/bnhtrade.ScheduledTasks/Program.cs

@@ -289,7 +289,7 @@ namespace bnhtradeScheduledTasks
                             Console.WriteLine("<4>      Test Import");
                             Console.WriteLine("<5>      Test Logic");
                             Console.WriteLine("<6>      Test SKU");
-                            Console.WriteLine("<7>      Test xxxxxxx");
+                            Console.WriteLine("<7>      Test COM Class");
                             Console.WriteLine("<8>      Test xxxxxxx");
                             Console.WriteLine("<9>      Detele Sku Transaction 'n'");
                             Console.WriteLine();
@@ -366,7 +366,14 @@ namespace bnhtradeScheduledTasks
                             {
                                 Console.Clear();
 
-                                Console.WriteLine("Nothing......");
+                                //string conString = ConfigurationManager.ConnectionStrings["bnhtradeDbConnString"].ConnectionString;
+                                //var builder = new SqlConnectionStringBuilder(conString);
+
+                                //var cred = new bnhtrade.ComTypeLib.Credential.ConnectionCredential();
+                                //cred.Password = builder.Password;
+                                //cred.UserId = builder.UserID;
+
+                                //var obj = new bnhtrade.ComTypeLib.Stock().ReconcileStockTransactions(cred);
 
                                 Console.WriteLine("Done");
                                 Console.WriteLine("Complete, press any key to continue...");

src/bnhtrade.ScheduledTasks/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace bnhtrade_Scheduled_Tasks.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -33,5 +33,17 @@ namespace bnhtrade_Scheduled_Tasks.Properties {
                 return ((string)(this["bnhtradeDbConnString"]));
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string bnhtradeDb {
+            get {
+                return ((string)(this["bnhtradeDb"]));
+            }
+            set {
+                this["bnhtradeDb"] = value;
+            }
+        }
     }
 }