需求单No.137215

BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/GoodsPackageSet.cs

@@ -125,19 +125,28 @@ namespace BWP.Web.Pages.B3YunKen.Bill
 
                     string accName = (string)dr["会计单位"] ?? "";
                     var smallPackNum = int.Parse((dr["内包装物数量"] == null ? "0" : dr["内包装物数量"].ToString()));
-                    string name1 = (string)dr["封口包装物"] ?? "";
-                    string name2 = (string)dr["外包装物"] ?? "";
-                    string name3 = (string)dr["箱子包装物"] ?? "";
-                    string name4 = (string)dr["内包装物"] ?? "";
-
-                    var price1 = GetWrappageUnitPrice(accName, name1) ?? 0;
-                    var price2 = GetWrappageUnitPrice(accName, name2) ?? 0;
-                    var price3 = GetWrappageUnitPrice(accName, name3) ?? 0;
-                    var price4 = GetWrappageUnitPrice(accName, name4) ?? 0;
-                    var price = price1 + price2 + price3 + price4 * smallPackNum;
+                    decimal priceSum = 0;
+                    foreach (var tuple in WrappageKindList)
+                    {
+                        if (!string.IsNullOrEmpty(tuple.Item2))
+                        {
+                            string name = (string)dr[tuple.Item2] ?? "";
+                            var price = GetWrappageUnitPrice(accName, name) ?? 0;
+                            if (name.Contains("内包装"))
+                            {
+                                price =price * smallPackNum;
+                                priceSum += price;
+                            }
+                            else
+                            {
+                                priceSum += price;
+                            }
+                        }
+
+                    }
 
                     var lb = new Label();
-                    lb.Text = price.ToString();
+                    lb.Text = priceSum.ToString();
                     cell.Controls.Add(lb);
                 }
             })).HeaderText = "价格";