chhh

app/admin/controller/Check.php

@@ -390,4 +390,24 @@ public function dell(){
         }
 
     }
+
+    public function exportGood(){
+        $id = isset($this->post['id']) && $this->post['id'] !=="" ? intval($this->post['id']) :"";
+        if($id==""){
+            return error_show(1002,"盘点单号不能为空");
+        }
+        $fo = Db::name('good_check')->alias('a')->join('warehouse_info b',"b.wsm_code=a.wsm_code","left")
+            ->join('supplier c',"c.code=b.supplierNo","left")->field("c.name,c.code,a.*")
+            ->where(['a.id'=>$id,'a.is_del'=>0])->find();
+        if(empty($fo)){
+            return error_show(1003,"未找到盘点信息");
+        }
+        $fi = Db::name('check_item')->where(['check_code'=>$fo['check_code'],'is_del'=>0])->select();
+        $fo['item']=$fi;
+        if(empty($fo)){
+            return error_show(1002,"未找到盘点编号");
+        }else{
+            return app_show(0,"获取成功",$fo);
+        }
+    }
 }

app/admin/controller/Customer.php

@@ -27,6 +27,7 @@ class Customer extends BaseController
         $page= isset($this->post['page']) && $this->post['page']!==""? intval($this->post['page']):"1";
         $size = isset($this->post['size']) && $this->post['size'] != "" ? intval($this->post['size']) : 10;
         $pid =  isset($this->post['pid']) &&$this->post['pid']!=="" ?intval($this->post['pid']): "";
+        $condition[] = ['is_del',"=",0];
         if($pid!==""){
             $condition[]=["pid","=",$pid];
         }
@@ -34,7 +35,6 @@ class Customer extends BaseController
         if($name!=""){
             $condition[]=["name","like","%{$this->post['name']}%"];
         }
-        $condition[] = ['is_del',"=",0];
         $count = Db::name('customer_org1')->where($condition)->count();
         $page>=ceil($count/$size) ? $page=ceil($count/$size) :"";
         $list = Db::name('customer_org1')->where($condition)->page($page,$size)->column("pid,name,level,depart_link");

app/admin/controller/WareHouse.php

@@ -40,7 +40,8 @@ class WareHouse extends BaseController
         if($wsmtype==''){
             return error_show(1004,'参数wsmtype 不能为空');
         }
-        $isT = Db::name('warehouse_info')->where([['name',"=",$name],["is_del","=",0],'supplierNo',"=",$supplier])->find();
+        $isT = Db::name('warehouse_info')->where([['name',"=",$name],["is_del","=",0],['supplierNo',"=",$supplier]])
+            ->find();
         if(!empty($isT)){
             return error_show(1004,'仓库名称已存在');
         }