优化发货单单位问题

Application/Admin/Controller/ExportController.class.php

@@ -409,6 +409,7 @@ class ExportController extends AddonController
             ->field('large.code lcode,large.code_cp1 lcode_cp1,large.code_cp2 lcode_cp2,small.code scode,small.code_cp1 scode_cp1,small.code_cp2 scode_cp2')
             ->where('small.large_id in ('.$id.') and small.status = 0')
             ->select();
+
         $return = $this->excelExport1($data);
 
         if($return['status']==1){
@@ -961,7 +962,6 @@ $data['s_weight'] = $data['s_weight']/1000;
 
 //        $fileName = 'Runtime/Data/'.date('Ymd', time()).rand(100,999).'_'.$info['nickname'].'_'.$data['matter_name'].'_'.$data['small_num'].'.xls';
         $fileName = 'Runtime/Data/'.date('Ymd', time()).rand(100,999).'_'.$info['nickname'].'_'.str_replace('/','_',$data['matter_name']).'_'.$data['small_num'].'.xls';
-
         /*修改大件的发货状态*/
         M()->startTrans();
         $update_ret = M('qcode_large')->where('id in ('.$data['id_str'].')')->setField('l_status',1);
@@ -975,6 +975,10 @@ $data['s_weight'] = $data['s_weight']/1000;
                 $add['num'] = $data['s_weight']*1000;
                 $add['mater_type'] = 2;
             }
+            //2023年4月6日 优化送货单单位,增加mater_type=3  => 万支 后续建议优化  直接从unit单位表中读取
+            if (substr($data['matter_no'],2,2) == '04'){
+                $add['mater_type'] = 3;
+            }
             $add['userid'] = $session_config['user_auth']['uid'];
             $add['username'] = $data['supplier_name'];
             $add['matter_name'] = $data['matter_name'];

Application/Admin/View/Export/fahuo.html

@@ -305,14 +305,19 @@
                     html+= '<td class="tg-031e" style="word-break:break-all;">'+(arr[i].bach_num?arr[i].bach_num:'')+'</td>';
                     html+= '<td class="tg-031e">'+arr[i].large_num+'</td>';
                     html+= '<td class="tg-031e">'+arr[i].small_num+'</td>';
-                    html+= '<td class="tg-031e">'+(arr[i].mater_type==1?'万张':"kg")+'</td>';
                     if(arr[i].mater_type==1){
+						html+= '<td class="tg-031e">万张</td>';
                         html+='<td class="tg-031e">'+parseFloat(arr[i].num)*parseFloat(arr[i].small_num)/10000+'</td>';
                         html+='<td class="tg-031e" >'+arr[i].small_num+'件*'+parseInt(arr[i].num)+'张'+'</td>';
-                    }else{
+                    }else if (arr[i].mater_type==2){
+						html+= '<td class="tg-031e">kg</td>';
                         html+='<td class="tg-031e">'+parseFloat(arr[i].num)*parseFloat(arr[i].small_num)/1000+'</td>';
                         html+='<td class="tg-031e" >'+arr[i].small_num+'件*'+parseFloat(arr[i].num)/1000+'kg'+'</td>';
-                    }
+                    }else if (arr[i].mater_type==3){
+						html+= '<td class="tg-031e">万支</td>';
+						html+='<td class="tg-031e">'+parseFloat(arr[i].num)*parseFloat(arr[i].small_num)/10000+'</td>';
+						html+='<td class="tg-031e" >'+arr[i].small_num+'件*'+parseInt(arr[i].num)+'支'+'</td>';
+					}
 
                     // note+=arr[i].note;
                     // html+='<td class="tg-031e" >'+arr[i].small_num+'件*'+parseInt(arr[i].num)+(arr[i].mater_type==1?'张':"kg")+'</td>';