Merge branch 'master' of 192.168.1.5:BWPB3/B3YunKen

BWP.B3_YunKen.Web/Pages/B3YunKen/Dialogs/ProductionCompletionDialog.cs

@@ -56,7 +56,7 @@ namespace BWP.Web.Pages.B3YunKen.Dialogs
       dmo.Goods_Name = (string)row["Goods_Name"];
       dmo.Goods_Spec = (string)row["Goods_Spec"];
       dmo.Goods_Code = (string)row["Goods_Code"];
-      dmo.Goods_Code = (string)row["BrandItem_ID"];
+      dmo.BrandItem_ID = (long?)row["BrandItem_ID"];
       dmo.ProductionDate =Convert.ToDateTime(row["Date"]);
       dmo.Number = (Money<decimal>?)row["Number"];
       dmo.Goods_MainUnit = (string)row["Goods_MainUnit"];

BWP.B3_YunKen.Web/Pages/B3YunKen/SaleForecastUpdateList_/SaleForecastUpdateEdit.cs

@@ -400,8 +400,8 @@ namespace BWP.Web.Pages.B3YunKen.SaleForecastUpdateList_ {
               SaleForecast_ID = (long)reader[10],
               GoodsBatch_ID = (long?)reader[11],
               GoodsBatch_Name = (string)reader[12],
-              BrandItem_ID = (long?)reader[11],
-              BrandItem_Name = (string)reader[12]
+              BrandItem_ID = (long?)reader[13],
+              BrandItem_Name = (string)reader[14]
             };
             Details.Add(detail);
           }