|
|
@@ -668,7 +668,7 @@ class Product extends Api
|
|
|
LEFT JOIN `物料_存货结构` b ON LEFT(a.物料代码,$num-2) = b.编号
|
|
|
LEFT JOIN `物料_存货结构` c ON LEFT(a.物料代码,$num) = c.编号
|
|
|
LEFT JOIN `物料_存货结构` d ON LEFT(a.物料代码,$num+2) = d.编号
|
|
|
- WHERE a.物料名称 LIKE '%{$search}%' ";
|
|
|
+ WHERE a.物料名称 LIKE '%{$search}%' or a.物料代码 LIKE '%{$search}%'";
|
|
|
}else{
|
|
|
$sql = "SELECT rtrim(a.`物料代码`) as 物料代码,rtrim(a.`物料名称`) as 物料名称,rtrim(a.`规格`) as 规格,rtrim(b.编号) as oneCode,rtrim(b.名称) as oneName,
|
|
|
rtrim(c.`编号`) as twoCode,rtrim(c.`名称`) as twoName,rtrim(d.`编号`) as thrCode,rtrim(d.`名称`) as thrName
|
|
|
@@ -678,7 +678,7 @@ class Product extends Api
|
|
|
LEFT JOIN `物料_存货结构` d ON LEFT(a.物料代码,$num+2) = d.编号
|
|
|
";
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$data = Db::query($sql);
|
|
|
$mergedArray = [];
|
|
|
foreach ($data as $item) {
|
