Skip to content
GitLab
Commit b76e73c7 authored by Samart's avatar Samart
Browse files

Merge branch 'dev' into 'MA' 

Dev

See merge request !442
parents d7fbdc46 1a5a8430
dev MA Release TUM-DEV master num-dev revert-1f0a6f85 revert-fc58d1a4 v12.08 v12.07 v12.06 v12.05 v12.04 v12.03 v12.02 v12.01 v11.24 v11.23 v11.22 v11.21QA v11.20QA v11.19QA v11.18 v11.17QA v11.16QA v11.15QA v11.14QA v11.12QA v11.11QA v11.10QA v11.09
4 merge requests!525Dev,!522Ma,!443Ma,!442Dev
Pipeline #1379 canceled with stage
Hide whitespace changes
Inline Side-by-side
Showing
with 93 additions and 18 deletions
+93 -18
SYSCore/Cmdlet/DRG.ps1
+ 19
- 18
View file @ b76e73c7
......@@ -14,12 +14,12 @@ $LogFilename = "$CurrentDateFormat.log"
$LogPath = "Logs/DRG/$LogFilename"
#FTP connection
$ftp = "ftp://10.192.33.36/DRG/"
$user = 'npms'
$pass = '3MS#wpms'
$ftp = "ftp://10.192.32.135/"
$user = 'snaprod'
$pass = 'snaprod'
#Assign token
$ApiToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzc0NvbUNvZGUiOiIwMSIsInNzVXNlcklEIjoiMCIsInNzVXNlck5hbWUiOiJMTF9SdW5EcmFnb24iLCJHZW5lcmF0ZURhdGUiOiI2LzMwLzIwMjEgMTE6MjI6MzYgQU0iLCJzc0lQQWRkcmVzcyI6Ijo6MSIsImlzcyI6Ik5NVCIsImF1ZCI6Ik5NVCJ9.6S8r5KDkt7SgulQCFvLAedTFdAtG9VYlYLIT7OhfsJY"
$ApiToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzc0NvbUNvZGUiOiIwMSIsInNzVXNlcklEIjoiMCIsInNzVXNlck5hbWUiOiJMTF9SdW5EcmFnb24iLCJHZW5lcmF0ZURhdGUiOiI3LzIvMjAyMSA2OjM3OjIxIFBNIiwic3NJUEFkZHJlc3MiOiI6OjEiLCJpc3MiOiJOTVQiLCJhdWQiOiJOTVQifQ.iDOVBaY3BuNffK8BC7NIdiyzxGDfb4WHTHXsQ-ae4n4"
$Token = ConvertTo-SecureString -String $ApiToken -AsPlainText -Force
$Headers = @{Authorization = "Bearer $ApiToken" }
......@@ -69,7 +69,7 @@ function MoveFileToProcessPath ($File, $ProcessPath) {
$source = $folderPath + $file
$destination = "$ProcessPath$file"
#Download method
$webclient = New-Object System.Net.WebClient
$webclient.Credentials = $credentials
......@@ -82,7 +82,7 @@ function MoveFileToProcessPath ($File, $ProcessPath) {
$ftpclient.UseBinary = $true
$ftpclient.UsePassive = $true
$response = [System.Net.FtpWebResponse]$ftpclient.GetResponse()
$response.Close()
$response.Close()
$FileCount++
}
......@@ -115,9 +115,11 @@ function GetProcessLogs () {
Write-Host "***********************************"
}
function ExitFail () {
Stop-Transcript
<#
function ExitAndFail () {
try {
Stop-Transcript | Out-Null
} catch [System.InvalidOperationException] {}
$url = "$HostUrl/api/System/SendEmail/DRGFailed"
$Body = @(
@{
......@@ -126,8 +128,8 @@ function ExitFail () {
}
) | ConvertTo-Json
Invoke-WebRequest -Method Post -Uri $url -ContentType "application/json" -Headers $Headers -UseBasicParsing #-Body $Body
#>
Invoke-WebRequest -Method Post -Uri $url -ContentType "application/json" -Headers $Headers -UseBasicParsing -Body $Body
exit
}
......@@ -139,7 +141,7 @@ function CheckProcessPath () {
if ($Verified -eq 'P' -and $EmptyStatus -eq "Not-Empty") {
Write-Host "Error: `t- Process path is not empty." -InformationAction Continue
ExitFail
ExitAndFail
}
}
......@@ -158,7 +160,7 @@ $BackupPath = (Join-Path -Path $ProcessPath -ChildPath "./Backup")
if ($null -eq $ProcessPath) {
Write-Output "No Dragon process path be configured."
ExitFail
ExitAndFail
}
#Test path
......@@ -175,6 +177,7 @@ $BackupPath = Resolve-Path -Path $BackupPath
Write-Output "Info: FTP path is $ftp"
Write-Output "Info: Process path is $ProcessPath"
#List DRG files from FTP
Write-Output "Info: Getting files from FTP."
$FileCount = MoveFileToProcessPath $File $ProcessPath
......@@ -198,7 +201,7 @@ if ($Verified -eq 'F') {
Write-Output "***********************************"
Write-Output "Error: File list is not completed."
Write-Output "***********************************"
ExitFail
ExitAndFail
}
#Begin readfile process
......@@ -213,7 +216,6 @@ Write-Output "Info: (Step #1) Reading files into TPM_WORKFILE_DRG_..."
try {
$response = Invoke-WebRequest -Method Post -Uri $S1Url -ContentType "application/json" -Headers $Headers -UseBasicParsing -Body $Body
# $response = Invoke-WebRequest -Method Post -Uri $S1Url -ContentType "application/json" -Authentication Bearer -Token $Token -Body $Body
}
finally {
#another features eg. Send an email if error.
......@@ -233,7 +235,6 @@ $S2Url = "$HostUrl/api/Batch/DRG/StartProcess"
Write-Output "Info: (Step #2) Begin Dragon process job."
try {
$response = Invoke-WebRequest -Method Post -Uri $S2Url -ContentType "application/json" -Headers $Headers -UseBasicParsing
# $response = Invoke-WebRequest -Method Post -Uri $S2Url -ContentType "application/json" -Authentication Bearer -Token $Token
}
finally {
#another features eg. Send an email if error.
......@@ -279,10 +280,10 @@ Stop-Transcript
if ($ProcessStatus -eq "Fail") {
ExitFail
ExitAndFail
}
else {
$url = "$HostUrl/api/System/SendEmail/DRGPassed"
#Invoke-WebRequest -Method Post -Uri $url -ContentType "application/json" -Headers $Headers -UseBasicParsing
Invoke-WebRequest -Method Post -Uri $url -ContentType "application/json" -Headers $Headers -UseBasicParsing
}
\ No newline at end of file
SYSCore/Controllers/SalesController.cs
+ 74
- 0
View file @ b76e73c7
......@@ -12685,6 +12685,7 @@ namespace SYS_Core.Controllers
cmd.Parameters.Add("P_PART_NO", OracleDbType.Varchar2).Value = PartCode != "null" ? PartCode : "";
cmd.Parameters.Add("P_REF_DOC_TYPE", OracleDbType.Varchar2).Value = pData.REF_DOC_TYPE != null ? pData.REF_DOC_TYPE : null;
cmd.Parameters.Add("P_REF_DOC_NO", OracleDbType.Varchar2).Value = pData.REF_DOC_NO != null ? pData.REF_DOC_NO : null;
cmd.Parameters.Add("P_SHOW_RECORD", OracleDbType.Int16).Value = noofshowrec;
cmd.Parameters.Add("C_RETURN", OracleDbType.RefCursor).Direction = ParameterDirection.Output;
ds = oOracledb.SqlQueryDS_CMD(cmd);
return Json(DTFM.convertToList(ds));
......@@ -15103,6 +15104,31 @@ namespace SYS_Core.Controllers
return ResponseMessage(Request.CreateResponse(HttpStatusCode.InternalServerError, ex.Message));
}
}
[HttpPost, Route("SNSE063A4_GetVatRate")]
[Authorize]
public IHttpActionResult SNSE063A4_GetVatRate([FromBody] dynamic pParams)
{
DataSet ds = new DataSet();
try
{
OracleCommand cmd = new OracleCommand();
cmd.CommandText = "SP_NP_SNSE063_A4_FIND_VAT_RATE";
cmd.Parameters.Add("P_COMPANY_CODE", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_COMPANY_CODE);
cmd.Parameters.Add("P_VAT_FLAG", OracleDbType.Varchar2).Value = pParams.VAT_FLAG;
cmd.Parameters.Add("P_DOCUMENT_DATE", OracleDbType.Date).Value = pParams.ORDER_DATE;
cmd.Parameters.Add("C_RETURN", OracleDbType.RefCursor).Direction = ParameterDirection.Output;
ds = oOracledb.SqlQueryDS_CMD(cmd);
return Json(DTFM.convertToList(ds));
}
catch (Exception ex)
{
oOracledb.WriteLog("ErrorHandle", ex.Message, "SNSE063A4_GetVatRate");
return ResponseMessage(Request.CreateResponse(HttpStatusCode.InternalServerError, ex.Message));
}
}
#endregion
 
#region SNSE206
......@@ -15336,6 +15362,29 @@ namespace SYS_Core.Controllers
return ResponseMessage(Request.CreateResponse(HttpStatusCode.InternalServerError, ex.Message));
}
}
[HttpGet, Route("SNSE042NA4_GetInitData")]
[Authorize]
public IHttpActionResult SNSE042NA4_GetInitData()
{
DataSet ds = new DataSet();
try
{
OracleCommand cmd = new OracleCommand();
cmd.CommandText = "SP_NP_SNSE042NA4_GET_DATA";
cmd.Parameters.Add("P_COMPANY_CODE", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_COMPANY_CODE);
cmd.Parameters.Add("C_RETURN", OracleDbType.RefCursor).Direction = ParameterDirection.Output;
ds = oOracledb.SqlQueryDS_CMD(cmd);
return Json(DTFM.convertToList(ds));
}
catch (Exception ex)
{
oOracledb.WriteLog("ErrorHandle", ex.Message, "SNSE042NA4_GetInitData");
return ResponseMessage(Request.CreateResponse(HttpStatusCode.InternalServerError, ex.Message));
}
}
#endregion
 
#region SNSQ026_001
......@@ -18958,6 +19007,31 @@ namespace SYS_Core.Controllers
}
}
 
