|
@@ -274,6 +274,10 @@ class Returngoodsexcel extends Start_Controller {
|
|
$cate_two_show = $this->returngoods->getCateTwo();
|
|
$cate_two_show = $this->returngoods->getCateTwo();
|
|
$back_status_show = $this->returngoods->getBackStatus();
|
|
$back_status_show = $this->returngoods->getBackStatus();
|
|
//格式化数据
|
|
//格式化数据
|
|
|
|
+
|
|
|
|
+ $classid = $this->classid->sku();
|
|
|
|
+ $tcall = $this->typeclass->find_all();
|
|
|
|
+ $typeclass = array();
|
|
foreach ($info_list as $key=>$value)
|
|
foreach ($info_list as $key=>$value)
|
|
{
|
|
{
|
|
|
|
|
|
@@ -305,6 +309,27 @@ 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_jm_list = [];
|
|
|
|
+ $goods_list = explode(";",$tmp_info['fpdata']);
|
|
|
|
+ foreach($goods_list as $goods){
|
|
|
|
+ $goods_arr = explode("|",$goods);
|
|
|
|
+ if(strpos($goods_arr[0],",")!== false){
|
|
|
|
+ $tmp_goods_sku = explode(",",$goods_arr[0]);
|
|
|
|
+ $sku = $tmp_goods_sku[1].$tmp_goods_sku[0]."-";
|
|
|
|
+ }else{
|
|
|
|
+ $sku = $goods_arr[0];
|
|
|
|
+ }
|
|
|
|
+ $u9_info = $this->logic_u9tools->getOneU9bm($sku,$classid,$typeclass);
|
|
|
|
+ if(!empty($u9_info['jm'])){
|
|
|
|
+ $tmp_jm_list[] = $u9_info['jm'];
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ $tmp['用友料号'] = implode(";",$tmp_jm_list);
|
|
|
|
|
|
|
|
|
|
$data_list[] = $tmp;
|
|
$data_list[] = $tmp;
|
|
@@ -383,6 +408,10 @@ class Returngoodsexcel extends Start_Controller {
|
|
$cate_one_show = $this->returngoods->getCateOne();
|
|
$cate_one_show = $this->returngoods->getCateOne();
|
|
$cate_two_show = $this->returngoods->getCateTwo();
|
|
$cate_two_show = $this->returngoods->getCateTwo();
|
|
$back_status_show = $this->returngoods->getBackStatus();
|
|
$back_status_show = $this->returngoods->getBackStatus();
|
|
|
|
+
|
|
|
|
+ $classid = $this->classid->sku();
|
|
|
|
+ $tcall = $this->typeclass->find_all();
|
|
|
|
+ $typeclass = array();
|
|
//格式化数据
|
|
//格式化数据
|
|
foreach ($info_list as $key=>$value)
|
|
foreach ($info_list as $key=>$value)
|
|
{
|
|
{
|
|
@@ -412,6 +441,26 @@ class Returngoodsexcel extends Start_Controller {
|
|
$tmp['状态'] = isset($status_show[$value['status']])?$status_show[$value['status']]:"异常";
|
|
$tmp['状态'] = isset($status_show[$value['status']])?$status_show[$value['status']]:"异常";
|
|
|
|
|
|
$tmp['登记时间'] = $value['create_time'];
|
|
$tmp['登记时间'] = $value['create_time'];
|
|
|
|
+ $tmp_info = $this->logic_order->getInfoByType($value['table_type'],$value['number']);
|
|
|
|
+ $tmp_jm_list = [];
|
|
|
|
+ $goods_list = explode(";",$tmp_info['fpdata']);
|
|
|
|
+ foreach($goods_list as $goods){
|
|
|
|
+ $goods_arr = explode("|",$goods);
|
|
|
|
+ if(strpos($goods_arr[0],",")!== false){
|
|
|
|
+ $tmp_goods_sku = explode(",",$goods_arr[0]);
|
|
|
|
+ $sku = $tmp_goods_sku[1].$tmp_goods_sku[0]."-";
|
|
|
|
+ }else{
|
|
|
|
+ $sku = $goods_arr[0];
|
|
|
|
+ }
|
|
|
|
+ $u9_info = $this->logic_u9tools->getOneU9bm($sku,$classid,$typeclass);
|
|
|
|
+ if(!empty($u9_info['jm'])){
|
|
|
|
+ $tmp_jm_list[] = $u9_info['jm'];
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ $tmp['用友料号'] = implode(";",$tmp_jm_list);
|
|
|
|
|
|
|
|
|
|
$data_list[] = $tmp;
|
|
$data_list[] = $tmp;
|