|
|
@@ -119,6 +119,9 @@ class Whlabel_bh extends Start_Controller {
|
|
|
else if($arg == 'cj_transfer_log'){
|
|
|
$this->_cj_transfer_log();
|
|
|
}
|
|
|
+ else if($arg == 'cj_transfer_detail'){
|
|
|
+ $this->_cj_transfer_detail($arg_array);
|
|
|
+ }
|
|
|
else
|
|
|
{
|
|
|
$this->_index();
|
|
|
@@ -1747,8 +1750,9 @@ class Whlabel_bh extends Start_Controller {
|
|
|
}
|
|
|
|
|
|
$cztime = 'ctime'.$transfer;
|
|
|
- //如果是完成扫出 这样会通知erp生成一个调出单
|
|
|
- if($transfer == 3 && $cz == 2 && $lb['dbapi'] < 99){
|
|
|
+ //如果是完成扫出 这样会通知erp生成一个调出单
|
|
|
+ //中转库如果扫出的话 应该是马尾 其它的没有
|
|
|
+ if(($transfer == 3 || $transfer == 13) && $cz == 2 && $lb['dbapi'] < 99){
|
|
|
|
|
|
$this->db->trans_begin();
|
|
|
$this->whlabel_bh_transfer->save(array('rk'=>$lb['rk'],'rktime'=>$lb['rktime'],'ck'=>$lb['ck'],'cktime'=>$lb['cktime'],'time'=>$time,'gtime'=>date('YmdH',$time),$cztime=>$time,'status'=>2,'dbapi'=>99),$lb['id']);
|
|
|
@@ -2221,8 +2225,8 @@ class Whlabel_bh extends Start_Controller {
|
|
|
}
|
|
|
}
|
|
|
$final_list[$k]['id'] = $v['id'];
|
|
|
- $final_list[$k]['orderinfo'] = $v['orderinfo'];
|
|
|
- $final_list[$k]['number'] = $v['number'];
|
|
|
+ $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]['yjs'] = $yjs;
|
|
|
$final_list[$k]['wck'] = $wck;
|
|
|
@@ -2273,4 +2277,37 @@ class Whlabel_bh extends Start_Controller {
|
|
|
$this->_Template('whlabel_bh_cj_transfer_log',$this->data);
|
|
|
|
|
|
}
|
|
|
+
|
|
|
+ public function _cj_transfer_detail($arg_array){
|
|
|
+ $number = $arg_array[0];
|
|
|
+ $tid = $arg_array[1];
|
|
|
+ $transfer_info = $this->transfer->read($tid);
|
|
|
+ $whlabel_bh_info = $this->whlabel_bh->find(" number = ".$number);
|
|
|
+ $final_list = [];
|
|
|
+
|
|
|
+ $log_list = $this->whlabel_bh_transfer_cr->find_all( " number = ".$number." and lx = ".$tid,"*","id asc");
|
|
|
+
|
|
|
+ $collect_list = [];
|
|
|
+ foreach($log_list as $k=>$v){
|
|
|
+ if(isset($final_list[$v['fid']])){
|
|
|
+ if($v['type'] == 1){
|
|
|
+ $final_list[$v['fid']]['sr_time'] = date('Y-m-d H:i:s',$v['time']);
|
|
|
+ }else{
|
|
|
+ $final_list[$v['fid']]['sc_time'] = date('Y-m-d H:i:s',$v['time']);
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ if($v['type'] == 1){
|
|
|
+ $final_list[$v['fid']]['sr_time'] = date('Y-m-d H:i:s',$v['time']);
|
|
|
+ }else{
|
|
|
+ $final_list[$v['fid']]['sc_time'] = date('Y-m-d H:i:s',$v['time']);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ $this->data['whlabel_bh_info'] = $whlabel_bh_info;
|
|
|
+ $this->data['transfer_info'] = $transfer_info;
|
|
|
+ $this->data['final_list'] = $final_list;
|
|
|
+ $this->_Template('whlabel_bh_cj_transfer_detail',$this->data);
|
|
|
+ }
|
|
|
}
|
