diff --git a/北京北汽/SCP/Properties/AssemblyInfo.cs b/北京北汽/SCP/Properties/AssemblyInfo.cs index ae64f57..352f68d 100644 --- a/北京北汽/SCP/Properties/AssemblyInfo.cs +++ b/北京北汽/SCP/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // 可以指定所有值,也可以使用“修订号”和“内部版本号”的默认值, // 方法是按如下所示使用 "*": -[assembly: AssemblyVersion("1.23.1226.1")] -[assembly: AssemblyFileVersion("1.23.1226.1")] +[assembly: AssemblyVersion("1.24.0126.1")] +[assembly: AssemblyFileVersion("1.24.0126.1")] diff --git a/北京北汽/SCP/Views/PlanData/SCP_ARRIVE_DETAIL.aspx b/北京北汽/SCP/Views/PlanData/SCP_ARRIVE_DETAIL.aspx index 43d5fb6..c394a46 100644 --- a/北京北汽/SCP/Views/PlanData/SCP_ARRIVE_DETAIL.aspx +++ b/北京北汽/SCP/Views/PlanData/SCP_ARRIVE_DETAIL.aspx @@ -70,7 +70,7 @@ - + diff --git a/北京北汽/SCP/Views/PlanData/SCP_ARRIVE_DETAIL.aspx.cs b/北京北汽/SCP/Views/PlanData/SCP_ARRIVE_DETAIL.aspx.cs index 7e8bb54..b8a8afc 100644 --- a/北京北汽/SCP/Views/PlanData/SCP_ARRIVE_DETAIL.aspx.cs +++ b/北京北汽/SCP/Views/PlanData/SCP_ARRIVE_DETAIL.aspx.cs @@ -10,7 +10,7 @@ using CK.SCP.Models.ScpEntity; using CK.SCP.Utils; using CK.SCP.Controller; using FineUI; - +using CK.SCP.Models; namespace SCP.Views.PlanData { @@ -60,13 +60,31 @@ namespace SCP.Views.PlanData var _receive = new V_TB_ARRIVE_DETAIL(); _receive.ArrvBillNum = GetQueryValue("ArrvBillNum"); _receive.SubSite = GetQueryValue("SubSite"); + //_receive.Site = CurrentUser.UsedDomain; SCP_RECIVECE_CONTROLLER.Get_V_TB_ARRIVE_DETAIL_List(_receive, (ret) => { if (ret.State == ReturnStatus.Succeed) { Grid_V_TB_ARRIVE_DETAIL.RecordCount = ret.Result.Count(); var _ls = SortAndPage(ret.Result, Grid_V_TB_ARRIVE_DETAIL); - Grid_V_TB_ARRIVE_DETAIL.DataSource = _ls; + + var lst = _ls.ToList(); + using (ScpEntities db = EntitiesFactory.CreateScpInstance()) + { + foreach (var lt in lst) + { + if (string.IsNullOrEmpty(lt.PartDesc1)) + { + var partModel = db.TA_PART.FirstOrDefault(p => p.PartCode == lt.PartCode && p.Site == lt.Site); + if (partModel != null) + { + lt.PartDesc1 = partModel.PartDesc1; + lt.Unit = partModel.Unit; + } + } + } + } + Grid_V_TB_ARRIVE_DETAIL.DataSource = lst; Grid_V_TB_ARRIVE_DETAIL.DataBind(); } });