|
@@ -6,6 +6,7 @@ use app\common\controller\Api;
|
|
|
use \think\Request;
|
|
use \think\Request;
|
|
|
use \think\Db;
|
|
use \think\Db;
|
|
|
use think\Cache;
|
|
use think\Cache;
|
|
|
|
|
+use function EasyWeChat\Kernel\Support\rsa_public_encrypt;
|
|
|
use function fast\e;
|
|
use function fast\e;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -682,12 +683,14 @@ class Product extends Api
|
|
|
}
|
|
}
|
|
|
$params = Request::instance()->get();
|
|
$params = Request::instance()->get();
|
|
|
$search = $params['search'];
|
|
$search = $params['search'];
|
|
|
- $num = config('product_code_digit');
|
|
|
|
|
|
|
+// $num = config('product_code_digit');
|
|
|
|
|
+ $num = 5;
|
|
|
if (!empty($search)){
|
|
if (!empty($search)){
|
|
|
$sql = "SELECT DISTINCT rtrim(a.`物料代码`) AS `物料代码`,rtrim(a.`物料名称`) AS `物料名称`,rtrim(b.`客户编号`) AS `客户编号`,rtrim(b.`客户名称`) AS `客户名称` FROM
|
|
$sql = "SELECT DISTINCT rtrim(a.`物料代码`) AS `物料代码`,rtrim(a.`物料名称`) AS `物料名称`,rtrim(b.`客户编号`) AS `客户编号`,rtrim(b.`客户名称`) AS `客户名称` FROM
|
|
|
`物料_存货编码` a
|
|
`物料_存货编码` a
|
|
|
JOIN `产品_基本资料` b ON LEFT(a.`物料代码`,$num) = LEFT(b.`客户编号`,$num)
|
|
JOIN `产品_基本资料` b ON LEFT(a.`物料代码`,$num) = LEFT(b.`客户编号`,$num)
|
|
|
WHERE (a.`物料名称` LIKE '%{$search}%' or a.物料代码 LIKE '%{$search}%')
|
|
WHERE (a.`物料名称` LIKE '%{$search}%' or a.物料代码 LIKE '%{$search}%')
|
|
|
|
|
+ group by a.`物料代码`
|
|
|
ORDER BY a.`物料代码` ASC";
|
|
ORDER BY a.`物料代码` ASC";
|
|
|
}else{
|
|
}else{
|
|
|
$sql = "SELECT DISTINCT rtrim(a.`物料代码`) as `物料代码`, rtrim(a.`物料名称`) as `物料名称`,rtrim(b.客户编号) as 客户编号,rtrim(b.客户名称) as 客户名称
|
|
$sql = "SELECT DISTINCT rtrim(a.`物料代码`) as `物料代码`, rtrim(a.`物料名称`) as `物料名称`,rtrim(b.客户编号) as 客户编号,rtrim(b.客户名称) as 客户名称
|