需求单No.138133

BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProductNoticeEdit_Ext.cs

@@ -20,10 +20,18 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
       }
       _detailGrid.Columns.Add(new DFEditGridColumn("Detail_Customer_ID"));
     }
-
+    
     protected override DFCollectionEditor<ProductNotice_Detail> AddGridByOrderByID()
     {
       return new DFCollectionEditor<ProductNotice_Detail>(() => new DFEditGridPhonyData(Dmo.Details.OrderBy(x => x.OrderByID), Dmo.Details));
     }
+    protected override void AddBrandItem(ProductNotice_Detail detail)
+    {
+      if (last != null)
+      {
+        detail.BrandItem_ID = last.BrandItem_ID;
+        detail.BrandItem_Name = last.BrandItem_Name;
+      }
+    }
   }
 }

BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/ProductNoticeReport_Ext.cs

@@ -6,6 +6,8 @@ using TSingSoft.WebControls2;
 using BWP.Web.Layout;
 using Forks.EnterpriseServices.DataForm;
 using BWP.B3UnitedInfos;
+using Forks.EnterpriseServices.DomainObjects2;
+using Forks.EnterpriseServices.DomainObjects2.DQuery;
 
 namespace BWP.Web.Pages.B3YunKen.Overlays
 {
@@ -14,6 +16,7 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
     protected override void AddQueryPanelByBrandItem_Name(CheckBoxListWithReverseSelect _checkbox)
     {
       _checkbox.Items.Add(new ListItem("品牌项", "BrandItem_Name"));
+      _checkbox.Items.Add(new ListItem("客户", "Detail_Customer_Name"));
     }
 
     protected override void AddQueryControlsByBrandItem_ID(LayoutManager manager, DFInfo info)
@@ -21,5 +24,20 @@ namespace BWP.Web.Pages.B3YunKen.Overlays
       manager.Add("BrandItem_ID", new SimpleLabel("品牌项"), QueryCreator.DFChoiceBoxEnableMultiSelection(info.Fields["BrandItem_ID"], mQueryContainer, "BrandItem_ID", B3UnitedInfosConsts.DataSources.品牌项));
       manager["BrandItem_ID"].NotAutoAddToContainer = true;
     }
+    
+    protected override void TakeValueCustomer(DQueryDom query, ListItem field, JoinAlias detail)
+    {
+      if (field .Value== "Customer_Name")
+      {
+        field.Value = "Detail_Customer_Name";
+        query.Columns.Add(DQSelectColumn.Field(field.Value, detail));
+        query.GroupBy.Expressions.Add(DQExpression.Field(detail, field.Value));
+      }
+      else
+      {
+        query.Columns.Add(DQSelectColumn.Field(field.Value));
+        query.GroupBy.Expressions.Add(DQExpression.Field(field.Value));
+      }
+    }
   }
 }

BWP.B3_YunKen.Web/Pages/B3YunKen/ProductTask_/SaleOrderToProductNoticePage.cs

@@ -39,7 +39,7 @@ namespace BWP.Web.Pages.B3YunKen.ProductTask_
     protected static DFInfo mGoodsDFInfo = DFInfo.Get(typeof(Goods));
     protected static DFInfo mPropDFInfo = DFInfo.Get(typeof(GoodsProperty));
 
-    private DFChoiceBox ccbxEmployeeUnit, ccbxDepartment, ccbxProductionUnit;
+    private DFChoiceBox ccbxEmployeeUnit, ccbxDepartment, ccbxProductionUnit, ccbxAccountingUnit;
     private DFDateInput cDateInput;
     private DFTextBox ccbxRemark;
 
@@ -72,13 +72,16 @@ namespace BWP.Web.Pages.B3YunKen.ProductTask_
       var hPanelB = titlePanel.EAdd(new HLayoutPanel());
 
       hPanelB.Add(new SimpleLabel("生产单位"));
-      hPanelB.Add(ccbxProductionUnit = new DFChoiceBox() { Width = 130, EnableTopItem = true, DataKind = B3ProduceUnitedInfosDataSources.生产单位全部 });
+      hPanelB.Add(ccbxProductionUnit = new DFChoiceBox() { Width = 130, EnableTopItem = true, DataKind = B3ProduceUnitedInfosDataSources.生产单位 });
 
       hPanelB.Add(new SimpleLabel("部门"));
       hPanelB.Add(ccbxDepartment = new DFChoiceBox() { Width = 130, EnableTopItem = true, DataKind = B3FrameworksConsts.DataSources.授权部门全部 });
 
+      hPanelB.Add(new SimpleLabel("会计单位"));
+      hPanelB.Add(ccbxAccountingUnit = new DFChoiceBox() { Width = 130, EnableTopItem = true,DataKind = B3FrameworksConsts.DataSources.授权会计单位 });
+
       hPanelB.Add(new SimpleLabel("经办人"));
-      hPanelB.Add(ccbxEmployeeUnit = new DFChoiceBox() { Width = 130, EnableTopItem = true, DataKind = "授权员工" });
+      hPanelB.Add(ccbxEmployeeUnit = new DFChoiceBox() { Width = 130, EnableTopItem = true, EnableInputArgument = true, DataKind = "授权员工" });
 
       hPanelB.Add(new SimpleLabel("日期"));
       hPanelB.Add(cDateInput = new DFDateInput() { Width = 130, Date = DateTime.Today });
@@ -99,6 +102,8 @@ namespace BWP.Web.Pages.B3YunKen.ProductTask_
         throw new Exception("请选择部门");
       if (string.IsNullOrEmpty(ccbxEmployeeUnit.Value))
         throw new Exception("请选择经办人");
+      if (string.IsNullOrEmpty(ccbxAccountingUnit.Value))
+        throw new Exception("请选择会计单位");
       if (!cDateInput.Value.HasValue)
         throw new Exception("请选择日期");
       if (!mBrowseGrid.GetSelectedItems().Any())
@@ -162,6 +167,7 @@ namespace BWP.Web.Pages.B3YunKen.ProductTask_
       var inputDate = cDateInput.Value.Value;
       var remark = ccbxRemark.Text;
       var employeeID = long.Parse(ccbxEmployeeUnit.Value);
+      var accounting = ccbxAccountingUnit.Value;
 
       var dmo = new ProductNotice();
       //dmo.AccountingUnit_ID = accounitingId;
@@ -171,6 +177,7 @@ namespace BWP.Web.Pages.B3YunKen.ProductTask_
       dmo.Date = inputDate;
       dmo.Employee_ID = employeeID;
       dmo.Remark = remark;
+      dmo.AccountingUnit_ID = long.Parse(accounting);
       foreach (var grouping in list.GroupBy(x => x.GoodsId))
       {
         var goodsId = grouping.Key;