[HttpPost, Route("SNSE204_S_GetPartList")]
[Authorize]
public IHttpActionResult SNSE204_S_GetPartList([FromBody] dynamic pParams)
{
try
{
OracleCommand cmd = new OracleCommand();
cmd.CommandText = "PK_NP_SNSE204_S.GET_PART_LIST";
cmd.Parameters.Add("P_COMPANY_CODE", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_COMPANY_CODE);
cmd.Parameters.Add("P_CUSTOMER_CODE", OracleDbType.Varchar2).Value = pParams["CUSTOMER_CODE"];
cmd.Parameters.Add("P_BRANCH_CODE", OracleDbType.Varchar2).Value = pParams["BRANCH_CODE"];
cmd.Parameters.Add("P_ORDER_NO", OracleDbType.Varchar2).Value = pParams["ORDER_NO"];
cmd.Parameters.Add("C_RETURN", OracleDbType.RefCursor).Direction = ParameterDirection.Output;
DataSet ds = oOracledb.SqlQueryDS_CMD(cmd);
return Json(DTFM.convertToList(ds));
}
catch (Exception ex)
{
oOracledb.WriteLog("ErrorHandle", ex.Message, "SNSE204_S_GetPartList");
return ResponseMessage(Request.CreateResponse(HttpStatusCode.InternalServerError, ex.Message));
}
}
[HttpPost, Route("SNSE204_S_GetPart/{partName}/{noofshowrec}")]
[Authorize]
public IHttpActionResult SNSE204_S_GetPart(string partName, int noofshowrec, [FromBody] dynamic pData)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment