|
|
@@ -2214,11 +2214,12 @@ class Whlabel_bh extends Start_Controller {
|
|
|
|
|
|
$final_list = [];
|
|
|
foreach($list as $k=>$v){
|
|
|
- if(!isset($final_list[$v['id']])){
|
|
|
- $yjs = $wck = $yck = 0;
|
|
|
- $log_list = $this->whlabel_bh_transfer_cr->find_all("lx = ".$tid." and type = 1 and number = ".$v['number'],"*",'id desc');
|
|
|
-
|
|
|
- foreach($log_list as $kk=>$vv){
|
|
|
+ $yjs_arr =[];//避免多次扫入的重复计算
|
|
|
+ $yjs = $wck= $yck = 0;
|
|
|
+ $log_list = $this->whlabel_bh_transfer_cr->find_all("lx = ".$tid." and type = 1 and number = ".$v['number'],"*",'id desc');
|
|
|
+
|
|
|
+ foreach($log_list as $kk=>$vv){
|
|
|
+ if(!isset($yjs_arr[$vv['fid']])){
|
|
|
$yjs += 1;
|
|
|
if($vv['is_over'] == 0){
|
|
|
$wck += 1;
|
|
|
@@ -2226,22 +2227,23 @@ class Whlabel_bh extends Start_Controller {
|
|
|
if($vv['is_over'] == 1){
|
|
|
$yck += 1;
|
|
|
}
|
|
|
+ $yjs_arr[$vv['fid']] = 1;
|
|
|
}
|
|
|
- $whlabel_bh_info = $this->whlabel_bh->find("number = ".$v['number']);
|
|
|
- $final_list[$v['id']]['id'] = $v['id'];
|
|
|
- $final_list[$v['id']]['orderinfo'] = $v['orderinfo'] ;
|
|
|
- $final_list[$v['id']]['number'] ="<h9 class='window' data-h='/whlabel_bh/cj_transfer_detail/".$v['number']."/".$tid."' data-t='备货单号：".$v['number']."'><p>".$v['number']."</p></h9>";
|
|
|
- $final_list[$v['id']]['pm'] = $v['pm'];
|
|
|
- $final_list[$v['id']]['ddsl'] = empty($whlabel_bh_info)?0:$whlabel_bh_info['bhnum'];
|
|
|
- $final_list[$v['id']]['yjs'] = $yjs;
|
|
|
- $final_list[$v['id']]['wck'] = $wck;
|
|
|
- $final_list[$v['id']]['yck'] = $yck;
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+ $whlabel_bh_info = $this->whlabel_bh->find("number = ".$v['number']);
|
|
|
+ $final_list[$k]['id'] = $v['id'];
|
|
|
+ $final_list[$k]['orderinfo'] = $v['orderinfo'] ;
|
|
|
+ $final_list[$k]['number'] ="<h9 class='window' data-h='/whlabel_bh/cj_transfer_detail/".$v['number']."/".$tid."' data-t='备货单号：".$v['number']."'><p>".$v['number']."</p></h9>";
|
|
|
+ $final_list[$k]['pm'] = $v['pm'];
|
|
|
+ $final_list[$k]['ddsl'] = empty($whlabel_bh_info)?0:$whlabel_bh_info['bhnum'];
|
|
|
+ $final_list[$k]['yjs'] = $yjs;
|
|
|
+ $final_list[$k]['wck'] = $wck;
|
|
|
+ $final_list[$k]['yck'] = $yck;
|
|
|
|
|
|
}
|
|
|
|
|
|
- $final_list = array_values($final_list);
|
|
|
+
|
|
|
$rows = array('total'=>$total,'over'=>$over,'pagenum'=>$pagenum,'rows'=>($final_list));
|
|
|
echo json_encode($rows);exit;
|
|
|
}
|
