|
|
@@ -138,11 +138,11 @@ class WareHouse extends BaseController
|
|
|
}
|
|
|
$page = isset($post['page']) &&$post['page']!=='' ?intval($post['page']) :1;
|
|
|
$size = isset($post['size']) &&$post['size']!=='' ?intval($post['size']) :10;
|
|
|
- $count = Db::name("warehouse_info")->alias("a")->join("warehouse_addr as b ","a.wsm_code=b.wsm_code","left")
|
|
|
+ $count = Db::name("warehouse_info")->alias("a")->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
|
|
|
->where($condition)->count();
|
|
|
$page>=ceil($count/$size) ? $page = ceil($count/$size): '';
|
|
|
- $list = Db::name("warehouse_info")->alias("a")->join("warehouse_addr as b ","a.wsm_code=b.wsm_code","left")
|
|
|
- ->where($condition)->field("a.id.a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.mobile,a.position,a.status,a.addtime,
|
|
|
+ $list = Db::name("warehouse_info")->alias("a")->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
|
|
|
+ ->where($condition)->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.mobile,a.position,a.status,a.addtime,
|
|
|
a.updatetime,b.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")->page($page,$size)->order("a.addtime desc")
|
|
|
->select();
|
|
|
foreach ($list as $key=>$value){
|
|
|
@@ -170,7 +170,7 @@ class WareHouse extends BaseController
|
|
|
if($id===""){
|
|
|
return error_show(1004,"参数id不能为空");
|
|
|
};
|
|
|
- $warse = Db::name("warehouse_info")->alias("a")->join("warehouse_addr as b ","a.wsm_code=b.wsm_code","left")
|
|
|
+ $warse = Db::name("warehouse_info")->alias("a")->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
|
|
|
->where(["a.id"=>$id,"a.is_del"=>0])->field("a.id.a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.mobile,a.position,a.status,a.addtime,
|
|
|
a.updatetime,b.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")->find();
|
|
|
if(empty($warse)){
|
panlumeng