Merge branch 'master' of 192.168.1.5:BWPB3/B3_DongFangWanQi

B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs

@@ -171,7 +171,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
       form.Controls.Add(_dfContainer);
 
       var panel = new HLayoutPanel();
-      panel.Add(new SimpleLabel("预计库存"));
+      panel.Add(new SimpleLabel("可用与预算合计"));
       var label = new Label();
       label.Font.Size = 14;
       label.Width = 120;

B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateList.cs

@@ -199,7 +199,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools {
 
 
       var idField = (long?)row["GoodsProperty_ID"];
-      var number = ((Money<decimal>?)row["可用库存"]) ?? 0;
+      var number = (( decimal ?)row["可用与预算合计"]) ?? 0;
       var url = AspUtil.UpdateUrlParam("SaleOrderUpdateEdit.aspx", "GoodsProperty_ID", (idField ?? 0).ToString());
       url = AspUtil.UpdateUrlParam(url, "number", number.ToString());
       url = AspUtil.UpdateUrlParam(url, "cacheid", "'+__DFContainer.getValue('$HiddenField01')+'");