Merge branch 'dev' into 'MA'

Dev

See merge request !505

.gitlab-ci.yml

@@ -90,4 +90,22 @@ release:
   artifacts:
     name: "sPMS-$CI_COMMIT_REF_NAME"
     paths:
-      - "$env:PROJECT_NAME/bin/Release/Publish/"
\ No newline at end of file
+      - "$env:PROJECT_NAME/bin/Release/Publish/"
+
+release-new:
+  stage: release
+  tags: 
+    - release
+  only: 
+    - /v.*-next$/
+  script:
+    - '& echo "Restoring Nuget Packages..."'
+    - '& "$env:NUGET_PATH" restore'
+    - '& "$env:MSBUILD_PATH" /p:Configuration=Release /clp:ErrorsOnly'
+    - '& "$env:MSBUILD_PATH" $env:PROJECT_NAME\$env:PROJECT_NAME.csproj /p:DeployOnBuild=true /p:Configuration=Release /P:PublishProfile=CustomProfile.pubxml'
+    - 'rm .\$env:PROJECT_NAME\bin\Release\Publish\web.config'
+  dependencies: []
+  artifacts:
+    name: "sPMS-$CI_COMMIT_REF_NAME"
+    paths:
+      - "$env:PROJECT_NAME/bin/Release/Publish/"

SYSCore/App_Start/TokenValidateHandler.cs

@@ -123,15 +123,15 @@ namespace SYS_Core
             {
                 //statusCode = HttpStatusCode.Unauthorized;
 
-                response = await base.SendAsync(request, cancellationToken);
                 response.StatusCode = HttpStatusCode.Unauthorized;
+                response = await base.SendAsync(request, cancellationToken);
             }
             catch (Exception ex)
             {
                 //statusCode = HttpStatusCode.InternalServerError;
 
-                response = await base.SendAsync(request, cancellationToken);
                 response.StatusCode = HttpStatusCode.Unauthorized;
+                response = await base.SendAsync(request, cancellationToken);
             }
 
             return response;

SYSCore/Controllers/AccountApiController.cs

@@ -6835,7 +6835,7 @@ namespace SYS_Core.Controllers
                 OracleCommand cmd = new OracleCommand();
                 cmd.CommandText = "SP_NP_SNM017P_SAVE";
                 cmd.Parameters.Add("P_COMPANY_CODE", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_COMPANY_CODE);
-                cmd.Parameters.Add("P_EFFECTIVE_DATE", OracleDbType.Varchar2).Value = pDataList["EFFECTIVE_DATE"].ToString("yyyy-MM-dd");
+                cmd.Parameters.Add("P_EFFECTIVE_DATE", OracleDbType.Date).Value = pDataList["EFFECTIVE_DATE"];
                 cmd.Parameters.Add("P_CUSTOMER_CODE", OracleDbType.Varchar2).Value = pDataList["CUSTOMER_CODE"];
                 cmd.Parameters.Add("P_PART_NO", OracleDbType.Varchar2).Value = pDataList["PART_NO"];
                 cmd.Parameters.Add("P_CURRENCY_CODE", OracleDbType.Varchar2).Value = pDataList["CURRENCY_CODE"];

SYSCore/Views/EmailTemplate/ReceivePartInform.cshtml

@@ -75,12 +75,7 @@
             text-align: left;
         }
 
-        .quantity {
-            width: 75px;
-            text-align: right;
-        }
-
-        .item {
+        .seq, .quantity, .item {
             width: 75px;
             text-align: right;
         }
@@ -95,6 +90,7 @@
             <table id="import">
                 <thead>
                     <tr>
+                        <th class="seq">No.</th>
                         <th class="receiveType">Receive Type</th>
                         <th class="receiveDoc">Receive Document No.</th>
                         <th class="docDate">Document Date</th>
@@ -109,6 +105,7 @@
                     @foreach (DataRow doc in Model.DataImport.Rows)
                     {
                         <tr>
+                            <td class="seq">@doc["SEQ"]</td>
                             <td class="receiveType">@doc["RECEIVE_TYPE"]</td>
                             <td class="receiveDoc">@doc["RECEIVE_DOC_NO"]</td>
                             <td class="docDate">@doc["RECEIVE_DOC_DATE"]</td>
@@ -133,6 +130,7 @@
             <table id="local">
                 <thead>
                     <tr>
+                        <th class="seq">No.</th>
                         <th class="receiveType">Receive Type</th>
                         <th class="receiveDoc">Receive Document No.</th>
                         <th class="docDate">Document Date</th>
@@ -147,6 +145,7 @@
                     @foreach (DataRow doc in Model.DataLocal.Rows)
                     {
                         <tr>
+                            <td class="seq">@doc["SEQ"]</td>
                             <td class="receiveType">@doc["RECEIVE_TYPE"]</td>
                             <td class="receiveDoc">@doc["RECEIVE_DOC_NO"]</td>
                             <td class="docDate">@doc["RECEIVE_DOC_DATE"]</td>