ad

app/admin/controller/ComonOrder.php

@@ -3,8 +3,8 @@ declare (strict_types = 1);
 
 namespace app\admin\controller;
 
-use app\admin\model\CgdInfo;use app\admin\model\CompanyInfo;
-use app\admin\model\InvoiceGood;
+use app\admin\model\CgdInfo;
+use app\admin\model\CompanyInfo;
 use app\admin\model\InvoicePay;
 use app\admin\model\InvoicePool;
 use app\admin\model\InvoicePoolInfo;
@@ -30,7 +30,7 @@ class ComonOrder extends Base
     public function __construct(App $app) {
     	parent::__construct($app);
     	$this->model = new \app\admin\model\ComonOrder();
-    	 $invoice =Config::get('invoiceType');
+    	$invoice =Config::get('invoiceType');
         $this->invoiceType = $invoice['invoiceName'];
         $this->invName = $invoice['invoiceType'];
         $this->typename = $invoice['KingName'];
@@ -39,7 +39,8 @@ class ComonOrder extends Base
     
     public function list(){
         $post = $this->request->only(["start"=>"","end"=>"","cxCode"=>"","orderCode"=>[],"customerNo"=>"",
-        'cgd_status'=>'',"companyNo"=>"",'status'=>[],'relaComNo'=>'','platform_type'=>'','inv_status'=>'','pay_status'=>'', 'page'=>1,'size'=>15],"post","trim");
+        'cgd_status'=>'',"companyNo"=>"",'status'=>[],'relaComNo'=>'','platform_type'=>'','inv_status'=>'',
+        'pay_status'=>'',"good_status"=>"", 'page'=>1,'size'=>15],"post","trim");
         $where=[["qrd.is_del","=",0],['cgd.is_del','=',0],['qrd.totalPrice','<>',0],['cgd.totalPrice','<>',0]];
         $post['start']==''?:$where[]=["comon_order.addtime",">=",date("Y-m-d 00:00:00",strtotime($post['start']))];
         $post['end']==''?:$where[]=["comon_order.addtime","<=",date("Y-m-d 23:59:59",strtotime($post['end']))];
@@ -53,7 +54,8 @@ class ComonOrder extends Base
         $post['cgd_status']===''?:$where[]=['cgd.cgd_status','=',$post['cgd_status']];
         $post['companyNo']==''?:$where[]=["comon_order.companyNo|comon_order.supplierNo","=",$post['companyNo']];
         $post['relaComNo']==''?:$where[]=["comon_order.companyNo|comon_order.supplierNo|comon_order.customerNo","=", $post['relaComNo']];
-        $list=$this->model->withJoin(["qrd","cgd"],"left")->where($where)
+        $post['good_status']===''?:$where[]=["good.status","=",$post['good_status']];
+        $list=$this->model->withJoin(["qrd","cgd","good"],"left")->where($where)
         ->order("id desc")->paginate (["page"=>$post['page'],"list_rows"=>$post['size']]);
         $this->success("0",["list"=>$list->items(),"count"=>$list->total()]);
     }

app/admin/controller/Sale.php

