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

Merge branch 'MA' of http://13.250.46.92:8081/smgo/pms-server into MA

parents e6a56e7f 3bb80a61
MA v12.08 v12.06 v12.05 v12.04 v12.03 v12.02 v12.01
No related merge requests found
Pipeline #2829 passed with stage
in 1 minute and 5 seconds
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1713 additions and 298 deletions
+1713 -298
SYSCore/Controllers/HandheldController.cs
+ 570
- 105
View file @ 56878437
This diff is collapsed.
SYSCore/Controllers/SalesController.cs
+ 158
- 5
View file @ 56878437
......@@ -5181,7 +5181,7 @@ namespace SYS_Core.Controllers
cmd.Parameters.Add("P_CUSTOMER_CODE", OracleDbType.Varchar2).Value = data.CUSTOMER_CODE;
cmd.Parameters.Add("P_BRANCH_CODE", OracleDbType.Varchar2).Value = data.BRANCH_CODE;
cmd.Parameters.Add("P_ORDER_CLASS", OracleDbType.Varchar2).Value = data.ORDER_CLASS;
cmd.Parameters.Add("P_ORDER_NO", OracleDbType.Varchar2).Value = data.ORDER_NO.ToUpper();
cmd.Parameters.Add("P_ORDER_NO", OracleDbType.Varchar2).Value = data.ORDER_NO.ToString().ToUpper();
cmd.Parameters.Add("P_BO_FLAG", OracleDbType.Varchar2).Value = data.BO_FLAG;
cmd.Parameters.Add("P_DELIVERY_CODE", OracleDbType.Varchar2).Value = data.DELIVERY_CODE;
cmd.Parameters.Add("P_ITEM_NO", OracleDbType.Varchar2).Value = data.ITEM_NO;
......@@ -10408,11 +10408,22 @@ namespace SYS_Core.Controllers
[RunBatchGuard]
public IHttpActionResult SNSE015_AllocateOrder([FromBody] dynamic pParam)
{
DataSet ds = new DataSet();
 
try
{
OracleCommand cmd = new OracleCommand();
cmd = new OracleCommand();
cmd.CommandText = "SP_NP_SNSE015_N_LOCK_ORDER";
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 = pParam.CUSTOMER_CODE;
cmd.Parameters.Add("P_ORDER_NO", OracleDbType.Varchar2).Value = pParam.ORDER_NO;
cmd.Parameters.Add("P_ORDER_CLASS", OracleDbType.Varchar2).Value = pParam.ORDER_CLASS;
cmd.Parameters.Add("P_LOCK_STATUS", OracleDbType.Varchar2).Value = "Y";
cmd.Parameters.Add("P_USER", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_USER_NAME);
oOracledb.SqlExecute_CMD(cmd);
cmd = new OracleCommand();
cmd.CommandText = "SP_NP_SNSE015_N_ALLOCATE";
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 = pParam.CUSTOMER_CODE;
......@@ -10422,17 +10433,153 @@ namespace SYS_Core.Controllers
cmd.Parameters.Add("P_LAST_UPD_PGM", OracleDbType.Varchar2).Value = "SNSE015_N";
cmd.Parameters.Add("C_RETURN", OracleDbType.RefCursor).Direction = ParameterDirection.Output;
 
ds = oOracledb.SqlQueryDS_CMD(cmd);
return Json(DTFM.convertToList(ds));
DataSet ds = oOracledb.SqlQueryDS_CMD(cmd);
DataTable dt = ds.Tables[0];
string status = dt.Rows[0]["STATUS"].ToString();
string message = dt.Rows[0]["MESSAGE"].ToString();
return Json(new { STATUS = status, MESSAGE = message });
}
catch (OracleException ex)
{
OracleCommand cmd = new OracleCommand();
cmd.CommandText = "SP_NP_SNSE015_N_LOCK_ORDER";
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 = pParam.CUSTOMER_CODE;
cmd.Parameters.Add("P_ORDER_NO", OracleDbType.Varchar2).Value = pParam.ORDER_NO;
cmd.Parameters.Add("P_ORDER_CLASS", OracleDbType.Varchar2).Value = pParam.ORDER_CLASS;
cmd.Parameters.Add("P_LOCK_STATUS", OracleDbType.Varchar2).Value = "N";
cmd.Parameters.Add("P_USER", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_USER_NAME);
oOracledb.SqlExecute_CMD(cmd);
if (ex.Number == 20003)
{
return Json(new { STATUS = "FAIL", MESSAGE = "This order is in another process, please try again later." });
}
else
{
string errorMessage = oOracledb.GetErrorMessage(ex);
return Json(new { STATUS = "FAIL", MESSAGE = errorMessage });
}
}
catch (Exception ex)
{
OracleCommand cmd = new OracleCommand();
cmd.CommandText = "SP_NP_SNSE015_N_LOCK_ORDER";
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 = pParam.CUSTOMER_CODE;
cmd.Parameters.Add("P_ORDER_NO", OracleDbType.Varchar2).Value = pParam.ORDER_NO;
cmd.Parameters.Add("P_ORDER_CLASS", OracleDbType.Varchar2).Value = pParam.ORDER_CLASS;
cmd.Parameters.Add("P_LOCK_STATUS", OracleDbType.Varchar2).Value = "N";
cmd.Parameters.Add("P_USER", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_USER_NAME);
oOracledb.SqlExecute_CMD(cmd);
oOracledb.WriteLog("ErrorHandle", ex.Message, "SNSE015_AllocateOrder");
return ResponseMessage(Request.CreateResponse(HttpStatusCode.InternalServerError, ex.Message));
}
 
 
}
[HttpPost, Route("SNSE015_AllocateOrderByPart")]
[Authorize]
[RunBatchGuard]
public IHttpActionResult SNSE015_AllocateOrderByPart([FromBody] dynamic pParam)
{
try
{
OracleCommand cmd = new OracleCommand();
List<dynamic> list = new List<dynamic>(pParam.PartsSelected);
cmd = new OracleCommand();
cmd.CommandText = "SP_NP_SNSE015_N_LOCK_ORDER";
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 = pParam.CUSTOMER_CODE;
cmd.Parameters.Add("P_ORDER_NO", OracleDbType.Varchar2).Value = pParam.ORDER_NO;
cmd.Parameters.Add("P_ORDER_CLASS", OracleDbType.Varchar2).Value = pParam.ORDER_CLASS;
cmd.Parameters.Add("P_LOCK_STATUS", OracleDbType.Varchar2).Value = "Y";
cmd.Parameters.Add("P_USER", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_USER_NAME);
oOracledb.SqlExecute_CMD(cmd);
cmd = new OracleCommand();
cmd.CommandText = "SP_NP_SNSE015_N_PARTS_LIST_DELETE_TEMP";
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 = pParam.CUSTOMER_CODE;
cmd.Parameters.Add("P_ORDER_NO", OracleDbType.Varchar2).Value = pParam.ORDER_NO;
cmd.Parameters.Add("P_ORDER_CLASS", OracleDbType.Varchar2).Value = pParam.ORDER_CLASS;
cmd.Parameters.Add("P_USER", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_USER_NAME);
oOracledb.SqlExecute_CMD(cmd);
foreach (var data in list)
{
cmd = new OracleCommand();
cmd.CommandText = "SP_NP_SNSE015_N_PARTS_LIST_INSERT_TEMP";
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 = pParam.CUSTOMER_CODE;
cmd.Parameters.Add("P_BRANCH_CODE", OracleDbType.Varchar2).Value = pParam.BRANCH_CODE;
cmd.Parameters.Add("P_ORDER_CLASS", OracleDbType.Varchar2).Value = pParam.ORDER_CLASS;
cmd.Parameters.Add("P_ORDER_DATE", OracleDbType.Date).Value = pParam.ORDER_DATE;
cmd.Parameters.Add("P_ORDER_NO", OracleDbType.Varchar2).Value = pParam.ORDER_NO;
cmd.Parameters.Add("P_ORDER_PART_NO", OracleDbType.Varchar2).Value = data.ORDER_PART_NO;
cmd.Parameters.Add("P_ITEM_NO", OracleDbType.Varchar2).Value = data.ITEM_NO;
cmd.Parameters.Add("P_SUB_ITEM_NO", OracleDbType.Varchar2).Value = data.SUB_ITEM_NO;
cmd.Parameters.Add("P_USER", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_USER_NAME);
oOracledb.SqlExecute_CMD(cmd);
}
cmd = new OracleCommand();
cmd.CommandText = "SP_NP_SNSE015_N_ALLOCATE_BYPART";
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 = pParam.CUSTOMER_CODE;
cmd.Parameters.Add("P_ORDER_NO", OracleDbType.Varchar2).Value = pParam.ORDER_NO;
cmd.Parameters.Add("P_ORDER_CLASS", OracleDbType.Varchar2).Value = pParam.ORDER_CLASS;
cmd.Parameters.Add("P_LAST_UPD_BY", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_USER_NAME);
cmd.Parameters.Add("P_LAST_UPD_PGM", OracleDbType.Varchar2).Value = "SNSE015_N";
cmd.Parameters.Add("C_RE", OracleDbType.RefCursor).Direction = ParameterDirection.Output;
DataSet ds = oOracledb.SqlQueryDS_CMD(cmd);
DataTable dt = ds.Tables[0];
string status = dt.Rows[0]["STATUS"].ToString();
string message = dt.Rows[0]["MESSAGE"].ToString();
return Json(new { STATUS = status, MESSAGE = message });
}
catch (OracleException ex)
{
OracleCommand cmd = new OracleCommand();
cmd.CommandText = "SP_NP_SNSE015_N_LOCK_ORDER";
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 = pParam.CUSTOMER_CODE;
cmd.Parameters.Add("P_ORDER_NO", OracleDbType.Varchar2).Value = pParam.ORDER_NO;
cmd.Parameters.Add("P_ORDER_CLASS", OracleDbType.Varchar2).Value = pParam.ORDER_CLASS;
cmd.Parameters.Add("P_LOCK_STATUS", OracleDbType.Varchar2).Value = "N";
cmd.Parameters.Add("P_USER", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_USER_NAME);
oOracledb.SqlExecute_CMD(cmd);
if (ex.Number == 20003)
{
return Json(new { STATUS = "FAIL", MESSAGE = "This order is in another process, please wait 2-3 miniutes and research then try again." });
}
else
{
string errorMessage = oOracledb.GetErrorMessage(ex);
return Json(new { STATUS = "FAIL", MESSAGE = errorMessage });
}
}
catch (Exception ex)
{
OracleCommand cmd = new OracleCommand();
cmd.CommandText = "SP_NP_SNSE015_N_LOCK_ORDER";
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 = pParam.CUSTOMER_CODE;
cmd.Parameters.Add("P_ORDER_NO", OracleDbType.Varchar2).Value = pParam.ORDER_NO;
cmd.Parameters.Add("P_ORDER_CLASS", OracleDbType.Varchar2).Value = pParam.ORDER_CLASS;
cmd.Parameters.Add("P_LOCK_STATUS", OracleDbType.Varchar2).Value = "N";
cmd.Parameters.Add("P_USER", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_USER_NAME);
oOracledb.SqlExecute_CMD(cmd);
oOracledb.WriteLog("ErrorHandle", ex.Message, "SNSE015_AllocateOrderByPart");
return ResponseMessage(Request.CreateResponse(HttpStatusCode.InternalServerError, ex.Message));
}
}
#endregion
 
