diff --git a/Controller/SCP_PO_CONTROLLER.cs b/Controller/SCP_PO_CONTROLLER.cs index 7a23b5c..62d9e8c 100644 --- a/Controller/SCP_PO_CONTROLLER.cs +++ b/Controller/SCP_PO_CONTROLLER.cs @@ -103,7 +103,22 @@ namespace CK.SCP.Controller { q = q.Where(p => p_entity.UserInVendIds.Contains(p.VendId)); } - + if (!string.IsNullOrEmpty(p_entity.Extend1)) + { + q = q.Where(p => p.Extend1.Contains(p_entity.Extend1)); + } + if (!string.IsNullOrEmpty(p_entity.Extend2)) + { + q = q.Where(p => p.Extend1.Contains(p_entity.Extend1)); + } + if (!string.IsNullOrEmpty(p_entity.Extend1)) + { + q = q.Where(p => p.Extend1.Contains(p_entity.Extend1)); + } + if (!string.IsNullOrEmpty(p_entity.SubSite)) + { + q = q.Where(p => p.SubSite.Contains(p_entity.SubSite)); + } //if (!string.IsNullOrEmpty(p_entity.PartCode)) //{ // var _po = db.TB_PO_DETAIL.Where(p => p.PartCode == p_entity.PartCode && p.IsDeleted== false); diff --git a/Models/ScpEntity/TB_ASN_DETAIL.cs b/Models/ScpEntity/TB_ASN_DETAIL.cs index 6e622d4..c541e00 100644 --- a/Models/ScpEntity/TB_ASN_DETAIL.cs +++ b/Models/ScpEntity/TB_ASN_DETAIL.cs @@ -55,7 +55,6 @@ namespace CK.SCP.Models.ScpEntity public string Extend1 { get; set; } public string Extend2 { get; set; } public string Extend3 { get; set; } - public string SubSite { get; set; } } } diff --git a/SCP/SCP.csproj b/SCP/SCP.csproj index 230d03e..f67e90b 100644 --- a/SCP/SCP.csproj +++ b/SCP/SCP.csproj @@ -1,5 +1,6 @@  + @@ -26,6 +27,8 @@ + LaunchBrowser + http://{ServiceIPAddress} true @@ -6297,7 +6300,10 @@ + + +