Browse Source

阶段提交,销售、采购模块加supplierNo筛选字段

wufeng 2 years ago
parent
commit
8d4877ef19

+ 2 - 2
app/admin/controller/After.php

@@ -216,8 +216,8 @@ class After extends Base
             $where[]=['a.customer_code',"like", "%{$customer_code}%"];
         }
 
-        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']) :"";
-        if($relaComNo!='') $where[]=['a.customer_code',"=", $relaComNo];
+//        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']) :"";
+//        if($relaComNo!='') $where[]=['a.customer_code',"=", $relaComNo];
 
         $except_code = isset($this->post['except_code']) && $this->post['except_code']!="" ? trim($this->post['except_code']):"";
         if($except_code!=""){

+ 13 - 20
app/admin/controller/Check.php

@@ -36,26 +36,24 @@ public function __construct(App $app)
 //    if($good_code!=""){
 //        $condtion[]=['b.type_code',"=",$good_code];
 //    }
-        $goodcode = isset($this->post['good_code']) && $this->post['good_code'] !== "" ? trim($this->post['good_code'])
-            : "";
+        $goodcode = isset($this->post['good_code']) && $this->post['good_code'] !== "" ? trim($this->post['good_code']) : "";
         if ($goodcode != "") {
             // $condtion['a.good_code'] = Db::raw("like '%{$goodcode}%'");
             $condtion[] = ['b.spuCode', "like", "%{$goodcode}%"];
         }
-        $good_name = isset($this->post['good_name']) && $this->post['good_name'] !== "" ? trim($this->post['good_name'])
-            : "";
+        $good_name = isset($this->post['good_name']) && $this->post['good_name'] !== "" ? trim($this->post['good_name']) : "";
         if ($good_name != "") {
             //  $condtion['a.good_name'] = Db::raw("like '%{$good_name}%'");
             $condtion[] = ['b.good_name', "like", "%{$good_name}%"];
         }
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
         if ($supplierNo != "") {
-            $supplier = Db::name("supplier")->where(["code" => $supplierNo])->find();
-            if (empty($supplier)) {
-                return error_show(1004, "未找到供应商信息");
-            }
-            $wsmcode = Db::name("warehouse_info")->where(["is_del" => 0, "supplierNo" => $supplierNo])->column("wsm_code");
-            $condtion[] = ['c.wsm_code', "in", $wsmcode];
+//            $supplier = Db::name("supplier")->where(["code" => $supplierNo])->find();
+//            if (empty($supplier)) {
+//                return error_show(1004, "未找到供应商信息");
+//            }
+//            $wsmcode = Db::name("warehouse_info")->where(["is_del" => 0, "supplierNo" => $supplierNo])->column("wsm_code");
+            $condtion[] = ['b.supplierNo', "=", $wsmcode];
         }
         $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
         if ($companyNo !== "") {
@@ -69,28 +67,23 @@ public function __construct(App $app)
             $condition[] = ["c.wsm_code", "in", $wsmcode];
         }
 
-        $stock_low = isset($this->post['stock_low']) && $this->post['stock_low'] !== "" ? intval($this->post['stock_low'])
-            : "";
+        $stock_low = isset($this->post['stock_low']) && $this->post['stock_low'] !== "" ? intval($this->post['stock_low']) : "";
         if ($stock_low != "") {
             $condtion[] = ['c.usable_stock', ">=", $stock_low];
         }
-        $stock_max = isset($this->post['stock_max']) && $this->post['stock_max'] !== "" ? intval($this->post['stock_max'])
-            : "";
+        $stock_max = isset($this->post['stock_max']) && $this->post['stock_max'] !== "" ? intval($this->post['stock_max']) : "";
         if ($stock_max != "") {
             $condtion[] = ['c.usable_stock', ">=", $stock_max];
         }
-        $stock_up = isset($this->post['stock_up']) && $this->post['stock_up'] !== "" ? trim($this->post['stock_up'])
-            : "";
+        $stock_up = isset($this->post['stock_up']) && $this->post['stock_up'] !== "" ? trim($this->post['stock_up']) : "";
         if ($stock_up != "") {
             $condtion[] = ['c.usable_stock', "<=", $stock_up];
         }
-        $warn_low = isset($this->post['warn_low']) && $this->post['warn_low'] !== "" ? intval($this->post['warn_low'])
-            : "";
+        $warn_low = isset($this->post['warn_low']) && $this->post['warn_low'] !== "" ? intval($this->post['warn_low']) : "";
         if ($warn_low !== "") {
             $condtion[] = ['c.warn_stock', ">=", $warn_low];
         }
-        $warn_up = isset($this->post['warn_up']) && $this->post['warn_up'] !== "" ? intval($this->post['warn_up'])
-            : "";
+        $warn_up = isset($this->post['warn_up']) && $this->post['warn_up'] !== "" ? intval($this->post['warn_up']) : "";
         if ($warn_up != "") {
             $condtion[] = ['c.warn_stock', "<=", $warn_up];
         }

+ 19 - 10
app/admin/controller/Consult.php

@@ -2116,7 +2116,6 @@ class Consult extends Base
 
         $count=Db::name("bargain_order")
             ->alias('bo')
-            ->leftJoin("depart_user u", "u.uid=bo.createrid AND u.is_del=0")
             ->where($where)
             ->count();
 
@@ -2235,12 +2234,21 @@ class Consult extends Base
 //        if(!empty($role['platform']) ){
 //            $where[]=["b.platform_code","in",$role['platform']];
 //        }
-        $count = Db::name('consult_info')->alias("a")->leftJoin("consult_order b","a.zxNo=b.zxNo")->where($where)
+        $count = Db::name('consult_info')
+            ->alias("a")
+            ->leftJoin("consult_order b","a.zxNo=b.zxNo")
+            ->where($where)
             ->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
-        $list =Db::name('consult_info')->alias("a")->leftJoin("consult_order b","a.zxNo=b.zxNo")->where($where)->page($page,$size)
-            ->field("a.*,b.createrid,b.creater,b.is_project,b.projectNo,b.khNo,b.endtime,b.platform_code,b.saleid,b.salesman,b.depart")->select();
+        $list =Db::name('consult_info')
+            ->alias("a")
+            ->leftJoin("consult_order b","a.zxNo=b.zxNo")
+            ->where($where)
+            ->page($page,$size)
+            ->field("a.*,b.createrid,b.creater,b.is_project,b.projectNo,b.khNo,b.endtime,b.platform_code,b.saleid,b.salesman,b.depart")
+            ->select()
+            ->toArray();
         $data=[];
         foreach ($list as $value){
             $value['can']= isset($value['cat_id']) && $value['cat_id'] !=0 ? made($value['cat_id']):[];
@@ -2301,13 +2309,13 @@ class Consult extends Base
         }
         $is_own = isset($this->post['is_own']) ? intval($this->post['is_own']) : "0";
         if ($is_own == 1) {
-            $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-            if ($token == "") return error_show(101, 'token不能为空');
+//            $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+//            if ($token == "") return error_show(101, 'token不能为空');
 
-            $apply_id = GetUserInfo($token);
-            if (empty($apply_id) || $apply_id['code'] != 0) return error_show(1002, "申请人数据不存在");
+//            $apply_id = GetUserInfo($token);
+//            if (empty($apply_id) || $apply_id['code'] != 0) return error_show(1002, "申请人数据不存在");
 
-            $rm = isset($apply_id["data"]['id']) ? $apply_id["data"]['id'] : "";
+            $rm = $this->uid;//isset($apply_id["data"]['id']) ? $apply_id["data"]['id'] : "";
             $where[] = ['cb.createrid', "=", $rm];
         }
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
@@ -2319,10 +2327,11 @@ class Consult extends Base
         $supplierName = isset($this->post['supplierName']) && $this->post['supplierName'] !== "" ? trim($this->post['supplierName']) : "";
         if ($supplierName !== "") $where[] = ["s.name", 'like', '%' . $supplierName . '%'];
 
+        $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
+        if ($supplierNo !== "") $where[] = ["cb.supplierNo", '=', $supplierNo];
 
         $count = Db::name('consult_bids')
             ->alias('cb')
-            ->leftJoin("depart_user u", "u.uid=cb.createrid AND u.is_del=0")
             ->leftJoin("consult_info c", "c.infoNo=cb.infoNo")
             ->leftJoin('supplier s', 's.code=cb.supplierNo')
             ->where($where)

+ 21 - 18
app/admin/controller/Good.php

@@ -660,11 +660,11 @@ class Good extends Base
         if($wsm_code!==""){
             $condition[]=["gs.wsm_code","=",$wsm_code];
         }
-        $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
-        if($suplierNo!==""){
-            $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
-            $condition[]=["gs.wsm_code","in",$wsmcode];
-        }
+//        $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
+//        if($suplierNo!==""){
+//            $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
+//            $condition[]=["gs.wsm_code","in",$wsmcode];
+//        }
         $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
         if ($companyNo !== "") {
             $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
@@ -778,9 +778,13 @@ class Good extends Base
         }
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
-        if($relaComNo!="") $where[]=['b.supplierNo','=', $relaComNo];
+        if($relaComNo!="") $where[]=['b.companyNo','=', $relaComNo];
 
-        $count = Db::name("good")->alias("b")
+        $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo']!="" ? trim($this->post['supplierNo']):"";
+        if($supplierNo!=="") $where[]=['b.supplierNo','=', $supplierNo];
+
+        $count = Db::name("good")
+            ->alias("b")
             ->join("good_stock c","c.spuCode = b.spuCode","left")
             ->leftJoin("warehouse_info a","a.wsm_code=c.wsm_code")
             ->where($condition)
@@ -875,11 +879,9 @@ class Good extends Base
             //$condition["gs.wsm_code"] = $wsm_code;
             $condition[]=["gs.wsm_code","=",$wsm_code];
         }
