lvhao há 2 meses atrás
pai
commit
a637444182

+ 36 - 2
core/CoreApp/controllers/Returngoodsexcel.php

@@ -7,6 +7,9 @@ class Returngoodsexcel extends Start_Controller {
         $this->load->_model('Model_returngoods','returngoods');	
         $this->load->_model("Model_logic_order","logic_order");
         $this->load->_model("Model_express","express");
+        $this->load->_model('Model_logic_u9tools','logic_u9tools');
+        $this->load->_model('Model_classid','classid');
+        $this->load->_model('Model_typeclass','typeclass');
 	}
 	//定义方法的调用规则 获取URI第二段值
     public function _remap($arg,$arg_array)
@@ -109,6 +112,14 @@ class Returngoodsexcel extends Start_Controller {
             $back_status_show = $this->returngoods->getBackStatus();
             $express_list = $this->express->find_all("1 = 1","id,servicename");
             $express_tran = array_column($express_list,"servicename",'id');
+            $classid = $this->classid->sku();
+            $tcall = $this->typeclass->find_all();
+			$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) 
             {	
@@ -145,7 +156,9 @@ class Returngoodsexcel extends Start_Controller {
                 $tmp['登记人'] = $value['recorder'];
                 $tmp['登记时间'] = $value['create_time'];
                
-               
+             
+
+
                 if(isset($tmp_info['express'])){
                     $express = $tmp_info['express'];
                     $tmp['快递方式'] = isset($express_tran[$express])?$express_tran[$express]:"无";
@@ -163,7 +176,28 @@ class Returngoodsexcel extends Start_Controller {
                 }else{
                     $tmp['出库时间'] = "无";
                 }
-                isset($tmp_info['librarytime'])?$tmp_info['shipremarks']:" ";
+                
+                $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)){
+                        $tmp_jm_list[] = $u9_info['jm'];
+                    }else{
+                        $tmp_jm_list[] = "";
+                    }
+                }
+
+                
+                
+                $tmp['用友料号'] = implode(";",$tmp_jm_list);
                 $data_list[] = $tmp;           
             }
             echo json_encode(['data'=>$data_list,'success'=>true,'msg'=>'导出成功']);

+ 4 - 0
template/erp/returngoods.html

@@ -424,6 +424,10 @@ function explortExcel(data,filename){
             //出库时间
             {
                  wch:21,
+            },
+             //u9料号
+             {
+                 wch:21,
             }
             
         ];