@@ -6,7 +6,6 @@ namespace app\admin\controller;
 use app\admin\model\CgdInfo;use app\admin\model\InvoicePool;use app\admin\model\Pay;use app\admin\model\QrdInfo;use app\admin\model\TradePool;use think\App;
 use think\facade\Db;use think\facade\Validate;
 class Sale extends Base{
-	#public $novalidate=["*"];
     public function __construct(App $app) {parent::__construct($app);}
     /** 获取列表
     * @return \think\response\Json|void
@@ -71,15 +70,6 @@ class Sale extends Base{
         	}
         }
 
-       $apayIs =  isset($post['apay_is'])&&$post['apay_is']!==''?intval($post['apay_is']):'';
-        if($apayIs!==''){
-        	if($apayIs==1){
-        		$condition[]=['a.apay_fee','<>',0];
-        	}else{
-        		$condition[]=['a.apay_fee','=',0];
-        	}
-        }
-
         $pay_status =  isset($post['pay_status'])&&$post['pay_status']!==''?intval($post['pay_status']):'';
         if($pay_status!==''){
         	if($pay_status==0){
@@ -97,6 +87,10 @@ class Sale extends Base{
                  $condition[]=["a.status","=",$status];
             }
 
+        }
+        $poCode = isset($post['poCode']) && $post['poCode'] !== '' ? trim($post['poCode']) : '';
+        if ($poCode !== '') {
+            $condition[] = ['a.poCode', 'like', "%$poCode%"];
         }
          $qrdNo =  isset($post['sequenceNo'])&&$post['sequenceNo']!=''?trim($post['sequenceNo']):'';
         if($qrdNo!==''){
@@ -131,13 +125,7 @@ class Sale extends Base{
             $condition[]=["a.platform_type","=",$platform_type];
         }
 
-       $poCode =  isset($post['poCode'])&&$post['poCode']!==''?trim($post['poCode']):'';
-        if($poCode!==''){
-            $condition[]=["a.poCode","like","%$poCode%"];
-        }
-
-
-       $saler= isset($post['saler']) && $post['saler']!='' ? trim($post['saler']) :"";
+          $saler= isset($post['saler']) && $post['saler']!='' ? trim($post['saler']) :"";
         if($saler!='') $condition []=["a.ownerName","like","%$saler%"];
         $salerid= isset($post['salerid']) && $post['salerid']!='' ? intval($post['salerid']) :"";
         if($salerid!='') $condition []=["a.ownerid","=",$salerid];
@@ -266,14 +254,6 @@ class Sale extends Base{
         		$condition[]=["a.wpay_fee","=",0];
         	}
         }
-//        $apayIs =  isset($post['apay_is'])&&$post['apay_is']!==''?intval($post['apay_is']):'';
-//        if($apayIs!==''){
-//            if($apayIs==1){
-//                $condition[]=['a.apay_fee','<>',0];
-//            }else{
-//                $condition[]=['a.apay_fee','=',0];
-//            }
-//        }
 
         $pay_status =  isset($post['pay_status'])&&$post['pay_status']!==''?intval($post['pay_status']):'';
         if($pay_status!==''){
@@ -326,7 +306,7 @@ class Sale extends Base{
             $condition[]=["a.platform_type","=",$platform_type];
         }
 
-          $saler= isset($post['saler']) && $post['saler']!='' ? trim($post['saler']) :"";
+        $saler= isset($post['saler']) && $post['saler']!='' ? trim($post['saler']) :"";
         if($saler!='') $condition []=["a.ownerName","like","%$saler%"];
         $salerid= isset($post['salerid']) && $post['salerid']!='' ? intval($post['salerid']) :"";
         if($salerid!='') $condition []=["a.ownerid","=",$salerid];
@@ -344,6 +324,10 @@ class Sale extends Base{
 			if($tag_id==3)  $condition[]=["a.pay_tag|inv_tag","=",1];
 			if($tag_id==4)  $condition[]=["a.pay_tag&inv_tag","=",1];
         }
+       $poCode = isset($post['poCode']) && $post['poCode'] !== '' ? trim($post['poCode']) : '';
+              if ($poCode !== '') {
+                  $condition[] = ['a.poCode', 'like', "%$poCode%"];
+              }
          $cat_status= isset($post['cat_status'])&&$post['cat_status']!=="" ? intval($post['cat_status']) :"";
          if($cat_status!=='') $condition[]=["b.status","=",$cat_status];
         $list =Db::name("qrd_info")->alias("a")

app/admin/model/ComonOrder.php

@@ -24,6 +24,9 @@ class ComonOrder extends Model
    
    public function Cgd(){
    	 return $this->belongsTo(CgdInfo::class,'cgdNo','sequenceNo');
+   }
+   public function Good(){
+   	 return $this->belongsTo(Good::class,'goodNo','spuCode');
    }
     // 检测是否已经取消
    public static function CheckCxCode($code){