diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs index c4b540e..27bdf30 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs @@ -217,6 +217,7 @@ namespace BWP.Web.Pages.B3YunKen.Bill d.WrappageKindID3 = (string)reader[6]; d.WrappageKindID4 = (string)reader[7]; d.SmallPackNum = reader[8] == null ? 0 : Convert.ToInt32(reader[8]); + d.AccountingUnit_ID = (long)reader[9]; savePriceList.Add(d); } } @@ -268,8 +269,7 @@ namespace BWP.Web.Pages.B3YunKen.Bill priceSum = price1 + price2 + price3 +price4; - Goods_PackagePrice gp = new Goods_PackagePrice - { Goods_ID = savePrice.Goods_ID, Price = priceSum, AccountingUnit_Name = savePrice.AccountingUnit_Name, User_ID = DomainContext.Current.DomainUser.User_ID }; + Goods_PackagePrice gp = new Goods_PackagePrice { Goods_ID = savePrice.Goods_ID, Price = priceSum, AccountingUnit_ID = savePrice.AccountingUnit_ID, User_ID = DomainContext.Current.DomainUser.User_ID }; Goods_PackagePriceList.Add(gp); @@ -316,6 +316,8 @@ namespace BWP.Web.Pages.B3YunKen.Bill public int SmallPackNum { get; set; } //public string SmallPackNum { get; set; } + public long AccountingUnit_ID { get; set; } + } @@ -358,7 +360,7 @@ namespace BWP.Web.Pages.B3YunKen.Bill dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(goods, "Name"), "产品")); if (configured) { - var strings = new string[] { "Goods_ID", "AccountingUnit_Name", "Count" }.ToList(); + var strings = new string[] { "Goods_ID", "AccountingUnit_ID", "AccountingUnit_Name", "Count" }.ToList(); for (var index = 0; index < WrappageKindList.Count; index++) { if (index + 1 > MaxCol) @@ -386,6 +388,7 @@ namespace BWP.Web.Pages.B3YunKen.Bill dom.OrderBy.Expressions.Add(DQOrderByExpression.Create(temp2, "AccountingUnit_Name")); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(temp2, "SmallPackNum"), "内包装物数量")); + dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(temp2, "AccountingUnit_ID"), "会计单位ID")); } else { @@ -432,9 +435,11 @@ namespace BWP.Web.Pages.B3YunKen.Bill dom.From.AddJoin(JoinType.Left, new DQDmoSource(acc), DQCondition.EQ(package, "AccountingUnit_ID", acc, "ID")); dom.Columns.Add(DQSelectColumn.Field("Goods_ID")); + dom.Columns.Add(DQSelectColumn.Field("ID", acc)); dom.Columns.Add(DQSelectColumn.Field("Name", acc)); dom.Columns.Add(DQSelectColumn.Create(DQExpression.Count(), "Count")); dom.GroupBy.Expressions.Add(DQExpression.Field("Goods_ID")); + dom.GroupBy.Expressions.Add(DQExpression.Field(acc, "ID")); dom.GroupBy.Expressions.Add(DQExpression.Field(acc, "Name")); int i = 1; foreach (var tuple in WrappageKindList) @@ -467,6 +472,7 @@ namespace BWP.Web.Pages.B3YunKen.Bill public string SmallPackNum { get; set; } public long Goods_ID { get; set; } + public long AccountingUnit_ID { get; set; } public string AccountingUnit_Name { get; set; } public long Count { get; set; } public long ID1 { get; set; } diff --git a/BWP.B3_YunKen/BO/Bill/Goods_PackagePrice.cs b/BWP.B3_YunKen/BO/Bill/Goods_PackagePrice.cs index a7c095e..cc60818 100644 --- a/BWP.B3_YunKen/BO/Bill/Goods_PackagePrice.cs +++ b/BWP.B3_YunKen/BO/Bill/Goods_PackagePrice.cs @@ -24,7 +24,7 @@ namespace BWP.B3_YunKen.BO [LogicName("会计单位")] - public string AccountingUnit_Name { get; set; } + public long? AccountingUnit_ID { get; set; } [LogicName("用户ID")]