|
|
@ -375,6 +375,11 @@ namespace DSWeb.MvcShipping.Controllers
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!strSql.ToString().Contains(" A "))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
strSql = strSql.Replace(" A.ACCDATE", " B.ACCDATE");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var jsonRespose = new JsonResponse
|
|
|
|
var jsonRespose = new JsonResponse
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Success = true,
|
|
|
|
Success = true,
|
|
|
@ -628,7 +633,10 @@ namespace DSWeb.MvcShipping.Controllers
|
|
|
|
strSql.Append(" Where " + condition);
|
|
|
|
strSql.Append(" Where " + condition);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!strSql.ToString().Contains(" A "))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
strSql = strSql.Replace(" A.ACCDATE", " B.ACCDATE");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true"))
|
|
|
|
if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true"))
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -812,7 +820,10 @@ namespace DSWeb.MvcShipping.Controllers
|
|
|
|
}
|
|
|
|
}
|
|
|
|
strSql.Append(" Group by B.SALE ");
|
|
|
|
strSql.Append(" Group by B.SALE ");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!strSql.ToString().Contains(" A "))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
strSql = strSql.Replace(" A.ACCDATE", " B.ACCDATE");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true"))
|
|
|
|
if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true"))
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -1007,7 +1018,10 @@ namespace DSWeb.MvcShipping.Controllers
|
|
|
|
}
|
|
|
|
}
|
|
|
|
strSql.Append(" Group by F.CUSTOMERNAME,C.[DESCRIPTION],P.PRMBDR,P.PUSDDR,P.PRMBCR,P.PUSDCR ");
|
|
|
|
strSql.Append(" Group by F.CUSTOMERNAME,C.[DESCRIPTION],P.PRMBDR,P.PUSDDR,P.PRMBCR,P.PUSDCR ");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!strSql.ToString().Contains(" A "))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
strSql = strSql.Replace(" A.ACCDATE", " B.ACCDATE");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true"))
|
|
|
|
if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true"))
|
|
|
|
{
|
|
|
|
{
|
|
|
|