|
@@ -3003,7 +3003,7 @@ class Whlabel_bh extends Start_Controller {
|
|
foreach($list as $k=>$v){
|
|
foreach($list as $k=>$v){
|
|
if(isset($final_list[$v['number']])){
|
|
if(isset($final_list[$v['number']])){
|
|
$final_list[$v['number']]['sl'] = $final_list[$v['number']]['sl'] + 1;
|
|
$final_list[$v['number']]['sl'] = $final_list[$v['number']]['sl'] + 1;
|
|
- $final_list[$v['number']]['scanout_time'][] = date("Y-m-d H:i:s",$v['time']);
|
|
|
|
|
|
+ $final_list[$v['number']]['scanout_time'][] = date("Y~m~d H:i:s",$v['time']);
|
|
}else{
|
|
}else{
|
|
$tmp_info = $this->whlabel_bh_transfer->read($v['fid']);
|
|
$tmp_info = $this->whlabel_bh_transfer->read($v['fid']);
|
|
$final_list[$v['number']] = [
|
|
$final_list[$v['number']] = [
|
|
@@ -3012,7 +3012,7 @@ class Whlabel_bh extends Start_Controller {
|
|
"jm"=>$tmp_info['jm'],
|
|
"jm"=>$tmp_info['jm'],
|
|
"sl"=>1,
|
|
"sl"=>1,
|
|
"scanout_time"=>[
|
|
"scanout_time"=>[
|
|
- date("Y-m-d H:i:s",$v['time'])
|
|
|
|
|
|
+ date("Y~m~d H:i:s",$v['time'])
|
|
]
|
|
]
|
|
];
|
|
];
|
|
}
|
|
}
|
|
@@ -3048,9 +3048,9 @@ class Whlabel_bh extends Start_Controller {
|
|
$tmp = "<td>";
|
|
$tmp = "<td>";
|
|
foreach($value['scanout_time'] as $kk=>$vv){
|
|
foreach($value['scanout_time'] as $kk=>$vv){
|
|
if($kk == 0){
|
|
if($kk == 0){
|
|
- $tmp .= "`".$vv;
|
|
|
|
|
|
+ $tmp .= $vv;
|
|
}else{
|
|
}else{
|
|
- $tmp .= "`"."<br/>".$vv;
|
|
|
|
|
|
+ $tmp .= "<br/>".$vv;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
$tmp .= "</td>";
|
|
$tmp .= "</td>";
|