|
@@ -278,6 +278,11 @@ class Returngoodsexcel extends Start_Controller {
|
|
$classid = $this->classid->sku();
|
|
$classid = $this->classid->sku();
|
|
$tcall = $this->typeclass->find_all();
|
|
$tcall = $this->typeclass->find_all();
|
|
$typeclass = array();
|
|
$typeclass = array();
|
|
|
|
+ foreach ($tcall as $v)
|
|
|
|
+ {
|
|
|
|
+ //$tcjm[$v['id']] = array($v['jm'],$v['classid']);
|
|
|
|
+ $typeclass[$v['id']] = array('zh'=>$v['zh'],'classid'=>$v['classid'],'bm'=>$v['bm'],'title'=>$v['title'],'jm'=>$v['jm']);
|
|
|
|
+ }
|
|
foreach ($info_list as $key=>$value)
|
|
foreach ($info_list as $key=>$value)
|
|
{
|
|
{
|
|
|
|
|
|
@@ -311,6 +316,7 @@ class Returngoodsexcel extends Start_Controller {
|
|
$tmp['登记时间'] = $value['create_time'];
|
|
$tmp['登记时间'] = $value['create_time'];
|
|
|
|
|
|
$tmp_info = $this->logic_order->getInfoByType($value['table_type'],$value['number']);
|
|
$tmp_info = $this->logic_order->getInfoByType($value['table_type'],$value['number']);
|
|
|
|
+
|
|
$tmp_jm_list = [];
|
|
$tmp_jm_list = [];
|
|
$goods_list = explode(";",$tmp_info['fpdata']);
|
|
$goods_list = explode(";",$tmp_info['fpdata']);
|
|
foreach($goods_list as $goods){
|
|
foreach($goods_list as $goods){
|
|
@@ -412,6 +418,11 @@ class Returngoodsexcel extends Start_Controller {
|
|
$classid = $this->classid->sku();
|
|
$classid = $this->classid->sku();
|
|
$tcall = $this->typeclass->find_all();
|
|
$tcall = $this->typeclass->find_all();
|
|
$typeclass = array();
|
|
$typeclass = array();
|
|
|
|
+ foreach ($tcall as $v)
|
|
|
|
+ {
|
|
|
|
+ //$tcjm[$v['id']] = array($v['jm'],$v['classid']);
|
|
|
|
+ $typeclass[$v['id']] = array('zh'=>$v['zh'],'classid'=>$v['classid'],'bm'=>$v['bm'],'title'=>$v['title'],'jm'=>$v['jm']);
|
|
|
|
+ }
|
|
//格式化数据
|
|
//格式化数据
|
|
foreach ($info_list as $key=>$value)
|
|
foreach ($info_list as $key=>$value)
|
|
{
|
|
{
|
|
@@ -452,6 +463,7 @@ class Returngoodsexcel extends Start_Controller {
|
|
}else{
|
|
}else{
|
|
$sku = $goods_arr[0];
|
|
$sku = $goods_arr[0];
|
|
}
|
|
}
|
|
|
|
+
|
|
$u9_info = $this->logic_u9tools->getOneU9bm($sku,$classid,$typeclass);
|
|
$u9_info = $this->logic_u9tools->getOneU9bm($sku,$classid,$typeclass);
|
|
if(!empty($u9_info['jm'])){
|
|
if(!empty($u9_info['jm'])){
|
|
$tmp_jm_list[] = $u9_info['jm'];
|
|
$tmp_jm_list[] = $u9_info['jm'];
|