|
|
@@ -1434,7 +1434,9 @@ class Warehouse extends Start_Controller {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if(stripos($cp,'-73-') !== false) //200% 250%
|
|
|
+
|
|
|
+ }
|
|
|
+ if(stripos($cp,'-73-') !== false) //200% 250%
|
|
|
{
|
|
|
$gpp2 = str_replace('-73-','-74-',$features);
|
|
|
$ccxh = $this->whlabel->find_count("state = '0' and features = '$gpp2' and warehouse = '".$v['id']."' and zd = '' and (shop IS NULL or shop = '' or shop like '%,".$shop.",%')");//通用
|
|
|
@@ -1669,7 +1671,6 @@ class Warehouse extends Start_Controller {
|
|
|
$transportItem = $transportlist[0];
|
|
|
$goods_list[$num[0]][] = $transportItem['sku'] ." 在途库存: <b>" . $transportItem['num'] . " </b> 预达时间: ".date("Y-m-d",$transportItem['stime']). " <br/> 备注 : " . $transportItem['text'];
|
|
|
}
|
|
|
- }
|
|
|
}
|
|
|
$str = implode(',',$goods_list[$num[0]]);
|
|
|
$kxw .= $str.'；';
|
