|
@@ -3172,7 +3172,8 @@ class WorkOrder extends Api
|
|
|
}
|
|
}
|
|
|
$list = \db('产品_基本资料')
|
|
$list = \db('产品_基本资料')
|
|
|
->where('客户编号','<>','')
|
|
->where('客户编号','<>','')
|
|
|
- ->field('客户编号,客户名称')
|
|
|
|
|
|
|
+
|
|
|
|
|
+ ->field('rtrim(客户编号) as 客户编号,rtrim(客户名称) as 客户名称')
|
|
|
->group('客户编号,客户名称')
|
|
->group('客户编号,客户名称')
|
|
|
->order('客户编号')
|
|
->order('客户编号')
|
|
|
->select();
|
|
->select();
|
|
@@ -3181,12 +3182,19 @@ class WorkOrder extends Api
|
|
|
}
|
|
}
|
|
|
$data['糊盒工单'] = [];
|
|
$data['糊盒工单'] = [];
|
|
|
foreach ($list as $key=>$value){
|
|
foreach ($list as $key=>$value){
|
|
|
- $value['客户编号'] = rtrim($value['客户编号']);
|
|
|
|
|
|
|
|
|
|
- $name = $value['客户编号'].rtrim($value['客户名称']);
|
|
|
|
|
- if (strpos($value['客户编号'],'J') !== false ){
|
|
|
|
|
- array_push($data['糊盒工单'],$name);
|
|
|
|
|
|
|
+ $work_order_count = \db('工单_基本资料')
|
|
|
|
|
+ ->where('行号','1')
|
|
|
|
|
+ ->where('Gd_cpdh|成品代号','LIKE',rtrim($value['客户编号']).'%')
|
|
|
|
|
+ ->where('Gd_lx','糊盒标准工单')
|
|
|
|
|
+ ->count();
|
|
|
|
|
+ if (!empty($value['客户名称']) && $work_order_count !== 0){
|
|
|
|
|
+ $name = $value['客户编号'].rtrim($value['客户名称']);
|
|
|
|
|
+ if (strpos($value['客户编号'],'J') !== false ){
|
|
|
|
|
+ array_push($data['糊盒工单'],$name);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
$this->success('成功',$data);
|
|
$this->success('成功',$data);
|
|
|
}
|
|
}
|