|
|
@@ -2876,6 +2876,7 @@ class Transfer extends Start_Controller {
|
|
|
$transfer_list = $this->transfer->find_all();
|
|
|
$t = $transfer_list = array_column($transfer_list, 'title', 'id');
|
|
|
$where = 'extra_status in (2,3) ';
|
|
|
+ $where .=" and ycrk_type = 0 ";
|
|
|
|
|
|
//数据排序
|
|
|
$order_str = "id desc";
|
|
|
@@ -2924,18 +2925,18 @@ class Transfer extends Start_Controller {
|
|
|
{
|
|
|
$type = ($v['type']==1)?'入库':'出库';
|
|
|
|
|
|
-
|
|
|
+ $operate_name = isset($t[$v['lx']])?$t[$v['lx']]:'';
|
|
|
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'] .= "<a href='javascript:void(0);' style='color:#90f'>".$operate_name.$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>";
|
|
|
+ $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$operate_name.$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>";
|
|
|
+ $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#f33'>".$operate_name.$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>";
|
|
|
+ $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$operate_name.$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>";
|
