|
|
@@ -189,7 +189,7 @@ class WorkOrder extends Api
|
|
|
$data = [];
|
|
|
//印件资料
|
|
|
$printList = \db('工单_印件资料')
|
|
|
- ->where('Yj_Gdbh',$Gd_gdbh)
|
|
|
+ ->where('Yj_Gdbh',$Gd_gdbh)
|
|
|
->select();
|
|
|
if (!empty($printList)){
|
|
|
foreach ($printList as $key=>$value){
|
|
|
@@ -1985,6 +1985,8 @@ class WorkOrder extends Api
|
|
|
'rtrim(b.产品名称)' => '产品名称'
|
|
|
])
|
|
|
->join('产品_基本资料 b','a.成品代号 = b.产品编号')
|
|
|
+ ->join('工单_工艺资料 c','a.Gd_gdbh = c.Gy0_gdbh')
|
|
|
+ ->join('工单_印件资料 d','a.Gd_gdbh = d.Yj_Gdbh')
|
|
|
->where('a.Gd_gdbh','like','%'.$param['search'].'%')
|
|
|
->whereOr('a.成品名称','like','%'.$param['search'].'%')
|
|
|
->group('a.Gd_gdbh')
|
|
|
@@ -2015,7 +2017,7 @@ class WorkOrder extends Api
|
|
|
if (empty($param['workorder']) || empty($param['productCode']) || empty($param['option'])){
|
|
|
$this->error('参数错误');
|
|
|
}
|
|
|
- //引用印件资料
|
|
|
+ //引用工艺资料
|
|
|
$processWhere = [
|
|
|
'Gy0_方案' => $param['option'],
|
|
|
'Gy0_cpdh' => $param['productCode']
|
|
|
@@ -2034,6 +2036,8 @@ class WorkOrder extends Api
|
|
|
$ProcessList[$key]['Gy0_ks'] = $value['Gy0_Ks'];
|
|
|
$ProcessList[$key]['Gy0_ms'] = $value['Gy0_Ms'];
|
|
|
$ProcessList[$key]['Gy0_oil'] = $value['Gy0_Oil'];
|
|
|
+ $ProcessList[$key]['Gy0_sj1'] = '1900-01-01 00:00:00';
|
|
|
+ $ProcessList[$key]['Gy0_sj2'] = '1900-01-01 00:00:00';
|
|
|
$ProcessList[$key]['UniqId'] = $ProcesslastId + $key + 1;
|
|
|
$ProcessList[$key]['PD_WG'] = '1900-01-01 00:00:00';
|
|
|
$ProcessList[$key]['Sys_rq'] = date('Y-m-d H:i:s',time());
|
