|
|
@@ -2629,13 +2629,13 @@ class WorkOrderSpotCheck extends Api{
|
|
|
$list = \db('工单_基本资料')
|
|
|
->alias('a')
|
|
|
->join('工单_面料资料 b','a.订单编号 = b.BOM_工单编号')
|
|
|
- ->join('工单关联表 c','a.订单编号 = c.订单编号 AND a.生产款号 = c.生产款号 AND b.BOM_物料编码 = c.物料编号')
|
|
|
+ ->join('工单关联表 c','a.订单编号 = c.订单编号 AND b.BOM_物料编码 = c.物料编号')
|
|
|
->where('a.订单编号|a.生产款号','like','%'.$param['search'].'%')
|
|
|
->where('a.Mod_rq',null)
|
|
|
->where('b.Mod_rq',null)
|
|
|
->field('a.订单编号,a.生产款号,a.客户编号,a.款式,a.订单数量,a.落货日期,a.接单日期,a.Sys_id as 创建人员,
|
|
|
- a.Sys_rq as 创建时间,b.BOM_颜色 as 颜色,b.BOM_物料编码 as 物料编码,b.BOM_物料名称 as 物料名称,c.关联编号')
|
|
|
- ->group('c.关联编号,物料编码')
|
|
|
+ a.Sys_rq as 创建时间,b.BOM_颜色 as 颜色,b.BOM_物料编码 as 物料编码,b.BOM_物料名称 as 物料名称,GROUP_CONCAT(DISTINCT c.订单编号 SEPARATOR ",") AS 关联订单')
|
|
|
+ ->group('物料编码')
|
|
|
->order('a.订单编号 desc')
|
|
|
->select();
|
|
|
if (empty($list)){
|
