From 4054645063b36553e934141b234bf0fc5daa31fc Mon Sep 17 00:00:00 2001 From: qian Date: Wed, 28 Feb 2024 13:53:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E7=9C=8B=E6=9D=BF=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 北京北汽/Controller/SCP_ASK_CONTROLLER.cs | 14 +- .../Controller/SCP_CONTRACT_CONTROLLER.cs | 166 +++++++++++++----- .../SCP/Views/PlanData/SCP_ASK_DETAIL.aspx | 10 +- .../SCP/Views/PlanData/SCP_ASK_DETAIL.aspx.cs | 42 +++-- .../Views/SupplierData/SCP_ASN_CREATE.aspx | 10 +- .../Views/SupplierData/SCP_ASN_CREATE.aspx.cs | 2 +- 6 files changed, 168 insertions(+), 76 deletions(-) diff --git a/北京北汽/Controller/SCP_ASK_CONTROLLER.cs b/北京北汽/Controller/SCP_ASK_CONTROLLER.cs index 2b06b77..7adf117 100644 --- a/北京北汽/Controller/SCP_ASK_CONTROLLER.cs +++ b/北京北汽/Controller/SCP_ASK_CONTROLLER.cs @@ -1541,19 +1541,19 @@ namespace CK.SCP.Controller // { // list.AddRange(list1); // } - + //} //list = db.V_TB_ASN_DETAIL.Where(p => p.IsDeleted == false && detail.AskBillNum == p.AskBillNum).ToList(); - - - + var asklist = p_list.Select(q => q.AskBillNum).ToList(); + var asnlist = db.V_TB_ASN_DETAIL.Where(p => p.IsDeleted == false && asklist.Contains( p.AskBillNum)).ToList(); + var arrlist = db.TB_ARRIVE_DETAIL.Where(pl => asklist.Contains(pl.Remark) && pl.IsDeleted == false && pl.State == (int)ArriveState.OK && pl.Qty < 0 && pl.BillType == 3).ToList(); p_list.ForEach(itm => { - var list = db.V_TB_ASN_DETAIL.Where(p => p.IsDeleted == false && itm.AskBillNum == p.AskBillNum).ToList(); - var groupList = list.GroupBy(p => new { p.PoBillNum, p.PoLine, p.PartCode, p.AskBillNum }).Select( + //var list = db.V_TB_ASN_DETAIL.Where(p => p.IsDeleted == false && itm.AskBillNum == p.AskBillNum).ToList(); + var groupList = asnlist.Where(q=>q.AskBillNum == itm.AskBillNum).GroupBy(p => new { p.PoBillNum, p.PoLine, p.PartCode, p.AskBillNum }).Select( p => new { ShipSum = p.Sum(itm2 => itm2.Qty), @@ -1569,7 +1569,7 @@ namespace CK.SCP.Controller itm.ShippedQty = p.ShipSum; } }); - var list_back = db.TB_ARRIVE_DETAIL.Where(p => p.Remark == itm.AskBillNum && p.IsDeleted == false && p.State == (int)ArriveState.OK && p.Qty < 0 && p.BillType == 3).GroupBy(p => new { p.Remark, p.PoLine, p.PartCode, p.PoBillNum }).Select(p => new { BackSum = p.Sum(itm1 => itm1.Qty), PoLine = p.Key.PoLine, Remark = p.Key.Remark, PartCode = p.Key.PartCode, PoBillNum = p.Key.PoBillNum }).ToList(); + var list_back = arrlist.Where(q=>q.Remark == itm.AskBillNum).GroupBy(p => new { p.Remark, p.PoLine, p.PartCode, p.PoBillNum }).Select(p => new { BackSum = p.Sum(itm1 => itm1.Qty), PoLine = p.Key.PoLine, Remark = p.Key.Remark, PartCode = p.Key.PartCode, PoBillNum = p.Key.PoBillNum }).ToList(); list_back.ForEach(p => { diff --git a/北京北汽/Controller/SCP_CONTRACT_CONTROLLER.cs b/北京北汽/Controller/SCP_CONTRACT_CONTROLLER.cs index 4c30924..77338b1 100644 --- a/北京北汽/Controller/SCP_CONTRACT_CONTROLLER.cs +++ b/北京北汽/Controller/SCP_CONTRACT_CONTROLLER.cs @@ -18,8 +18,8 @@ namespace CK.SCP.Controller public class SCP_CONTRACT_CONTROLLER - { - public static void Get_TB_CONTRACT_List(TB_CONTRACT p_entity, Action>> p_action) + { + public static void Get_TB_CONTRACT_List(TB_CONTRACT p_entity, Action>> p_action) { ResultObject> _ret = new ResultObject>(); try @@ -63,11 +63,11 @@ namespace CK.SCP.Controller { q = q.Where(p => p.BillNo.Contains(p_entity.BillNo)); } - + _ret.State = ReturnStatus.Succeed; _ret.Result = q; p_action(_ret); - + } } catch (System.Data.Entity.Validation.DbEntityValidationException dbEx)//捕获实体验证异常 @@ -87,7 +87,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_CONTRACT_CONTROLLER), "Get_TB_CONTRACT_List", ex.ToString()); @@ -95,7 +95,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); @@ -103,7 +103,7 @@ namespace CK.SCP.Controller if (ex.InnerException != null && ex.InnerException.GetType() == typeof(UpdateException)) { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -118,7 +118,7 @@ namespace CK.SCP.Controller LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_CONTRACT_CONTROLLER), "Get_TB_CONTRACT_List", e.Message); throw e; } - + } public static ResultObject> Get_TB_CONTRACT_DETAIL_List(TB_CONTRACT_DETAIL p_entity) { @@ -164,10 +164,10 @@ namespace CK.SCP.Controller { q = q.Where(p => p.UpdateInfo.Contains(p_entity.UpdateInfo)); } - + q = q.Where(p => p.IsDeleted == p_entity.IsDeleted); - - + + _ret.State = ReturnStatus.Succeed; _ret.Result = q.ToList(); } @@ -191,7 +191,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_CONTRACT_CONTROLLER), "Get_TB_CONTRACT_DETAIL_List", ex.ToString()); @@ -199,7 +199,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); @@ -209,7 +209,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -230,13 +230,13 @@ namespace CK.SCP.Controller public static List NOTIFY_COMPARE_PRICE(List p_priceList, List p_polist) { List msgList = new List(); - var ret= from po in p_polist - join price in p_priceList on po.PartCode equals price.PartCode - select new { VAL1 = po, VAL2 = price }; - var list = ret.Where(p=> p.VAL1.BeginTime>=p.VAL2.BeginTime && p.VAL1.BeginTime<=p.VAL2.EndTime && p.VAL1.PlanQty>=p.VAL2.QtyBegin && p.VAL1.PlanQty < p.VAL2.QtyEnd && (p.VAL1.Price> p.VAL2.Price || p.VAL1.Price==0)); - foreach(var itm in list) + var ret = from po in p_polist + join price in p_priceList on po.PartCode equals price.PartCode + select new { VAL1 = po, VAL2 = price }; + var list = ret.Where(p => p.VAL1.BeginTime >= p.VAL2.BeginTime && p.VAL1.BeginTime <= p.VAL2.EndTime && p.VAL1.PlanQty >= p.VAL2.QtyBegin && p.VAL1.PlanQty < p.VAL2.QtyEnd && (p.VAL1.Price > p.VAL2.Price || p.VAL1.Price == 0)); + foreach (var itm in list) { - msgList.Add(string.Format("物料编码{0}价格{1}与合同价格{2}不一致",itm.VAL1.PartCode, itm.VAL1.Price, itm.VAL2.Price)); + msgList.Add(string.Format("物料编码{0}价格{1}与合同价格{2}不一致", itm.VAL1.PartCode, itm.VAL1.Price, itm.VAL2.Price)); } return msgList; @@ -250,7 +250,7 @@ namespace CK.SCP.Controller // { // using (ScpEntities db = EntitiesFactory.CreateScpInstance()) // { - + // } // } @@ -264,14 +264,14 @@ namespace CK.SCP.Controller { if (p_list.Count > 0) { - var ret= Get_TB_CONTRACT_DETAIL_PRICE_List(new TB_CONTRACT_DETAIL_PRICE() { VendId = p_list[0].VendId }); + var ret = Get_TB_CONTRACT_DETAIL_PRICE_List(new TB_CONTRACT_DETAIL_PRICE() { VendId = p_list[0].VendId }); if (ret.State == ReturnStatus.Succeed) { var p_priceList = ret.Result; List msgList = new List(); var ls = from po in p_list - join price in p_priceList on po.PartCode equals price.PartCode - select new { VAL1 = po, VAL2 = price }; + join price in p_priceList on po.PartCode equals price.PartCode + select new { VAL1 = po, VAL2 = price }; var list = ls.Where(p => p.VAL1.BeginTime >= p.VAL2.BeginTime && p.VAL1.BeginTime <= p.VAL2.EndTime && p.VAL1.Qty >= p.VAL2.QtyBegin && p.VAL1.Qty < p.VAL2.QtyEnd); p_list.ForEach(p => { @@ -361,7 +361,7 @@ namespace CK.SCP.Controller } return p_list; } - + public static List GET_CONTRACT_PRICE_LIST(List p_list) { @@ -397,7 +397,7 @@ namespace CK.SCP.Controller } - public static ResultObject> Get_TB_CONTRACT_DETAIL_PRICE_List(TB_CONTRACT_DETAIL_PRICE p_entity,int p_qty=0) + public static ResultObject> Get_TB_CONTRACT_DETAIL_PRICE_List(TB_CONTRACT_DETAIL_PRICE p_entity, int p_qty = 0) { ResultObject> _ret = new ResultObject>(); try @@ -405,7 +405,7 @@ namespace CK.SCP.Controller using (ScpEntities db = EntitiesFactory.CreateScpInstance()) { - + IQueryable q = db.TB_CONTRACT_DETAIL_PRICE; if (p_entity.UID != 0) { @@ -439,10 +439,10 @@ namespace CK.SCP.Controller { q = q.Where(p => p.VendId.Contains(p_entity.VendId)); } - + q = q.Where(p => p.IsDeleted == p_entity.IsDeleted); - - + + _ret.State = ReturnStatus.Succeed; _ret.Result = q.ToList(); } @@ -466,7 +466,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_CONTRACT_CONTROLLER), "Get_TB_CONTRACT_DETAIL_PRICE_List", ex.ToString()); @@ -474,7 +474,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.ErrorList.Add(ex); @@ -484,7 +484,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -615,11 +615,11 @@ namespace CK.SCP.Controller if (string.IsNullOrEmpty(itm.合同编号)) { - _buffer.AppendFormat(string.Format("导入错误合同编号未填写！")); + _buffer.AppendFormat(string.Format("导入错误合同编号未填写！")); } if (string.IsNullOrEmpty(itm.供应商代码) || string.IsNullOrEmpty(itm.供应商名称)) { - _buffer.AppendFormat(string.Format("导入错误供应商编号或供应商名称未填写！")); + _buffer.AppendFormat(string.Format("导入错误供应商编号或供应商名称未填写！")); } if (string.IsNullOrEmpty(itm.供应商物料号) || string.IsNullOrEmpty(itm.物料描述)) { @@ -705,7 +705,7 @@ namespace CK.SCP.Controller } if (_buffer.Length > 0) { - LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_CONTRACT_CONTROLLER), "IMPORT_CONTRACT_CHECK",_buffer.ToString()); + LogHelper.Writlog(LogHelper.LogType.Error, typeof(SCP_CONTRACT_CONTROLLER), "IMPORT_CONTRACT_CHECK", _buffer.ToString()); return _buffer.ToString(); } return string.Empty; @@ -714,7 +714,7 @@ namespace CK.SCP.Controller { ResultObject _ret = new ResultObject(); int line = 1; - + foreach (var itm in p_contract_list) { if (!string.IsNullOrEmpty(IMPORT_CONTRACT_CHECK(itm))) @@ -731,15 +731,15 @@ namespace CK.SCP.Controller { var _contract = p_contract_list.FirstOrDefault(); #region 删除老合同 - var contract=db.TB_CONTRACT.Where(p => p.VendId == _contract.供应商代码 && p.ContractNo == _contract.合同编号); + var contract = db.TB_CONTRACT.Where(p => p.VendId == _contract.供应商代码 && p.ContractNo == _contract.合同编号); if (contract.Count() > 0) { var c = contract.FirstOrDefault(); if (!string.IsNullOrEmpty(c.BillNo)) { - var detailPrice = db.TB_CONTRACT_DETAIL_PRICE.Where(p => p.BillNo ==c.BillNo); + var detailPrice = db.TB_CONTRACT_DETAIL_PRICE.Where(p => p.BillNo == c.BillNo); db.TB_CONTRACT_DETAIL_PRICE.RemoveRange(detailPrice); - var detail=db.TB_CONTRACT_DETAIL.Where(p => p.BillNo ==c.BillNo); + var detail = db.TB_CONTRACT_DETAIL.Where(p => p.BillNo == c.BillNo); db.TB_CONTRACT_DETAIL.RemoveRange(detail); db.TB_CONTRACT.Remove(c); } @@ -752,11 +752,11 @@ namespace CK.SCP.Controller _tbContract.CreateUser = p_creator; _tbContract.ContractNo = _contract.合同编号; _tbContract.IsDeleted = false; - + db.TB_CONTRACT.Add(_tbContract); - var list = p_contract_list.Distinct(new SCP_CONTRACT_EXCEL_COMPARE()).ToList(); + var list = p_contract_list.Distinct(new SCP_CONTRACT_EXCEL_COMPARE()).ToList(); foreach (var itm in list) { var _tbContract_detail = new TB_CONTRACT_DETAIL(); @@ -780,7 +780,7 @@ namespace CK.SCP.Controller _detail_price.EndTime = ConvertHelper.To(itm.结束日期); _detail_price.ContractNo = _tbContract.ContractNo; _detail_price.QtyBegin = int.Parse(itm.最小起订量1); - _detail_price.QtyEnd = !string.IsNullOrEmpty(itm.最小起订量2)? int.Parse(itm.最小起订量2):999999999; + _detail_price.QtyEnd = !string.IsNullOrEmpty(itm.最小起订量2) ? int.Parse(itm.最小起订量2) : 999999999; _detail_price.BillNo = _tbContract.BillNo; _detail_price.IsDeleted = false; _detail_price.PartCode = itm.供应商物料号; @@ -863,7 +863,7 @@ namespace CK.SCP.Controller { _ret.State = ReturnStatus.Failed; _ret.Result = false; - + } } @@ -887,7 +887,7 @@ namespace CK.SCP.Controller } catch (OptimisticConcurrencyException ex)//并发冲突异常 { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; _ret.ErrorList.Add(ex); @@ -896,7 +896,7 @@ namespace CK.SCP.Controller } catch (ScpException ex) { - + _ret.State = ReturnStatus.Failed; _ret.Result = false; @@ -907,7 +907,7 @@ namespace CK.SCP.Controller { var inner = (UpdateException)ex.InnerException; - + throw new ScpException(ResultCode.Exception, "0000", ex.ToString()); } else @@ -928,5 +928,77 @@ namespace CK.SCP.Controller } + public static List GET_CONTRACT_PRICE_LIST_BJ(List p_list) + { + + if (p_list.Count > 0) + { + //var ret = Get_TB_CONTRACT_DETAIL_PRICE_List(new TB_CONTRACT_DETAIL_PRICE() { VendId = p_list[0].VendId }); + //if (ret.State == ReturnStatus.Succeed) + //{ + ScpEntities db = EntitiesFactory.CreateScpInstance(); + string vendid = p_list[0].VendId; + List res = db.TB_CONTRACT_DETAIL_PRICE.Where(q => q.VendId == vendid && q.IsDeleted == false).ToList(); + var p_priceList = res; + + List msgList = new List(); + var ls = from ask in p_list + join price in p_priceList on ask.PartCode equals price.PartCode + select new { VAL1 = ask, VAL2 = price }; + var list = ls.Where(p => p.VAL1.BeginTime >= p.VAL2.BeginTime && p.VAL1.BeginTime <= p.VAL2.EndTime && p.VAL1.AskQty >= p.VAL2.QtyBegin && p.VAL1.AskQty < p.VAL2.QtyEnd); + var asklist = p_list.Select(q => q.AskBillNum).ToList(); + var asndetaillist = db.V_TB_ASN_DETAIL.Where(pl => pl.IsDeleted == false && asklist.Contains(pl.AskBillNum)).ToList(); + var arrlist = db.TB_ARRIVE_DETAIL.Where(pl => asklist.Contains(pl.Remark) && pl.IsDeleted == false && pl.State == (int)ArriveState.OK && pl.Qty < 0 && pl.BillType == 3).ToList(); + p_list.ForEach(p => + { + var _entity = list.ToList().Where(itm => itm.VAL1.PartCode == p.PartCode).FirstOrDefault(); + if (_entity != null) + { + p.ContractPrice = _entity.VAL2.Price; + p.BlancePrice = p.ContractPrice - p.Price; + } + else + { + p.ContractPrice = p.Price; + p.BlancePrice = 0; + } + + //var list11 = db.V_TB_ASN_DETAIL.Where(pl => pl.IsDeleted == false && p.AskBillNum == pl.AskBillNum).ToList(); + var list_back = arrlist.Where(q => q.Remark == p.AskBillNum).GroupBy(pl => new { pl.Remark, pl.PoLine, pl.PartCode, pl.PoBillNum }).Select(pl => new { BackSum = pl.Sum(itm => itm.Qty), PoLine = pl.Key.PoLine, Remark = pl.Key.Remark, PartCode = pl.Key.PartCode, PoBillNum = pl.Key.PoBillNum }).ToList(); + var groupList = asndetaillist.Where(q => q.AskBillNum == p.AskBillNum).GroupBy(pl => new { pl.PoBillNum, pl.PoLine, pl.PartCode, pl.AskBillNum }).Select( + pl => new + { + ShipSum = pl.Sum(itm => itm.Qty), + PoLine = pl.Key.PoLine, + PoBillNum = pl.Key.PoBillNum, + PartCode = pl.Key.PartCode, + AskBillNum = pl.Key.AskBillNum + }).ToList(); + groupList.ForEach(pa => + { + if (pa.PoBillNum == p.PoBillNum && pa.PoLine == p.PoLine && pa.PartCode == p.PartCode && pa.AskBillNum == p.AskBillNum) + { + p.ShippedQty = pa.ShipSum; + } + }); + list_back.ForEach(pl => + { + if (pl.PoBillNum == p.PoBillNum && pl.PoLine == p.PoLine && pl.PartCode == p.PartCode) + { + p.RejectQty = Math.Abs(pl.BackSum);//寄售退货数 + } + }); + decimal a = p.AskQty - (p.ShippedQty == null ? 0 : (decimal)p.ShippedQty) + p.RejectQty - (p.ReduceQty == null ? 0 : (decimal)p.ReduceQty); + p.CanQty = a; + + + + }); + //} + } + return p_list; + } + + } } diff --git a/北京北汽/SCP/Views/PlanData/SCP_ASK_DETAIL.aspx b/北京北汽/SCP/Views/PlanData/SCP_ASK_DETAIL.aspx index 0214688..4e72948 100644 --- a/北京北汽/SCP/Views/PlanData/SCP_ASK_DETAIL.aspx +++ b/北京北汽/SCP/Views/PlanData/SCP_ASK_DETAIL.aspx @@ -58,7 +58,7 @@ @@ -67,11 +67,11 @@ - - - + + + <%-- - + --%> diff --git a/北京北汽/SCP/Views/PlanData/SCP_ASK_DETAIL.aspx.cs b/北京北汽/SCP/Views/PlanData/SCP_ASK_DETAIL.aspx.cs index 76d7de7..9a55341 100644 --- a/北京北汽/SCP/Views/PlanData/SCP_ASK_DETAIL.aspx.cs +++ b/北京北汽/SCP/Views/PlanData/SCP_ASK_DETAIL.aspx.cs @@ -18,6 +18,7 @@ namespace SCP.PlanData { public partial class SCP_ASK_DETAIL : PageBase { + private List listnorequ = new List(); protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) @@ -35,9 +36,10 @@ namespace SCP.PlanData SearchV_TB_ASK_DETAIL_VIEW((ret) => { Grid_V_TB_ASK_DETAIL.RecordCount = ret.Count(); + listnorequ = ret.ToList(); var list = SortAndPage(ret, Grid_V_TB_ASK_DETAIL); - var _ls = SCP_CONTRACT_CONTROLLER.GET_CONTRACT_PRICE_LIST(list.ToList()); - Grid_V_TB_ASK_DETAIL.DataSource = SCP_ASK_CONTROLLER.Get_CAN_SHIPQTY(_ls); ; + var _ls = SCP_CONTRACT_CONTROLLER.GET_CONTRACT_PRICE_LIST_BJ(list.ToList()); + Grid_V_TB_ASK_DETAIL.DataSource = _ls; //SCP_ASK_CONTROLLER.Get_CAN_SHIPQTY(_ls); Grid_V_TB_ASK_DETAIL.DataBind(); }); } @@ -187,17 +189,33 @@ namespace SCP.PlanData } public void BindDetail() { - SearchV_TB_ASK_DETAILData((ret) => + var _str = Request["AskBillNum"]; + if (!string.IsNullOrEmpty(_str)) { - var _str= Request["AskBillNum"]; - var _list=_str.Split(',').ToList(); - ret = ret.Where(p => _list.Contains(p.AskBillNum)); - Grid_V_TB_ASK_DETAIL.RecordCount = ret.Count(); - var list = SortAndPage(ret, Grid_V_TB_ASK_DETAIL); - var _ls = SCP_CONTRACT_CONTROLLER.GET_CONTRACT_PRICE_LIST(list.ToList()); - Grid_V_TB_ASK_DETAIL.DataSource = SCP_ASK_CONTROLLER.Get_CAN_SHIPQTY(_ls); - Grid_V_TB_ASK_DETAIL.DataBind(); - }); + SearchV_TB_ASK_DETAILData((ret) => + { + var _list = _str.Split(',').ToList(); + ret = ret.Where(p => _list.Contains(p.AskBillNum)); + Grid_V_TB_ASK_DETAIL.RecordCount = ret.Count(); + var list = SortAndPage(ret, Grid_V_TB_ASK_DETAIL); + var _ls = SCP_CONTRACT_CONTROLLER.GET_CONTRACT_PRICE_LIST_BJ(list.ToList()); + Grid_V_TB_ASK_DETAIL.DataSource = _ls/* SCP_ASK_CONTROLLER.Get_CAN_SHIPQTY(_ls)*/; + Grid_V_TB_ASK_DETAIL.DataBind(); + }); + } + else + { + SearchV_TB_ASK_DETAIL_VIEW((ret) => + { + Grid_V_TB_ASK_DETAIL.RecordCount = ret.Count(); + listnorequ = ret.ToList(); + var list = SortAndPage(ret, Grid_V_TB_ASK_DETAIL); + var _ls = SCP_CONTRACT_CONTROLLER.GET_CONTRACT_PRICE_LIST_BJ(list.ToList()); + Grid_V_TB_ASK_DETAIL.DataSource = _ls; //SCP_ASK_CONTROLLER.Get_CAN_SHIPQTY(_ls); + Grid_V_TB_ASK_DETAIL.DataBind(); + }); + } + } protected void btnOutput_Click(object sender, EventArgs e) diff --git a/北京北汽/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx b/北京北汽/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx index d8c3e13..67664fc 100644 --- a/北京北汽/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx +++ b/北京北汽/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx @@ -64,7 +64,7 @@ + EnableRowSelectEvent="True" PageSize="50" AutoScroll="True" SortField="PoLine" SortDirection="DESC" AllowCellEditing="true" ClicksToEdit="1"> @@ -72,9 +72,11 @@ - - - + + + + + diff --git a/北京北汽/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.cs b/北京北汽/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.cs index f1815c2..9456447 100644 --- a/北京北汽/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.cs +++ b/北京北汽/SCP/Views/SupplierData/SCP_ASN_CREATE.aspx.cs @@ -99,7 +99,7 @@ namespace SCP.SupplierData { Grid_V_TB_ASK_DETAIL.RecordCount = ret.Count(); var list = SortAndPage(ret, Grid_V_TB_ASK_DETAIL); - var _ls = SCP_ASK_CONTROLLER.Get_CAN_SHIPQTY(ret.ToList()); + var _ls = SCP_ASK_CONTROLLER.Get_CAN_SHIPQTY(list.ToList()); var _notifyList = new List(); _ls.ForEach(p => {