|
|
@@ -500,13 +500,11 @@ class Facility extends Api
|
|
|
$machine = input('machine');
|
|
|
$workOrder = input('Gd_gdbh');
|
|
|
$team = substr(input('team'),0,1);
|
|
|
- if (empty($machine) || empty($workOrder) || empty($team)){
|
|
|
+ if (empty($machine) || empty($team)){
|
|
|
$this->success('');
|
|
|
}
|
|
|
$sczlTime = date('Y-m-d 00:00:00',time());
|
|
|
- $name = \db('工单_基本资料')->where('Gd_gdbh',$workOrder)->field('rtrim(Gd_cpmc) as productName')->find();
|
|
|
$where = [
|
|
|
- 'sczl_gdbh' => $workOrder,
|
|
|
'sczl_jtbh' => $machine,
|
|
|
'sczl_bzdh' => ['like',$team.'%'],
|
|
|
'sczl_rq' => $sczlTime,
|
|
|
@@ -521,6 +519,7 @@ class Facility extends Api
|
|
|
$this->success('');
|
|
|
}
|
|
|
foreach ($list as $k=>$v){
|
|
|
+ $name = \db('工单_基本资料')->where('Gd_gdbh',$v['工单编号'])->where('行号',$v['yjno'])->field('rtrim(Gd_cpmc) as productName')->find();
|
|
|
if ($v['yjno']<10){
|
|
|
$list[$k]['yjno'] = '0'.$v['yjno'];
|
|
|
}
|