ad

app/admin/controller/Good.php

@@ -17,7 +17,7 @@ class Good extends Base
 	 */
     public function list(){
     	$param=$this->request->param(["spuCode"=>"","status"=>"","good_name"=>"",'companyNo'=>'','relaComNo'=>'',
-    	'supplierNo'=>'','cgd_supplierNo'=>'','creater'=>'','isZx'=>'','isCombind'=>'','isChange'=>'',"cat_diff"=>"",
+    	'supplierNo'=>'','cgd_supplierNo'=>'','creater'=>'','isZx'=>'','isChild'=>0,'isCombind'=>'','isChange'=>'',"cat_diff"=>"",
     	"tax_diff"=>"","is_diff"=>"","start"=>"",'end'=>'','page'=>'1','size'=>'15'],"post","trim");
     	$where=[];
     	$param["spuCode"]==""?: $where[]=['spuCode','like',"%{$param['spuCode']}%"];
@@ -28,7 +28,8 @@ class Good extends Base
     	$param['cgd_supplierNo']==''?: $where[]=['cgd_supplierNo','like',"%{$param['cgd_supplierNo']}%"];
     	$param["creater"]==""?: $where[]=['creater','like',"%{$param['creater']}%"];
     	$param["status"]===""?: $where[]=['status','=',$param['status']];
-    	$param["isZx"]==""?: $where[]=['isZx','=',$param['isZx']];
+    	$param["isZx"]===""?: $where[]=['isZx','=',$param['isZx']];
+    	$param["isChild"]==""?: $where[]=['isChild','=',$param['isChild']];
     	$param["isCombind"]==""?: $where[]=['isCombind','=',$param['isCombind']];
     	$param["isChange"]===""?: $where[]=['isChange','=',$param['isChange']];
     	$param["is_diff"]==""?: $where[]=['cat_diff|tax_diff','=',2];
@@ -75,14 +76,12 @@ class Good extends Base
             $tax= $item['tax'];
         	$item['tax'] = bcdiv(str_replace('%', '', $item['tax']), "100", 2);
         	if($param['status']==1){
-//        		if($good->cgd_to_pay)$this->error("商品{$item['spuCode']}已参与采购付款回票对账");
         	    $temp["cgd_inv_cat_code"]=$catArr[$item['cat_code']]['merge_code'];
         	    $temp["cgd_inv_cat_name"]=$catArr[$item['cat_code']]['short_name'];
         	    $temp["cgd_inv_good_name"]= $item['inv_good_name'];
         	    $temp["cgd_inv_tax"]= $item['tax'];
         	}
         	if($param['status']==2){
-//        	    if($good->qrd_to_pay)$this->error("商品{$item['spuCode']}已参与销售回款开票结算");
         	    $check = CheckTax($item['is_discount'],$item['tax'],$item['inv_tag'],$item['addTax'],$message);
         	    if($check==false)$this->error("商品{$item['spuCode']}{$message}");
         	    $temp['inv_cat_code']=$catArr[$item['cat_code']]['merge_code'];
@@ -125,7 +124,7 @@ class Good extends Base
     //导出列表
     public function exportDiff(){
     	$param=$this->request->param(['spuCode'=>'','status'=>'','good_name'=>'','companyNo'=>'','supplierNo'=>'','relaComNo'=>'',
-    	'cgd_supplierNo'=>'','creater'=>'','isZx'=>'','cat_diff'=>'','tax_diff'=>'',"start"=>"",'end'=>'','is_diff'=>''],
+    	'cgd_supplierNo'=>'','creater'=>'','isZx'=>'','cat_diff'=>'','tax_diff'=>'','isChild'=>0,"start"=>"",'end'=>'','is_diff'=>''],
     	'post','trim');
     	ini_set('memory_limit' , '-1');
     	$where=[];
@@ -138,6 +137,7 @@ class Good extends Base
     	$param['creater']==''?: $where[]=['creater','like',"%{$param['creater']}%"];
     	$param['status']===''?: $where[]=['status','=',$param['status']];
     	$param['isZx']==''?: $where[]=['isZx','=',$param['isZx']];
+    	$param['isChild']==''?: $where[]=['isChild','=',$param['isChild']];
     	$param['is_diff']==''?: $where[]=['cat_diff|tax_diff','=',2];
     	$param['cat_diff']==''?: $where[]=['cat_diff','=',$param['cat_diff']];
     	$param['tax_diff']==''?: $where[]=['tax_diff','=',$param['tax_diff']];
@@ -155,7 +155,7 @@ class Good extends Base
     public function export(){
 		ini_set('memory_limit' , '-1');
 		$param=$this->request->param(['spuCode'=>'','status'=>'','good_name'=>'','companyNo'=>'','supplierNo'=>'',
-		'cgd_supplierNo'=>'','relaComNo'=>'','creater'=>'','isZx'=>'','isChange'=>'','cat_diff'=>'','tax_diff'=>'',
+		'cgd_supplierNo'=>'','relaComNo'=>'','creater'=>'','isZx'=>'','isChild'=>0,'isChange'=>'','cat_diff'=>'','tax_diff'=>'',
 		'is_diff'=>'','start'=>'','end'=>''],'post','trim');
     	$where=[];
     	$param['spuCode']==''?: $where[]=['spuCode','like',"%{$param['spuCode']}%"];
@@ -167,6 +167,7 @@ class Good extends Base
     	$param['creater']==''?: $where[]=['creater','like',"%{$param['creater']}%"];
     	$param['status']===''?: $where[]=['status','=',$param['status']];
     	$param['isZx']==''?: $where[]=['isZx','=',$param['isZx']];
+    	$param['isChild']===''?: $where[]=['isChild','=',$param['isChild']];
     	$param['isChange']===''?: $where[]=['isChange','=',$param['isChange']];
     	$param['is_diff']==''?: $where[]=['cat_diff|tax_diff','=',2];
     	$param['cat_diff']==''?: $where[]=['cat_diff','=',$param['cat_diff']];
@@ -174,9 +175,14 @@ class Good extends Base
     	$param['start']==''?: $where[]=['addtime','>=',date('Y-m-d 00:00:00',strtotime($param['start']))];
     	$param['end']==''?: $where[]=['addtime','<=',date('Y-m-d 23:59:59',strtotime($param['end']))];
 		$header=['商品编码','卖出方公司编号','卖出方公司','买入方公司编号','买入方公司','商品名称','采购类目编码','采购类目名称','采购开票商品名称',
-		'财务类目编码','财务类目名称','财务开票商品名称','状态','增值税管理内容','创建人','创建时间','源头供应商编号',"源头供应商"];
-		$list= $this->model->export($where,['spuCode','supplierNo','supplierName','companyNo','companyName','good_name','cgd_inv_cat_code','cgd_inv_cat_name','
-		cgd_inv_good_name','inv_cat_code','inv_cat_name','inv_good_name','status','addTax','creater','addtime',"cgd_supplierNo",'cgd_supplierName']);
+		'财务类目编码','财务类目名称','财务开票商品名称','状态','增值税管理内容','创建人','创建时间'];
+		$field=['spuCode','supplierNo','supplierName','companyNo','companyName','good_name','cgd_inv_cat_code','cgd_inv_cat_name','
+				cgd_inv_good_name','inv_cat_code','inv_cat_name','inv_good_name','status','addTax','creater','addtime'];
+		if($param['isChild']==1){
+			$field=['spuCode','cgd_supplierNo','cgd_supplierName','supplierNo','supplierName','good_name','cgd_inv_cat_code','cgd_inv_cat_name','
+			cgd_inv_good_name','inv_cat_code','inv_cat_name','inv_good_name','status','addTax','creater','addtime'];
+		}
+		$list= $this->model->export($where,$field);
 		excelExport('结算类目设置导出表',$header,$list);
 	}
     /**

app/command/good.php

@@ -63,6 +63,7 @@ class good extends Command
 					"unit_name"=>$v['good_unit'],
 					"isZx"=>$v['isZx'],
 					"isCombind"=>$v['is_combind'],
+					"isChild"=>$v['isChild'],
 					"cgd_supplierNo"=>$v['cgd_supplier_code'],
 					"cgd_supplierName"=>$v['cgd_supplier_name'],
 					"exam_info"=>"",
@@ -90,7 +91,7 @@ class good extends Command
             ->withAttr("good_unit",function ($m){
             	return Db::connect('mysql_wsm')->name('unit')->where("id",$m)->value("unit","");
             })->field("spuCode,good_name,cat_id,good_unit,craft_desc,after_sales,supplierNo,companyNo,supplierName,companyName,good_img,
-            good_info_img,good_thumb_img,creater,createrid,is_stock,0 isZx,is_combind,cgd_supplier_code,cgd_supplier_name")
+            good_info_img,good_thumb_img,creater,createrid,is_stock,0 isZx,is_combind,cgd_supplier_code,cgd_supplier_name,isChild")
             ->where("updatetime",">=", $this->date)
             ->where("status","=", 1)
             ->select()->toArray();
@@ -107,7 +108,7 @@ class good extends Command
             	return Db::connect('mysql_wsm')->name('unit')->where("id",$v)->value("unit","");
             })
             ->field("spuCode,good_name,craft_desc,'' after_sales,cat_id,good_unit,supplierNo,companyNo,supplierName,companyName,good_img,
-            good_info_img,good_thumb_img,creater,createrid,0 is_stock,1 isZx,is_combind,cgd_supplier_code,cgd_supplier_name")
+            good_info_img,good_thumb_img,creater,createrid,0 is_stock,1 isZx,is_combind,cgd_supplier_code,cgd_supplier_name,isChild")
             ->where("addtime",">=", $this->date)
             ->select()->toArray();
     	     return $this->addGood($list);