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

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

@@ -26,7 +26,8 @@ class NowReportHandle extends Command
     //处理报表预约记录，生成报表文件
     protected function execute(Input $input, Output $output)
     {
-    	    ini_set("memory_limit", "516M");
+    	    $now=date("Y-m-d H:i:s");
+    	    ini_set("memory_limit", "2048M");
             $info = Cache::store('redis')->handler()->rpop($this->key);
         try {
             if ($info) {
@@ -113,9 +114,9 @@ class NowReportHandle extends Command
                         'expiretime' => date('Y-m-d H:i:s', strtotime('+7 day'))
                     ]);
 
-                $output->writeln('【' . $info['id'] . '】该预约记录处理成功');
+                $output->writeln("[$now]".'【' . $info['id'] . '】该预约记录处理成功');
 
-            } else  $output->writeln('没有可供处理的报表预约记录');
+            }
 
         } catch (Exception $exception) {
         	Db::name('exec')
@@ -126,7 +127,7 @@ class NowReportHandle extends Command
 			        'updatetime' => date('Y-m-d H:i:s'),
 			        'expiretime' => date('Y-m-d H:i:s', strtotime('+7 day'))
 		        ]);
-            $output->writeln($exception->getMessage() . '|' . $exception->getFile() . '|' . $exception->getLine());
+            $output->writeln("[$now]".$exception->getMessage() . '|' . $exception->getFile() . '|' . $exception->getLine());
         }
 
     }
@@ -579,7 +580,7 @@ class NowReportHandle extends Command
 		            deliveryPrice AS `物流费`,
 		            goodPrice AS `成本合计`,
 		            totalPrice AS `采购货款`,
-		            tax AS `采购税点`, 
+		            tax/100 AS `采购税点`, 
 				    supplierName AS `供应商名称`,
 					'否'as '是否库存品',
 		            '包邮' as '发货方式',