Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/abutment/controller/Sale.php

@@ -339,7 +339,7 @@ class Sale extends HomeBaseController
 	                      Db::rollback();
 	                      return error_show(1004,"库存bn数据新增失败");
 	                 }
-	                 $bnup =GoodStockInfo::OrderBn($outinfo['orderCode'],$stokc["id"],$outinfo['send_num']);
+	                 $bnup =GoodStockInfo::OrderBn($outinfo['orderCode'],$stokc["id"],$outinfo['send_num'],0);
 	                 if($bnup==false){
 	                      Db::rollback();
 	                      return error_show(1004,"库存bn库存数更新失败");
@@ -534,7 +534,7 @@ class Sale extends HomeBaseController
 			                      Db::rollback();
 			                      return error_show(1004,"库存bn数据新增失败");
 			                 }
-			                 $bnup =GoodStockInfo::OrderBn($order_out_infos[$value['outCode']]['orderCode'],$stock["id"],$order_out_infos[$value['outCode']]['send_num']);
+			                 $bnup =GoodStockInfo::OrderBn($order_out_infos[$value['outCode']]['orderCode'],$stock["id"],$order_out_infos[$value['outCode']]['send_num'],0);
 			                 if($bnup==false){
 			                      Db::rollback();
 			                      return error_show(1004,"库存bn库存数更新失败");