-//        $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']) :"";
-//        if($suplierNo!==""){
-//            $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
-//            $condition[]=["gs.wsm_code","in",$wsmcode];
-//        }
+        $supplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']) :"";
+        if($supplierNo!=="") $condition[]=["whi.supplierNo","=",$supplierNo];
+
 //        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
 //        if ($companyNo !== "") {
 //            // $where['khNo'] = $khNo;
@@ -890,7 +892,7 @@ class Good extends Base
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
         if($relaComNo!="") {
             $wsmcode = Db::name("warehouse_info")
-                ->where(['supplierNo|companyNo'=>$relaComNo,"is_del"=>0])
+                ->where(['companyNo'=>$relaComNo,"is_del"=>0])
                 ->column("wsm_code");
             $condition[]=["gs.wsm_code","in",$wsmcode];
         }
@@ -967,10 +969,11 @@ class Good extends Base
 
 //        $supplierNo =isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
         if($param['supplierNo']!=""){
-            $supplier = Db::name("supplier")->where(["code"=>$param['supplierNo']])->find();
-            if(empty($supplier)) return error_show(1004,"未找到供应商信息");
-            $wsmcode = Db::name("warehouse_info")->where(["is_del"=>0,"supplierNo"=>$param['supplierNo']])->column("wsm_code");
-            $where[]=['b.wsm_code',"in",$wsmcode];
+//            $supplier = Db::name("supplier")->where(["code"=>$param['supplierNo']])->find();
+//            if(empty($supplier)) return error_show(1004,"未找到供应商信息");
+//            $wsmcode = Db::name("warehouse_info")->where(["is_del"=>0,"supplierNo"=>$param['supplierNo']])->column("wsm_code");
+//            $where[]=['b.wsm_code',"in",$wsmcode];
+            $where[]=['c.supplierNo',"=",$param['supplierNo']];
         }
 //        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
         if ($param['companyNo'] !== "") {
@@ -980,7 +983,7 @@ class Good extends Base
 
         if ($param['relaComNo'] != '') {
             $wsmcode = Db::name("warehouse_info")
-                ->where(['supplierNo|companyNo' => $param['relaComNo'], "is_del" => 0])
+                ->where(['companyNo' => $param['relaComNo'], "is_del" => 0])
                 ->column("wsm_code");
             $where[] = ["b.wsm_code", "in", $wsmcode];
         }

+ 2 - 2
app/admin/controller/Orderback.php

@@ -46,8 +46,8 @@ class Orderback extends Base
             $where[]=['customer_code',"like", "%{$customer_code}%"];
         }
 
