dkjf

app/admin/controller/Sale.php

@@ -1009,46 +1009,77 @@ class Sale extends BaseController
         $orderCode=isset($this->post['orderCode']) && $this->post['orderCode'] !=="" ? trim($this->post['orderCode'])
             :"";
         if($orderCode !==""){
-            $where[]=['orderCode',"like","%$orderCode%"];
+            $where[]=['a.orderCode',"like","%$orderCode%"];
+        }
+         $order_type=isset($this->post['order_type']) && $this->post['order_type'] !=="" ? trim($this->post['order_type'])
+             :"";
+        if($order_type !==""){
+            $where[]=['a.order_type',"=",$order_type];
+        }
+        $outCode=isset($this->post['outCode']) && $this->post['outCode'] !=="" ? trim($this->post['outCode'])
+            :"";
+        if($outCode !==""){
+            $where[]=['a.outCode',"like","%$outCode%"];
         }
         $apply_name=isset($this->post['apply_name']) && $this->post['apply_name'] !=="" ? trim($this->post['apply_name'])
             :"";
         if($apply_name !==""){
-            $where[]=['apply_name',"like","%$apply_name%"];
+            $where[]=['a.apply_name',"like","%$apply_name%"];
+        }
+        $good_code=isset($this->post['good_code']) && $this->post['good_code'] !=="" ? trim($this->post['good_code'])
+            :"";
+        if($good_code !==""){
+            $where[]=['b.good_code',"like","%$good_code%"];
+        }
+        $good_name=isset($this->post['good_name']) && $this->post['good_name'] !=="" ? trim($this->post['good_name'])
+            :"";
+        if($good_name !==""){
+            $where[]=['b.good_name',"like","%$good_name%"];
         }
         $status=isset($this->post['status']) && $this->post['status'] !=="" ? trim($this->post['status']):"";
         if($status !==""){
-            $where[]=['status',"=",$status];
+            $where[]=['a.status',"=",$status];
         }
         $start = isset($this->post['start']) && $this->post['start'] !=="" ? $this->post['start'] :"";
         if($start !=""){
-            $where[]= ["addtime",'>=',$start];
+            $where[]= ["a.addtime",'>=',$start];
         }
         $end = isset($this->post['end']) && $this->post['end'] !=="" ? $this->post['end'] :"";
         if($end !=""){
-            $where[]= ["addtime",'<=',$end];
+            $where[]= ["a.addtime",'<=',$end];
         }
         $supplierNo =isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
         if($supplierNo!=""){
             $supplier = Db::name("supplier")->where([['code',"like","%$supplierNo%"]])->column('code');
             $wsmcode = Db::name("sale")->where([
                 "is_del"=>0,"supplierNo"=>$supplier])->column("orderCode");
-            $where[]=['orderCode',"in",$wsmcode];
+            $where[]=['b.orderCode',"in",$wsmcode];
         }
-        $count = Db::name('order_out')->where($where)->count();
+        $count = Db::name('order_out')->alias('a')
+            ->join("sale b","b.orderCode=a.orderCode","left")
+            ->join("customer_info v","v.companyNo=b.customer_code","left")
+            //->join("good n","n.good_code=b.good_code","left")
+            ->where($where)->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;
-        $list= Db::name('order_out')->alias('a')->where($where)->order("addtime desc")->page($page,$size)->select();
+        $list= Db::name('order_out')->alias('a')->join("sale b","b.orderCode=a.orderCode","left")
+            ->join("customer_info v","v.companyNo=b.customer_code","left")
+            //->join("good n","n.good_code=b.good_code","left")
+            ->field("a.*,b.good_name,b.good_code,b.supplierNo,b.customer_code,v.companyName")
+            ->where($where)->order("addtime desc")->page($page,$size)->select();
         foreach ($list as $value){
             $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c","k.supplierNo=c.code")
                 ->where(["k.wsm_code"=>$value['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();
             $addr = Db::name("order_addr")->where(["id"=>$value['addrid']])->find();
+            $good =  Db::name("good_type")->alias("b")->join("good a","a.good_code = b.good_code","left")
+                ->where(["type_code"=>$value['good_code']])->field('cat_id')->find();
             $value['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
             $value['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
             $value['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code']:"";
             $value['addr']=isset($addr['addr']) ? $addr['addr']:"";
             $value['contactor']=isset($addr['contactor']) ? $addr['contactor']:"";
             $value['mobile']=isset($addr['mobile']) ? $addr['mobile']:"";
+            $value['can']= isset($good['cat_id']) && $good['cat_id'] !=0 ? made($good['cat_id']):[];
             $data[]=$value;
         }
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
@@ -1062,7 +1093,16 @@ class Sale extends BaseController
         if(empty($codeinfo)){
             return error_show(1002,"未找到出库数据");
         }
-            $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c", "k.supplierNo=c.code")
+        $iem = Db::name("sale")->where(['orderCode'=>$codeinfo['orderCode']])->find();
+        $goon = Db::name('good')->alias('b')->join("good_type a","a.good_code=b.good_code","left")
+            ->where(['a.type_code'=> $iem['good_code']])->find();
+        if(empty($goon)){
+            return error_show(1003,"未找到商品数据");
+        }
+        $int= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
+
+
+        $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c", "k.supplierNo=c.code")
                 ->where(["k.wsm_code" => $codeinfo['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();
             $addr = Db::name("order_addr")->where(["id" => $codeinfo['addrid']])->find();
             $item = Db::name("sale")->where(['orderCode'=>$codeinfo['orderCode']])->find();
@@ -1077,6 +1117,7 @@ class Sale extends BaseController
         $codeinfo['addr_code'] = isset($addr['addr_code']) ? $addr['addr_code'] : "";
         $codeinfo['contactor'] = isset($addr['contactor']) ? $addr['contactor'] : "";
         $codeinfo['mobile'] = isset($addr['mobile']) ? $addr['mobile'] : "";
+        $codeinfo['can']=$int;
         return app_show(0,"获取成功",$codeinfo);
     }
 }