|
|
@@ -3236,11 +3236,12 @@ class Transfer extends Start_Controller {
|
|
|
}
|
|
|
|
|
|
public function _get_transfer_data($info,$t){
|
|
|
+
|
|
|
$rk_list = explode('|',trim($info['rk'],'|'));
|
|
|
$rk_time = explode('|',trim($info['rktime'],'|'));
|
|
|
$ck_list = explode('|',trim($info['ck'],'|'));
|
|
|
$ck_time = explode('|',trim($info['cktime'],'|'));
|
|
|
-
|
|
|
+
|
|
|
if(count($rk_time) < count($ck_time)){
|
|
|
return [
|
|
|
'code'=>-1,
|
|
|
@@ -3293,15 +3294,18 @@ class Transfer extends Start_Controller {
|
|
|
$ck_index++;
|
|
|
$ck_index++;
|
|
|
}else{
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
//估计是完成 或者 成品库 强制扫出了
|
|
|
$tran_list[] = [
|
|
|
'lx'=>$rk_list[$i],
|
|
|
- 'lx_show'=>'数据异常 联系技术核对-'.$info['id'],
|
|
|
- 'rk_time'=>'',
|
|
|
+ 'lx_show'=>(isset($t[$rk_list[$i]])?$t[$rk_list[$i]]:''),
|
|
|
+ 'rk_time'=>$rk_time[$i],
|
|
|
'ck_time'=>'',
|
|
|
'is_over'=>-3,//已出库
|
|
|
];
|
|
|
- $ck_index++;
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
}
|