-        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
-        if($relaComNo!="") $where[]=['customer_code','=', $relaComNo];
+//        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
+//        if($relaComNo!="") $where[]=['customer_code','=', $relaComNo];
 
         $order_code = isset($this->post['order_code']) && $this->post['order_code']!="" ? trim($this->post['order_code']):"";
         if($order_code!=""){

+ 2 - 2
app/admin/controller/Purch.php

@@ -74,7 +74,7 @@ class Purch extends Base
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo']!="" ? trim($this->post['supplierNo']) :"";
         if($supplierNo!==""){
             // $where['good_code'] = Db::raw(" like %{$good_code}%");
-            $where[]=['po.supplierNo',"like", "%{$supplierNo}%"];
+            $where[]=['po.supplierNo',"=", $supplierNo];
         }
         $wsm_supplierNo = isset($this->post['wsm_supplierNo']) && $this->post['wsm_supplierNo']!="" ? trim($this->post['wsm_supplierNo']) :"";
         if($wsm_supplierNo!==""){
@@ -116,7 +116,7 @@ class Purch extends Base
         if ($supplier_name != '') $where[] = ['po.supplier_name', 'like', '%' . $supplier_name . '%'];
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
-        if ($relaComNo !== "") $where[] = ['po.supplierNo|po.companyNo', '=', $relaComNo];
+        if ($relaComNo !== "") $where[] = ['po.companyNo', '=', $relaComNo];
 
 //		$whereor=[];
 //        if(!empty($role['write'])){

+ 15 - 9
app/admin/controller/Purchin.php

@@ -79,13 +79,16 @@ class Purchin extends Base
         }
         $supplierNo =isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
         if($supplierNo!==""){
-            $supplier = Db::name("supplier")->where(["code"=>$supplierNo])->find();
-            if(empty($supplier)){
-                return error_show(1004,"未找到供应商信息");
-            }
-            $wsmcode = Db::name("warehouse_info")->where([
-                "is_del"=>0,"supplierNo"=>$supplierNo])->column("wsm_code");
-            $where[]=['a.wsm_code',"in",$wsmcode];
+//            $supplier = Db::name("supplier")->where(["code"=>$supplierNo])->find();
+//            if(empty($supplier)){
+//                return error_show(1004,"未找到供应商信息");
+//            }
+            //不再根据供应商筛选仓库,要筛选仓库只能是业务公司
+//            $wsmcode = Db::name("warehouse_info")
+//                ->where(["is_del"=>0,"supplierNo"=>$supplierNo])
+//                ->column("wsm_code");
+//            $where[]=['a.wsm_code',"in",$wsmcode];
+            $where[]= ["b.supplierNo",'=',$supplie];
         }
         $condition=[];
         $role = $this->checkDataShare();
@@ -103,7 +106,7 @@ class Purchin extends Base
         if ($company_name !== "") $where[] = ["a.apply_id", 'in', get_company_item_user_by_name($company_name)];
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
-        if($relaComNo!=='') $where[]=['b.supplierNo|b.companyNo','=', $relaComNo];
+        if($relaComNo!=='') $where[]=['b.companyNo','=', $relaComNo];
 
         //$count = Db::name('purchease_in')->alias('a')->join("purchease_order b","b.cgdNo=a.cgdNo","left")
         $count = Db::name('purchease_in')
@@ -1373,7 +1376,10 @@ class Purchin extends Base
         }
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
-        if($relaComNo!='') $where[]=['b.supplierNo|b.companyNo','=', $relaComNo];
+        if($relaComNo!='') $where[]=['b.companyNo','=', $relaComNo];
+
+        $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] != "" ? trim($this->post['supplierNo']) : "";
+        if ($supplierNo != '') $where[] = ['b.supplierNo', '=', $supplierNo];
 
 //        $role = $this->checkDataShare();
 //        if (!empty($role[DataGroupModel::$type_全部])) $where[] = ["a.apply_id", "in", $role[DataGroupModel::$type_全部]];

