|
|
@@ -1850,7 +1850,7 @@ class Fullorderexcel extends Start_Controller {
|
|
|
$num[$k] = $fexceleq[$k][0];
|
|
|
}
|
|
|
//array_multisort($num,SORT_ASC,$fexceleq);//重新排序
|
|
|
- $feq = "";$kong = array();$sku9610 = '';
|
|
|
+ $feq = "";$kong = array();$sku9610 = '';$goods_sku_list = [];
|
|
|
foreach ($fexceleq as $k=>$v)
|
|
|
{
|
|
|
if(isset($v[1]))
|
|
|
@@ -1966,7 +1966,8 @@ class Fullorderexcel extends Start_Controller {
|
|
|
'usp'=>$usp,
|
|
|
'sku9610'=>$sku9610,
|
|
|
'typeclass_lpdl'=>$typeclass_lpdl,
|
|
|
- 'typeclass_lhdycc'=>$typeclass_lhdycc
|
|
|
+ 'typeclass_lhdycc'=>$typeclass_lhdycc,
|
|
|
+ 'goods_sku_list'=>$goods_sku_list,
|
|
|
];
|
|
|
$dlz_ret = $this->_datahz($where.$wid.' and '.$excelshop,'id,'.$feq,$order_str,'fullorder',$extra);
|
|
|
$tt_ret = $this->_datahz($where.$wid.' and '.$excelshop,'id,'.$feq,$order_str,'fullordertt',$extra);
|
|
|
@@ -1996,6 +1997,7 @@ class Fullorderexcel extends Start_Controller {
|
|
|
}
|
|
|
|
|
|
public function _datahz($where,$field,$order_str,$sj,$extra){
|
|
|
+ $goods_sku_list = $extra['goods_sku_list'] ;
|
|
|
//取得信息列表
|
|
|
$info_list = $this->$sj->find_all($where,$field,$order_str);
|
|
|
//格式化数据
|
