|
|
@@ -2502,7 +2502,7 @@ class Transfer extends Start_Controller {
|
|
|
|
|
|
$transfer_list = $this->transfer->find_all();
|
|
|
$t = $transfer_list = array_column($transfer_list, 'title', 'id');
|
|
|
- $where = 'extra_status = 1 or extra_status = 2';
|
|
|
+ $where = 'extra_status in (1,2)';
|
|
|
|
|
|
//数据排序
|
|
|
$order_str = "id desc";
|
|
|
@@ -2544,55 +2544,55 @@ class Transfer extends Start_Controller {
|
|
|
$final_list[$key]['shipremarks'] = $info['shipremarks'];
|
|
|
$final_list[$key]['printtime'] = date('Y-m-d H:i:s',$info['printtime']);
|
|
|
|
|
|
- // $data = $this->systemtransfer_cr->find_all("fid = '".$info['id']."'");
|
|
|
+ $data = $this->systemtransfer_cr->find_all("fid = '".$info['id']."'");
|
|
|
|
|
|
- // $info_list[$key]['time'] = "布标打印 ：".date('Y-m-d H:i',$info['ctime12']).'<br>';
|
|
|
- // foreach ($data as $k=>$v)
|
|
|
- // {
|
|
|
- // $type = ($v['type']==1)?'入库':'出库';
|
|
|
+ $info_list[$key]['time'] = "布标打印 ：".date('Y-m-d H:i',$info['ctime12']).'<br>';
|
|
|
+ foreach ($data as $k=>$v)
|
|
|
+ {
|
|
|
+ $type = ($v['type']==1)?'入库':'出库';
|
|
|
|
|
|
|
|
|
- // if($v['orver_flag'] == 1){
|
|
|
- // if($v['is_over'] == 0){
|
|
|
- // $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l style='padding-left:10px;font-weight:900;'> 即将超时 </l></a>";
|
|
|
- // // $info_list[$key]['time'] .= '<i style="padding:10px;color:#90f;font-weight:bold;"> 即将超时</i>'.'<br>';
|
|
|
- // }else{
|
|
|
- // $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ."</a>";
|
|
|
- // }
|
|
|
- // }elseif($v['orver_flag'] == 2){
|
|
|
- // $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#f33'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l style='padding-left:10px;font-weight:900'> 超 时 ! </l></a>";
|
|
|
- // }else{
|
|
|
- // $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ."</a>";
|
|
|
- // }
|
|
|
- // if($v['extra_status'] == 1){
|
|
|
- // $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>【下道工序未及时入库】</a><br>";
|
|
|
- // }elseif($v['extra_status'] == 2){
|
|
|
- // $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#DEB887'>【工序间流转超过3天】</a><br>";
|
|
|
- // }else{
|
|
|
- // $info_list[$key]['time'] .= "<br>";
|
|
|
- // }
|
|
|
- // }
|
|
|
- $type = ($value['type']==1)?'入库':'出库';
|
|
|
- $str = " ";
|
|
|
- if($value['orver_flag'] == 1){
|
|
|
- if($value['is_over'] == 0){
|
|
|
- $str .= "<a href='javascript:void(0);' style='color:#90f'>".$t[$value['lx']].$type.' ：'.date('Y-m-d H:i',$value['time']) ." <l style='padding-left:10px;font-weight:900;'> 即将超时 </l></a>";
|
|
|
- // $info_list[$key]['time'] .= '<i style="padding:10px;color:#90f;font-weight:bold;"> 即将超时</i>'.'<br>';
|
|
|
+ if($v['orver_flag'] == 1){
|
|
|
+ if($v['is_over'] == 0){
|
|
|
+ $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l style='padding-left:10px;font-weight:900;'> 即将超时 </l></a>";
|
|
|
+ // $info_list[$key]['time'] .= '<i style="padding:10px;color:#90f;font-weight:bold;"> 即将超时</i>'.'<br>';
|
|
|
+ }else{
|
|
|
+ $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ."</a>";
|
|
|
+ }
|
|
|
+ }elseif($v['orver_flag'] == 2){
|
|
|
+ $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#f33'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l style='padding-left:10px;font-weight:900'> 超 时 ! </l></a>";
|
|
|
}else{
|
|
|
- $str .= "<a href='javascript:void(0);' style='color:#000'>".$t[$value['lx']].$type.' ：'.date('Y-m-d H:i',$value['time']) ."</a>";
|
|
|
+ $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ."</a>";
|
|
|
+ }
|
|
|
+ if($v['extra_status'] == 1){
|
|
|
+ $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>【下道工序未及时入库】</a><br>";
|
|
|
+ }elseif($v['extra_status'] == 2){
|
|
|
+ $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#DEB887'>【工序间流转超过3天】</a><br>";
|
|
|
+ }else{
|
|
|
+ $info_list[$key]['time'] .= "<br>";
|
|
|
}
|
|
|
- }elseif($value['orver_flag'] == 2){
|
|
|
- $str .= "<a href='javascript:void(0);' style='color:#f33'>".$t[$value['lx']].$type.' ：'.date('Y-m-d H:i',$value['time']) ." <l style='padding-left:10px;font-weight:900'> 超 时 ! </l></a>";
|
|
|
- }else{
|
|
|
- $str .= "<a href='javascript:void(0);' style='color:#000'>".$t[$value['lx']].$type.' ：'.date('Y-m-d H:i',$value['time']) ."</a>";
|
|
|
- }
|
|
|
- if($value['extra_status'] == 1){
|
|
|
- $str .= "<a href='javascript:void(0);' style='color:#90f'>【下道工序未及时入库】</a><br>";
|
|
|
- }elseif($value['extra_status'] == 2){
|
|
|
- $str .= "<a href='javascript:void(0);' style='color:#DEB887'>【工序间流转超过3天】</a><br>";
|
|
|
- }else{
|
|
|
- $str .= "<br>";
|
|
|
}
|
|
|
+ // $type = ($value['type']==1)?'入库':'出库';
|
|
|
+ // $str = " ";
|
|
|
+ // if($value['orver_flag'] == 1){
|
|
|
+ // if($value['is_over'] == 0){
|
|
|
+ // $str .= "<a href='javascript:void(0);' style='color:#90f'>".$t[$value['lx']].$type.' ：'.date('Y-m-d H:i',$value['time']) ." <l style='padding-left:10px;font-weight:900;'> 即将超时 </l></a>";
|
|
|
+ // // $info_list[$key]['time'] .= '<i style="padding:10px;color:#90f;font-weight:bold;"> 即将超时</i>'.'<br>';
|
|
|
+ // }else{
|
|
|
+ // $str .= "<a href='javascript:void(0);' style='color:#000'>".$t[$value['lx']].$type.' ：'.date('Y-m-d H:i',$value['time']) ."</a>";
|
|
|
+ // }
|
|
|
+ // }elseif($value['orver_flag'] == 2){
|
|
|
+ // $str .= "<a href='javascript:void(0);' style='color:#f33'>".$t[$value['lx']].$type.' ：'.date('Y-m-d H:i',$value['time']) ." <l style='padding-left:10px;font-weight:900'> 超 时 ! </l></a>";
|
|
|
+ // }else{
|
|
|
+ // $str .= "<a href='javascript:void(0);' style='color:#000'>".$t[$value['lx']].$type.' ：'.date('Y-m-d H:i',$value['time']) ."</a>";
|
|
|
+ // }
|
|
|
+ // if($value['extra_status'] == 1){
|
|
|
+ // $str .= "<a href='javascript:void(0);' style='color:#90f'>【下道工序未及时入库】</a><br>";
|
|
|
+ // }elseif($value['extra_status'] == 2){
|
|
|
+ // $str .= "<a href='javascript:void(0);' style='color:#DEB887'>【工序间流转超过3天】</a><br>";
|
|
|
+ // }else{
|
|
|
+ // $str .= "<br>";
|
|
|
+ // }
|
|
|
$final_list[$key]['time'] = trim($str,'<br>');
|
|
|
}
|
|
|
|
