|
|
@@ -888,32 +888,32 @@ class Transfer extends Start_Controller {
|
|
|
|
|
|
$type = ($v['type']==1)?'入库':'出库';
|
|
|
|
|
|
- if(!empty($v['ycrk_type'])){
|
|
|
- $info_list[$key]['time'] .= "订单已完成<a href='javascript:void(0);' style='color:#90f'>".' ：'.date('Y-m-d H:i',$v['time']) ."</a><br>";
|
|
|
- }else{
|
|
|
- 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='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 font-weight:900'>超时! </l></a>";
|
|
|
- }elseif($v['orver_flag'] == 3){
|
|
|
- $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#06f'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l 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 || $v['extra_status'] == 3){
|
|
|
- $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#A52A2A'>【工序间流转超过3天】</a><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='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'] .= "<br>";
|
|
|
+ $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 font-weight:900'>超时! </l></a>";
|
|
|
+ }elseif($v['orver_flag'] == 3){
|
|
|
+ $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#06f'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l font-weight:900'>【该单已取消】 </l></a>";
|
|
|
+ }elseif(($v['orver_flag'] == 0)&&(empty($v['lx']))){
|
|
|
+ $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:red'>订单已完成:".date('Y-m-d H:i',$v['time']) ."</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 || $v['extra_status'] == 3){
|
|
|
+ $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#A52A2A'>【工序间流转超过3天】</a><br>";
|
|
|
+ }else{
|
|
|
+ $info_list[$key]['time'] .= "<br>";
|
|
|
}
|
|
|
+
|
|
|
|
|
|
}
|
|
|
$info_list[$key]['time'] = trim($info_list[$key]['time'],'<br>');
|
|
|
@@ -3350,6 +3350,12 @@ class Transfer extends Start_Controller {
|
|
|
$this->systemtransfer->save([
|
|
|
'ycrk_type'=>1,
|
|
|
],$id);
|
|
|
+ $list = $this->systemtransfer_cr->find_all('fid = '.$id,'*','id desc');
|
|
|
+ foreach ($list as $key=>$value) {
|
|
|
+ $this->systemtransfer_cr->save([
|
|
|
+ 'ycrk_type'=>1,
|
|
|
+ ],$value['id']);
|
|
|
+ }
|
|
|
$this->systemtransfer_cr->insert([
|
|
|
'fid'=>$id,'lx'=>0,'type'=>1,'time'=>time(),'is_over'=>0,'over_flag'=>0,
|
|
|
'extra_status'=>0,'ycrk_type'=>1,
|
