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

app/admin/controller/Purch.php

@@ -678,7 +678,7 @@ class Purch extends Base
         //如果有未处理的工差单，不允许创建新的
         $wait_check = Db::name('purchease_diff')
             ->field('id')
-            ->where(['apply_id'=>$rid,'status'=>1,'is_del'=>0])
+            ->where(['apply_id'=>$rid,'status'=>1,'is_del'=>0,"cgdNo"=>$cgdNo])
             ->find();
 
         if(!empty($wait_check)) return error_show('1005','您还有未处理的工差单，请先处理');

app/admin/controller/Stat.php

@@ -50,6 +50,7 @@ FROM
 			WHERE
 				k.itemid = c.id 
 				AND f.platform_id = a.platform_id 
+			    and f.is_del=0
 				AND DATE_FORMAT( e.addtime, '%Y-%m' ) = DATE_FORMAT( '$endtime', '%Y-%m' )) AS month_thfee,
 		a.platform_id,
 		c.`name`,
@@ -64,6 +65,7 @@ FROM
 		LEFT JOIN wsm_company_item c ON c.id = b.itemid 
 	WHERE
 		DATE_FORMAT( a.addtime, '%Y-%m' ) = DATE_FORMAT( '$endtime', '%Y-%m' ) 
+	    and a.is_del=0
 	GROUP BY
 		a.platform_id,
 		platform_name,
@@ -85,6 +87,7 @@ FROM
 				AND k.STATUS = 1 
 			WHERE
 				k.itemid = c.id 
+			     and f.is_del=0
 				AND f.platform_id = a.platform_id 
 				AND WEEK ( f.addtime, 1 ) = WEEK ( '$endtime', 1 ) 
 				AND DATE_FORMAT ( f.addtime, '%Y' ) = DATE_FORMAT ( '$endtime', '%Y' )) AS week_thfee,
@@ -101,6 +104,7 @@ FROM
 		LEFT JOIN wsm_company_item c ON c.id = b.itemid 
 	WHERE
 		WEEK ( a.addtime, 1 ) = WEEK ( '$endtime', 1 ) 
+	    and a.is_del=0
 	GROUP BY
 		a.platform_id,
 		platform_name,
@@ -123,6 +127,7 @@ FROM
 				AND k.STATUS = 1 
 			WHERE
 				k.itemid = c.id 
+			    and f.is_del=0
 				AND f.platform_id = a.platform_id 
 				AND WEEK ( f.addtime, 1 ) = WEEK ( '$endtime', 1 ) 
 				AND DATE_FORMAT( f.addtime, '%Y-%m-%d' ) = DATE_FORMAT( '$endtime', '%Y-%m-%d' )) AS day_thfee, 
@@ -139,6 +144,7 @@ FROM
 		LEFT JOIN wsm_company_item c ON c.id = b.itemid 
 	WHERE
 		date_format( a.addtime, '%Y-%m-%d' ) = date_format ( '$endtime', '%Y-%m-%d' ) 
+	 and a.is_del=0
 	GROUP BY
 		a.platform_id,
 		platform_name,