From ad7462ebdbceb66f81b5b2d4db1eb3e3336a49c3 Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Thu, 11 Jan 2018 09:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8FOrder=5FID=20=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs
index 7e86fad..e2ee17c 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs
@@ -214,12 +214,12 @@ namespace BWP.Web.Pages.B3YunKen {
       var deliverAddressInput = hPanel2.Add(new DFTextBox() { Width=300});
       hPanel2.Add(buildButton);
       buildButton.Click += delegate {
-        var items = _grid.GetSelectedItems().Select(row => new Tuple<long,bool>((long)row["ID"],(bool)row["IsSplitCreatedCustomerAccept"]));
+        var items = _grid.GetSelectedItems().Select(row => new Tuple<long,bool>((long)row["Code"],(bool)row["IsSplitCreatedCustomerAccept"]));
         if (!items.Any())
           throw new ApplicationException("请选择单据!");
         var resultList = items.Where(x => x.Item2);
         if (resultList.Count() > 0)
-          throw new ApplicationException("出库单No."+string.Join("、",resultList.Select(x=>x.Item1))+"已经拆分过，不得勾选");
+          throw new ApplicationException("出库单"+string.Join("、",resultList.Select(x=>x.Item1))+"已经拆分过，不得勾选");
         BIFactory.Create<ISaleOutStoreBL>().CreateCustomerAccept(items.Select(x=>x.Item1), dateInput.Value, loadTimeInput.Value, orderTimeInput.Value, deliverAddressInput.Text);
         AspUtil.Alert(this, BIFactory.GetLastMessage());
         _grid.DataBind();
@@ -230,7 +230,7 @@ namespace BWP.Web.Pages.B3YunKen {
       });
       //_grid.Columns.Add(new DFBrowseGridColumn("ID"));
       _grid.Columns.Add(new DFBrowseGridColumn("Code"));
-      _grid.Columns.EAdd(new DFBrowseGridColumn("Order_ID"));
+      //_grid.Columns.EAdd(new DFBrowseGridColumn("Order_ID"));
       _grid.Columns.EAdd(new DFBrowseGridColumn("OrderDate"));
       _grid.Columns.EAdd(new DFBrowseGridColumn("LoadTime"));
       _grid.Columns.EAdd(new DFBrowseGridColumn("AccountingUnit_Name"));
@@ -246,6 +246,7 @@ namespace BWP.Web.Pages.B3YunKen {
       _grid.Columns.EAdd(new DFBrowseGridColumn("Remark"));
       _grid.ValueColumns.Add("ID");
       _grid.ValueColumns.Add("IsSplitCreatedCustomerAccept");
+      _grid.ValueColumns.Add("Order_ID");
       
       _grid.SingleSelection += GridSingleSelection;
     }
@@ -333,6 +334,7 @@ namespace BWP.Web.Pages.B3YunKen {
         query.Columns.Add(DQSelectColumn.Field("CustomerAcceptID"));
       }
       query.Columns.Add(DQSelectColumn.Field("ID",bill));
+      query.Columns.Add(DQSelectColumn.Field("Order_ID", bill));
       query.Columns.Add(DQSelectColumn.Field("IsSplitCreatedCustomerAccept", bill));
       query.Where.Conditions.Add(DQCondition.EQ("BillState", 单据状态.已审核));
       query.Where.Conditions.Add(DQCondition.EQ("Domain_ID", DomainContext.Current.ID));