diff --git a/Controller/SCP_ASK_CONTROLLER.cs b/Controller/SCP_ASK_CONTROLLER.cs index 06659e0..5ecbb42 100644 --- a/Controller/SCP_ASK_CONTROLLER.cs +++ b/Controller/SCP_ASK_CONTROLLER.cs @@ -90,6 +90,22 @@ namespace CK.SCP.Controller { q = q.Where(p => p_entity.UserInVendIds.Contains(p.VendId)); } + if (!string.IsNullOrEmpty(p_entity.SubSite)) + { + q = q.Where(p => p.SubSite.Contains(p_entity.SubSite)); + } + 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.Extend2.Contains(p_entity.Extend2)); + } + if (!string.IsNullOrEmpty(p_entity.Extend3)) + { + q = q.Where(p => p.Extend3.Contains(p_entity.Extend3)); + } _ret.State = ReturnStatus.Succeed; _ret.Result = q; p_action(_ret); diff --git a/Controller/SCP_ASN_CONTROLLER.cs b/Controller/SCP_ASN_CONTROLLER.cs index af29f9d..a8e8274 100644 --- a/Controller/SCP_ASN_CONTROLLER.cs +++ b/Controller/SCP_ASN_CONTROLLER.cs @@ -156,6 +156,22 @@ namespace CK.SCP.Controller { q = q.Where(p => p_entity.UserInVendIds.Contains(p.VendId)); } + if (!string.IsNullOrEmpty(p_entity.SubSite)) + { + q = q.Where(p => p.SubSite == p_entity.SubSite); + } + if (!string.IsNullOrEmpty(p_entity.Extend1)) + { + q = q.Where(p => p.Extend1 == p_entity.Extend1); + } + if (!string.IsNullOrEmpty(p_entity.Extend2)) + { + q = q.Where(p => p.Extend2 == p_entity.Extend2); + } + if (!string.IsNullOrEmpty(p_entity.Extend3)) + { + q = q.Where(p => p.Extend3 == p_entity.Extend3); + } _ret.State = ReturnStatus.Succeed; _ret.Result = q; p_action(_ret); @@ -178,7 +194,6 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_ASN_CONTROLLER), "Get_V_TB_ASN_List", ex.ToString()); diff --git a/Controller/SCP_PO_CONTROLLER.cs b/Controller/SCP_PO_CONTROLLER.cs index 62d9e8c..a766459 100644 --- a/Controller/SCP_PO_CONTROLLER.cs +++ b/Controller/SCP_PO_CONTROLLER.cs @@ -103,22 +103,24 @@ namespace CK.SCP.Controller { q = q.Where(p => p_entity.UserInVendIds.Contains(p.VendId)); } + + if (!string.IsNullOrEmpty(p_entity.SubSite)) + { + q = q.Where(p => p.SubSite.Contains(p_entity.SubSite)); + } 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)); + q = q.Where(p => p.Extend2.Contains(p_entity.Extend2)); } - if (!string.IsNullOrEmpty(p_entity.Extend1)) + if (!string.IsNullOrEmpty(p_entity.Extend3)) { - 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)); + q = q.Where(p => p.Extend3.Contains(p_entity.Extend3)); } + //if (!string.IsNullOrEmpty(p_entity.PartCode)) //{ // var _po = db.TB_PO_DETAIL.Where(p => p.PartCode == p_entity.PartCode && p.IsDeleted== false); @@ -242,6 +244,7 @@ namespace CK.SCP.Controller if (_detail.PoBillNum == itm.PoBillNum && _detail.PoLine == itm.PoLine && _detail.PartCode == itm.PartCode) { _detail.ReceivedQty = itm.ReceiveSum; + } }); @@ -2119,7 +2122,11 @@ namespace CK.SCP.Controller _t.ReceivedPort = p_order.ReceivedPort; _t.Remark = p_order.Remark; _t.State = (int)AskState.New; - + _t.SubSite = p_order.SubSite; + _t.Extend1 = p_order.Extend1; + _t.Extend2 = p_order.Extend2; + _t.Extend3 = p_order.Extend3; + _t.GUID = Guid.NewGuid(); _t.ModType = (int)p_order.ModType; _t.ErpBillNum = p_order.ErpBillNum; @@ -2157,6 +2164,10 @@ namespace CK.SCP.Controller _tDetail.Price = itm.Price; _tDetail.GUID = Guid.NewGuid(); _tDetail.Currency = itm.Currency; + _tDetail.SubSite = itm.SubSite; + _tDetail.Extend1 = itm.Extend1; + _tDetail.Extend2 = itm.Extend2; + _tDetail.Extend3 = itm.Extend3; db.TB_ASK_DETAIL.Add(_tDetail); var _order_detail = db.TB_PO_DETAIL.Where(p => p.UID == itm.UID).FirstOrDefault(); _order_detail.TempQty = itm.TempQty; @@ -2296,6 +2307,38 @@ namespace CK.SCP.Controller { q = q.Where(p => p_entity.UserInAddress.Contains(p.Site)); } + if (!string.IsNullOrEmpty(p_entity.SubSite)) + { + q = q.Where(p => p.SubSite == p_entity.SubSite); + } + if (!string.IsNullOrEmpty(p_entity.Extend1)) + { + q = q.Where(p => p.Extend1 == p_entity.Extend1); + } + if (!string.IsNullOrEmpty(p_entity.Extend2)) + { + q = q.Where(p => p.Extend1 == p_entity.Extend2); + } + if (!string.IsNullOrEmpty(p_entity.Extend3)) + { + q = q.Where(p => p.Extend1 == p_entity.Extend3); + } + if (!string.IsNullOrEmpty(p_entity.SubSite)) + { + q = q.Where(p => p.SubSite.Contains(p_entity.SubSite)); + } + 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.Extend2.Contains(p_entity.Extend2)); + } + if (!string.IsNullOrEmpty(p_entity.Extend3)) + { + q = q.Where(p => p.Extend3.Contains(p_entity.Extend3)); + } _ret.State = ReturnStatus.Succeed; _ret.Result = q; p_action(_ret); diff --git a/SCP/SCP.csproj b/SCP/SCP.csproj index 27842cf..7013896 100644 --- a/SCP/SCP.csproj +++ b/SCP/SCP.csproj @@ -1,6 +1,5 @@  - @@ -27,8 +26,6 @@ - LaunchBrowser - http://{ServiceIPAddress} true @@ -4499,6 +4496,7 @@ + @@ -4510,7 +4508,9 @@ + + @@ -5524,6 +5524,13 @@ ViewSwitcher.ascx + + SCP_COMPARE.aspx + ASPXCodeBehind + + + SCP_COMPARE.aspx + SCP_INVOICE_VIEW.aspx ASPXCodeBehind @@ -5601,6 +5608,13 @@ SCP_RECEIVE_DETAIL_VIEW.aspx + + SCP_REJECT.aspx + ASPXCodeBehind + + + SCP_REJECT.aspx + SCP_RECEIVE.aspx ASPXCodeBehind @@ -5608,6 +5622,13 @@ SCP_RECEIVE.aspx + + SCP_REJECT_DETAIL.aspx + ASPXCodeBehind + + + SCP_REJECT_DETAIL.aspx + SCP_RECEIVE_DETAIL.aspx ASPXCodeBehind @@ -6146,9 +6167,7 @@ True 62030 / - http://localhost:6789/ - True - http://localhost:6789/ + http://localhost:5678 False False @@ -6164,10 +6183,7 @@ - - -