......@@ -10897,6 +11044,9 @@ namespace SYS_Core.Controllers
 
cmd.Parameters.Add("P_GROSS_WEIGHT", OracleDbType.Varchar2).Value = data.GROSS_WEIGHT;
cmd.Parameters.Add("P_GROSS_MM", OracleDbType.Varchar2).Value = data.GROSS_MM;
cmd.Parameters.Add("P_CASE_WIDTH", OracleDbType.Varchar2).Value = data.CASE_WIDTH;
cmd.Parameters.Add("P_CASE_DEPTH", OracleDbType.Varchar2).Value = data.CASE_DEPTH;
cmd.Parameters.Add("P_CASE_HEIGHT", OracleDbType.Varchar2).Value = data.CASE_HEIGHT;
cmd.Parameters.Add("P_LAST_UPD_PGM", OracleDbType.Varchar2).Value = "SNSE031";
cmd.Parameters.Add("P_LAST_UPD_BY", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_USER_NAME);
cmd.Parameters.Add("C_RETURN", OracleDbType.RefCursor).Direction = ParameterDirection.Output;
......@@ -25018,6 +25168,7 @@ namespace SYS_Core.Controllers
cmd.Parameters.Add("P_CUSTOMER_GROUP_CODE", OracleDbType.Varchar2).Value = pParams.CUSTOMER_GROUP_CODE;
cmd.Parameters.Add("P_CUSTOMER_GROUP_NAME", OracleDbType.Varchar2).Value = pParams.CUSTOMER_GROUP_NAME;
cmd.Parameters.Add("P_CUSTOMER_CODE", OracleDbType.Varchar2).Value = pParams.CUSTOMER_CODE;
cmd.Parameters.Add("P_ORDER_TYPE", OracleDbType.Varchar2).Value = pParams.ORDER_TYPE;
cmd.Parameters.Add("P_SYSTEM_USER", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_USER_NAME);
cmd.Parameters.Add("P_LAST_UPD_PGM", OracleDbType.Varchar2).Value = "SNM168";
cmd.Parameters.Add("C_RETURN", OracleDbType.RefCursor).Direction = ParameterDirection.Output;
......@@ -25046,6 +25197,7 @@ namespace SYS_Core.Controllers
cmd.Parameters.Add("P_CUSTOMER_GROUP_CODE_OLD", OracleDbType.Varchar2).Value = pParams.CUSTOMER_GROUP_CODE_OLD;
cmd.Parameters.Add("P_CUSTOMER_GROUP_NAME", OracleDbType.Varchar2).Value = pParams.CUSTOMER_GROUP_NAME;
cmd.Parameters.Add("P_CUSTOMER_CODE", OracleDbType.Varchar2).Value = pParams.CUSTOMER_CODE;
cmd.Parameters.Add("P_ORDER_TYPE", OracleDbType.Varchar2).Value = pParams.ORDER_TYPE;
cmd.Parameters.Add("P_SYSTEM_USER", OracleDbType.Varchar2).Value = DataService.GetIdentity(User, Cons.SS_USER_NAME);
cmd.Parameters.Add("P_LAST_UPD_PGM", OracleDbType.Varchar2).Value = "SNM168";
cmd.Parameters.Add("C_RETURN", OracleDbType.RefCursor).Direction = ParameterDirection.Output;
......@@ -25241,6 +25393,7 @@ namespace SYS_Core.Controllers
cmd.CommandText = "SP_NP_SNSE225_GET_DATA_MASTER_CUSTOMER_GROUP";
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 = param.CUSTOMER_CODE;
cmd.Parameters.Add("P_ORDER_TYPE", OracleDbType.Varchar2).Value = param.ORDER_TYPE;
cmd.Parameters.Add("C_RETURN", OracleDbType.RefCursor).Direction = ParameterDirection.Output;
ds = oOracledb.SqlQueryDS_CMD(cmd);
return Json(DTFM.convertToList(ds));
SYSCore/Controllers/WarehouseApiController.cs
+ 985
- 188
View file @ 56878437
This diff is collapsed.
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