Merge brant :ch 'master' of bwpgit:BWPB3/B3YunKen

BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs

@@ -138,6 +138,8 @@ namespace BWP.Web.Pages.B3YunKen {
 
         var details = new List<SaleOutStore_Detail>();
         foreach (SaleOutStore_Detail detail in _detailGrid.GetSelectedItems()) {
+          if (detail.AcceptUnitNum > detail.UnitNum)
+            throw new ApplicationException("【"+detail.Goods_Name+"】转验收报价数量不能大于报价数量");
           detail.UnitNum = detail.AcceptUnitNum;
           detail.SecondNumber = detail.AcceptSecondNumber;
           details.Add(detail);
@@ -212,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();
@@ -228,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"));
@@ -244,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;
     }
@@ -331,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));

BWP.B3_YunKen.Web/PluginClass.cs

@@ -12,6 +12,8 @@ using BWP.Web.Pages.B3Butchery.Reports.ProductNoticeReport_;
 using BWP.Web.Pages.B3Butchery.Bills.ProductInStore_;
 using BWP.Web.Pages.B3Sale.Bills.CustomerApply_;
 using BWP.Web.Pages.B3Butchery.Dialogs;
+using BWP.B3Frameworks.Attributes;
+using BWP.B3Sale.BO;
 
 namespace BWP.B3_YunKen.Web
 {
@@ -37,6 +39,9 @@ namespace BWP.B3_YunKen.Web
       WpfPageFactory.RegisterPageOverlay(typeof(ProductInStoreEdit).FullName, typeof(ProduceFinishBtnExt).FullName);
       WpfPageFactory.RegisterPageOverlay(typeof(CustomerApplyEdit).FullName, typeof(CustomerApplyEdit_Ext).FullName);
       WpfPageFactory.RegisterPageOverlay(typeof(SelectProductNoticeDialog).FullName, typeof(SelectProductNoticeDialog_Ext).FullName);
+      WeChatDataTemplateNameAttribute.SetCustomName(typeof(Order),"耘垦销售订单");
+      WeChatDataTemplateNameAttribute.SetCustomName(typeof(SaleOutStore),"耘垦销售出库单");
+      WeChatDataTemplateNameAttribute.SetCustomName(typeof(SaleForecast),"耘垦销售预报");
     }
 
     public void OnUnitInit()