lvhao il y a 1 mois
Parent
commit
6fffa431f7
1 fichiers modifiés avec 5 ajouts et 5 suppressions
  1. 5 5
      core/CoreApp/controllers/Whlabel.php

+ 5 - 5
core/CoreApp/controllers/Whlabel.php

@@ -8041,7 +8041,7 @@ class Whlabel extends Start_Controller
 					foreach($final_list as $v){
 					foreach($final_list as $v){
 						$end_list[] = array_values($v);
 						$end_list[] = array_values($v);
 					}
 					}
-					$title = date('Y-m-d', $ktime) . '至' . date('Y-m-d', $jtime) . "入库详情";
+					$title = date('Y-m-d', $ktime) . '至' . date('Y-m-d', $jtime).$tl . "详情";
 					
 					
 					array_unshift($end_list,[
 					array_unshift($end_list,[
 						"仓库","供应商","SKU","商品名称","商品中文","标签","订单号","订单编码","运单号",$tl . "时间(中国时间)"
 						"仓库","供应商","SKU","商品名称","商品中文","标签","订单号","订单编码","运单号",$tl . "时间(中国时间)"
@@ -8112,7 +8112,7 @@ class Whlabel extends Start_Controller
 					foreach($info_list as $v){
 					foreach($info_list as $v){
 						$final_list[] = array_values($v);
 						$final_list[] = array_values($v);
 					}
 					}
-					$title = date('Y-m-d', $ktime) . '至' . date('Y-m-d', $jtime) . "入库详情";
+					$title = date('Y-m-d', $ktime) . '至' . date('Y-m-d', $jtime) .$tl. "详情";
 					
 					
 					array_unshift($final_list,[
 					array_unshift($final_list,[
 						"仓库","供应商","SKU","商品名称","商品中文","标签", $tl . "时间(中国时间)"
 						"仓库","供应商","SKU","商品名称","商品中文","标签", $tl . "时间(中国时间)"
@@ -8282,7 +8282,7 @@ class Whlabel extends Start_Controller
 						"asd"=>$v["asd"],
 						"asd"=>$v["asd"],
 					];
 					];
 				}
 				}
-				$title = date('Y-m-d', $ktime) . '至' . date('Y-m-d', $jtime) . '进销存详情';
+				
 
 
 				if(empty($final_list)){
 				if(empty($final_list)){
 					exit(json_encode(array('code' => 0, 'msg' => '没有合适数据')));
 					exit(json_encode(array('code' => 0, 'msg' => '没有合适数据')));
@@ -8291,7 +8291,7 @@ class Whlabel extends Start_Controller
 					foreach($final_list as $v){
 					foreach($final_list as $v){
 						$end_list[] = array_values($v);
 						$end_list[] = array_values($v);
 					}
 					}
-					$title = date('Y-m-d', $ktime) . '至' . date('Y-m-d', $jtime) . "入库详情";
+					$title = date('Y-m-d', $ktime) . '至' . date('Y-m-d', $jtime) . '进销存详情';
 					
 					
 					array_unshift($end_list,[
 					array_unshift($end_list,[
 						"仓库","供应商","位置","库存编码","SKU","商品名称","商品中文","产品备注","说明", "类型", "入库总量", "库存数量", "销售数量", "退货数量", "占单数量", "料号", "重量", "类目"
 						"仓库","供应商","位置","库存编码","SKU","商品名称","商品中文","产品备注","说明", "类型", "入库总量", "库存数量", "销售数量", "退货数量", "占单数量", "料号", "重量", "类目"
@@ -8436,7 +8436,7 @@ class Whlabel extends Start_Controller
 				foreach($rows as $v){
 				foreach($rows as $v){
 					$final_list[] = array_values($v);
 					$final_list[] = array_values($v);
 				}
 				}
-				$title = date('Y-m-d', $ktime) . '至' . date('Y-m-d', $jtime) . "入库详情";
+				$title = date("Y-m-d H:i:s"). "详情";
 				$first_line = [];
 				$first_line = [];
 				$first_line[] = "SKU";
 				$first_line[] = "SKU";
 				foreach ($timelist as $k => $v) {
 				foreach ($timelist as $k => $v) {