|
@@ -44,7 +44,7 @@ class Product extends Api
|
|
|
$pages = ($params['page']-1) * $limit;
|
|
$pages = ($params['page']-1) * $limit;
|
|
|
}
|
|
}
|
|
|
$total = 0;
|
|
$total = 0;
|
|
|
- if (isset($params['custom_code'])){
|
|
|
|
|
|
|
+ if (isset($params['custom_code']) && !empty($params['custom_code'])){
|
|
|
$customCode = $params['custom_code'];
|
|
$customCode = $params['custom_code'];
|
|
|
$sql = "SELECT rtrim(客户编号) as 客户编号,rtrim(客户名称) as 客户名称,客户料号,rtrim(产品编号) as 产品编号,rtrim(产品名称) as 产品名称,版本号,成品规格,
|
|
$sql = "SELECT rtrim(客户编号) as 客户编号,rtrim(客户名称) as 客户名称,客户料号,rtrim(产品编号) as 产品编号,rtrim(产品名称) as 产品名称,版本号,成品规格,
|
|
|
rtrim(计量单位) as 计量单位,rtrim(产品类别) as 产品类别,生产类别,产品备注,投产日期,状态,U8UID,rtrim(Sys_id) as Sys_id,Sys_rq,Mod_rq,UniqID
|
|
rtrim(计量单位) as 计量单位,rtrim(产品类别) as 产品类别,生产类别,产品备注,投产日期,状态,U8UID,rtrim(Sys_id) as Sys_id,Sys_rq,Mod_rq,UniqID
|
|
@@ -52,7 +52,7 @@ class Product extends Api
|
|
|
`客户编号`ASC,`状态` ASC,`产品编号` DESC LIMIT {$limit} OFFSET {$pages}";
|
|
`客户编号`ASC,`状态` ASC,`产品编号` DESC LIMIT {$limit} OFFSET {$pages}";
|
|
|
$total = Db::name('产品_基本资料')->where('客户编号',$customCode)->count();
|
|
$total = Db::name('产品_基本资料')->where('客户编号',$customCode)->count();
|
|
|
}else{
|
|
}else{
|
|
|
- if (isset($params['search'])){
|
|
|
|
|
|
|
+ if (isset($params['search']) && !empty($params['search'])){
|
|
|
$search = $params['search'];
|
|
$search = $params['search'];
|
|
|
$sql = "SELECT rtrim(客户编号) as 客户编号,rtrim(客户名称) as 客户名称,客户料号,rtrim(产品编号) as 产品编号,rtrim(产品名称) as 产品名称,版本号,成品规格,
|
|
$sql = "SELECT rtrim(客户编号) as 客户编号,rtrim(客户名称) as 客户名称,客户料号,rtrim(产品编号) as 产品编号,rtrim(产品名称) as 产品名称,版本号,成品规格,
|
|
|
rtrim(计量单位) as 计量单位,rtrim(产品类别) as 产品类别,生产类别,产品备注,投产日期,状态,U8UID,rtrim(Sys_id) as Sys_id,Sys_rq,Mod_rq,UniqID
|
|
rtrim(计量单位) as 计量单位,rtrim(产品类别) as 产品类别,生产类别,产品备注,投产日期,状态,U8UID,rtrim(Sys_id) as Sys_id,Sys_rq,Mod_rq,UniqID
|
|
@@ -67,6 +67,7 @@ class Product extends Api
|
|
|
$total = Db::name('产品_基本资料')->count();
|
|
$total = Db::name('产品_基本资料')->count();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
$list = Db::query($sql);
|
|
$list = Db::query($sql);
|
|
|
foreach ($list as $key=>$value){
|
|
foreach ($list as $key=>$value){
|
|
|
$code = trim($value['产品编号']);
|
|
$code = trim($value['产品编号']);
|