diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
index 2bba259..a22ecb7 100644
--- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
+++ b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
@@ -173,6 +173,7 @@
+
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
index a4647b3..8627c0c 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs
@@ -7,6 +7,10 @@ using BWP.Web.Layout;
using TSingSoft.WebControls2;
using BWP.Web.Utils;
using BWP.B3Sale.Utils;
+using TSingSoft.WebPluginFramework;
+using System.Web.UI.WebControls;
+using BWP.B3Sale.BO;
+using BWP.Web.WebControls;
namespace BWP.Web.Pages.B3YunKen.Overlays
{
@@ -33,7 +37,17 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
//需求单No.137672 【销售出库】‘基本属性’增加字段{承运方}
config.Add("Carrier_ID");
- layoutManager.Add("Code", new DFValueLabel());
+ var code = new YunKenDFEntityLink(typeof(Order), "Order_ID");
+ layoutManager.Add("Code", code);
+
+
+ //var linkButton = new LinkButton();
+ //var url = string.Format("~/B3Sale/Bills/SaleOutStore_/SaleOutStoreEdit.aspx?id='+__DFContainer.getValue('Order_ID')+'");
+ //linkButton.OnClientClick = string.Format("OpenUrlInTopTab('{0}','出库辅单号');return false;",
+ // WpfPageUrl.ToGlobal(url));
+ //layoutManager.Add("Code", linkButton);
+
+
config.Add("Code");
}
@@ -48,6 +62,10 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
base.AddLayOutManagerScript(layoutPanel);
var idCard = layoutPanel.EnsureInputControlCreated("DriverIDCard");//司机身份证号下拉
var carid = layoutPanel.EnsureInputControlCreated("Car_ID");//运输车辆下拉
+
+
+
+
//选择司机身份证号带出驾驶证号和司机名字
if (idCard != null)
{
diff --git a/BWP.B3_YunKen.Web/Pages/YunKenDFEntityLink.cs b/BWP.B3_YunKen.Web/Pages/YunKenDFEntityLink.cs
new file mode 100644
index 0000000..039aaef
--- /dev/null
+++ b/BWP.B3_YunKen.Web/Pages/YunKenDFEntityLink.cs
@@ -0,0 +1,125 @@
+using BWP.B3Frameworks.Attributes;
+using BWP.B3Sale.BO;
+using BWP.Web.Utils;
+using Forks.EnterpriseServices.DataForm;
+using Forks.Utils.TypeDescs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TSingSoft.WebControls2;
+using TSingSoft.WebPluginFramework;
+
+namespace BWP.Web.Pages
+{
+
+
+ public class YunKenDFEntityLink : DFControl, IDFFieldEditor
+ {
+ public YunKenDFEntityLink() : base()
+ {
+
+ }
+
+ public void InitEntityType(Type type)
+ {
+ mEntityType = type;
+ }
+
+
+ Type mEntityType;
+ string mLinkIDField;
+ public YunKenDFEntityLink(Type entityType, string linkIDField )
+ {
+ mEntityType = entityType;
+ mLinkIDField = linkIDField;
+
+ }
+
+ internal string Text
+ {
+ get { return (string)ViewState["Text"]; }
+ set { ViewState["Text"] = value; }
+ }
+
+
+ public void ApplyValueToUI(object value)
+ {
+ Text = string.Empty;
+ if (value == null)
+ {
+ return;
+ }
+ var str = value as string;
+ if (string.IsNullOrEmpty(str))
+ {
+ return;
+ }
+ DFInfo info = DFField.DFInfo as DFInfo;
+ if (info == null)
+ {
+ return;
+ }
+ IDotNetTypeDesc type = info.DFClass as IDotNetTypeDesc;
+ if (type == null)
+ {
+ return;
+ }
+ //+info.DFClass { BWP.B3Sale.BO.SaleOutStore}
+ //Forks.Utils.TypeDescs.ITypeDesc { Forks.Utils.TypeDescs.DotNetTypeDesc}
+
+ var id = WebBLUtil.GetDmoProperty