|
@@ -2730,16 +2730,17 @@ class Whlabel_bh extends Start_Controller {
|
|
|
{
|
|
{
|
|
|
$where .= " and features like '%-$color-%'";
|
|
$where .= " and features like '%-$color-%'";
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
$list = array();
|
|
$list = array();
|
|
|
- $rows = $this->whlabel_bh_transfer->find_all($where,'id,wbid,orderinfo,jm,pm,time,label');
|
|
|
|
|
|
|
+ $rows = $this->whlabel_bh_transfer->find_all($where,'id,wbid,orderinfo,jm,pm,time,label,rktime');
|
|
|
|
|
|
|
|
foreach($rows as $k=>$v){
|
|
foreach($rows as $k=>$v){
|
|
|
|
|
+ $cktime = explode("|",trim($v['rktime'],"|"));
|
|
|
|
|
+ $f_cktime = end($cktime);
|
|
|
if(isset($list[$v['wbid']])){
|
|
if(isset($list[$v['wbid']])){
|
|
|
$list[$v['wbid']]['sl'] = $list[$v['wbid']]['sl'] + 1;
|
|
$list[$v['wbid']]['sl'] = $list[$v['wbid']]['sl'] + 1;
|
|
|
- $list[$v['wbid']]['time'][] = date("Y-m-d H:i:s",$v['time']);
|
|
|
|
|
|
|
+ $list[$v['wbid']]['time'][] = date("Y-m-d H:i:s",$f_cktime);
|
|
|
$list[$v['wbid']]['label'][] = $v['label'];
|
|
$list[$v['wbid']]['label'][] = $v['label'];
|
|
|
}else{
|
|
}else{
|
|
|
$list[$v['wbid']] = [
|
|
$list[$v['wbid']] = [
|
|
@@ -2749,7 +2750,7 @@ class Whlabel_bh extends Start_Controller {
|
|
|
'pm'=>$v['pm'],
|
|
'pm'=>$v['pm'],
|
|
|
'sl'=>1,
|
|
'sl'=>1,
|
|
|
'time'=>[
|
|
'time'=>[
|
|
|
- date("Y-m-d H:i:s",$v['time'])
|
|
|
|
|
|
|
+ date("Y-m-d H:i:s",$f_cktime)
|
|
|
],
|
|
],
|
|
|
'label'=>[
|
|
'label'=>[
|
|
|
$v['label'],
|
|
$v['label'],
|