+ 5 - 3
app/admin/controller/Reorder.php

@@ -438,8 +438,11 @@ class Reorder extends Base
             $where[] = ['b.skuCode', "like", "%{$skuCode}%"];
         }
 
-        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
-        if ($relaComNo != "") $where[] = ['b.customer_code|b.supplierNo', '=', $relaComNo];
+//        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
+//        if ($relaComNo != "") $where[] = ['b.customer_code|b.supplierNo', '=', $relaComNo];
+
+        $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] != "" ? trim($this->post['supplierNo']) : "";
+        if ($supplierNo != "") $where[] = ['b.supplierNo', '=', $supplierNo];
 
         $condition=[];
 //        $role=$this->checkRole();
@@ -469,7 +472,6 @@ class Reorder extends Base
 
         $count=Db::name("sale_return")
             ->alias('sr')
-            ->leftJoin("depart_user u", "u.uid=sr.apply_id AND u.is_del=0")
             ->leftJoin("sale b", "b.orderCode=sr.orderCode AND b.is_del=0")
             ->where($where)
             ->where(function ($query)use ($condition){$query->whereOr($condition);})

+ 4 - 2
app/admin/controller/Resign.php

@@ -99,14 +99,16 @@ class Resign extends Base
         if ($company_name !== "") $where[] = ["p.apply_id", 'in', get_company_item_user_by_name($company_name)];
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
-        if ($relaComNo !== "") $where[] = ["p.companyNo|p.supplierNo", '=', $relaComNo];
+        if ($relaComNo !== "") $where[] = ["p.companyNo", '=', $relaComNo];
+
+        $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
+        if ($supplierNo !== "") $where[] = ["p.supplierNo", '=', $supplierNo];
 
 //        if(!empty($role['platform']) ){
 //            $where[]=["p.platform_id","in",$role['platform']];
 //        }
         $count=Db::name("purchease")
             ->alias('p')
