From 67c608b1e57a03cc8a34a4419bcd40712bf7c16b Mon Sep 17 00:00:00 2001
From: "yidi.wu" <yidi.wu@ccwin-in.com>
Date: Fri, 26 Jan 2024 18:01:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=9B=B6=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 北京北汽/SCP/Properties/AssemblyInfo.cs   |  4 ++--
 .../SCP/Views/PlanData/SCP_ARRIVE_DETAIL.aspx |  2 +-
 .../Views/PlanData/SCP_ARRIVE_DETAIL.aspx.cs  | 22 +++++++++++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

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 @@
                         <f:BoundField SortField="PoLine" DataField="PoLine" HeaderText="订单行" ColumnID="UnitCode" Width="60px" />
                         <f:BoundField SortField="PartCode" DataField="PartCode" HeaderText="零件号" ColumnID="PackageQty" Width="100px" />
                         <f:BoundField SortField="PartDesc1" DataField="PartDesc1" HeaderText="零件名称" ColumnID="CurrencyCode" Width="200px" />
-                        <f:BoundField SortField="Unit" DataField="Unit" HeaderText="单位" ColumnID="Price" Width="80px" />
+                        <f:BoundField SortField="Unit" DataField="Unit" HeaderText="单位" ColumnID="Unit" Width="80px" />
                         <f:BoundField SortField="Qty" DataField="Qty" HeaderText="数量" ColumnID="PlanQty" Width="60px" />
                         <f:BoundField SortField="ShipTime" DataField="ShipTime" HeaderText="时间" ColumnID="ShipQty" Width="60px" DataFormatString="{0:yy-MM-dd}" />
                         <f:BoundField SortField="Remark" DataField="Remark" HeaderText="备注" ColumnID="ReceiveQty" Width="60px" />
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();
                 }
             });