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

app/admin/controller/Sale.php

@@ -347,6 +347,7 @@ class Sale extends Base
 	                            $order = Db::name("order_num")->where(["orderCode" => $orderCode, "status" => 1])->where([["wsend_num", ">=", 0]])
 	                                ->lock(true)->find();
 	                            if ($order == false) {
+	                            	Db::rollback();
 	                                return error_show(1004, "未找到可以发货得采购单数据");
 	                            }
 	                            $order['wsend_num'] -= $num;

app/command/NowReportHandle.php

@@ -580,7 +580,7 @@ class NowReportHandle extends Command
 		            deliveryPrice AS `物流费`,
 		            goodPrice AS `成本合计`,
 		            totalPrice AS `采购货款`,
-		            tax AS `采购税点`, 
+		            tax/100 AS `采购税点`, 
 				    supplierName AS `供应商名称`,
 					'否'as '是否库存品',
 		            '包邮' as '发货方式',