-            ->leftJoin("depart_user u", "u.uid=p.apply_id AND u.is_del=0")
             ->where($where)
             ->where(function ($query)use ($condition){$query->whereOr($condition);})
             ->count();

+ 8 - 7
app/admin/controller/Sale.php

@@ -2153,11 +2153,11 @@ class Sale extends Base
         }
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
         if ($supplierNo !== "") {
-            $where[] = ['s.supplierNo', "like", "%$supplierNo%"];
+            $where[] = ['s.supplierNo', "=", $supplierNo];
         }
 
-        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
-        if ($relaComNo !== '') $where[] = ['s.supplierNo|s.customer_code', '=', $relaComNo];
+//        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
+//        if ($relaComNo !== '') $where[] = ['s.customer_code', '=', $relaComNo];
 
         $ordertype = isset($this->post['order_type']) && $this->post['order_type'] !== "" ? intval($this->post['order_type']) : "";
         if ($ordertype !== "") {
@@ -2197,7 +2197,6 @@ class Sale extends Base
 //        }
         $count = Db::name('sale')
             ->alias('s')
-            ->leftJoin("depart_user u", "u.uid=s.apply_id AND u.is_del=0")->where($where)
             ->where($where)
             ->count();
         $total = ceil($count / $size);
@@ -3502,8 +3501,11 @@ class Sale extends Base
 
         }
 
-        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
-        if ($relaComNo != '') $where[] = ['b.customer_code|b.supplierNo', '=', $relaComNo];
+//        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
+//        if ($relaComNo != '') $where[] = ['b.customer_code|b.supplierNo', '=', $relaComNo];
+//
+        $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
+        if ($supplierNo != '') $where[] = ['b.supplierNo', '=', $supplierNo];
 
         $cgdNo = isset($this->post['cgdNo']) && $this->post['cgdNo'] !== "" ? $this->post['cgdNo'] : "";
         if ($cgdNo != "") {
@@ -3558,7 +3560,6 @@ class Sale extends Base
             ->join("sale b", "b.orderCode=a.orderCode", "left")
             ->join("customer_info v", "v.companyNo=b.customer_code", "left")
             ->join("warehouse_info n", "n.wsm_code=a.wsm_code", "left")
-            ->leftJoin("depart_user u", "u.uid=a.apply_id AND u.is_del=0")
             ->leftJoin("order_send os", "os.outCode=a.outCode")
             ->leftJoin("purchease_order wpo", "wpo.cgdNo=os.cgdNo")
 	        ->leftJoin('supplier sip', 'sip.code=wpo.supplierNo')