Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Purch.php

@@ -597,6 +597,10 @@ class Purch extends Base
         $int= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
         $idinf['can']=$int;
         $idinf['order_type']=$dn['order_type'];
+
+        //取出销售的工差单信息
+        $idinf['diff_info'] = Db::name('sale_diff')->where('cgd_diffid',$id)->find();
+        
        return  app_show(0,"获取成功",$idinf);
 
     }