shish 3 lat temu
rodzic
commit
100d0620be

+ 2 - 2
app-ghs/controllers/ProductController.php

@@ -776,7 +776,7 @@ class ProductController extends BaseController
     public function actionGeneratePriceTable()
     {
         $level = Yii::$app->request->get('level', 0);
-        $respond = ProductService::generatePriceTable($this->sjId, $level, $this->mainId,$this->shop);
+        $respond = ProductService::generatePriceTable($this->sjId, $level, $this->mainId);
         $file = $respond['file'] ?? '';
         $shortFile = $respond['shortFile'] ?? '';
         $fileUrl = Yii::$app->params['ghsHost'] . $file;
@@ -786,7 +786,7 @@ class ProductController extends BaseController
     public function actionGenerateItemTable()
     {
         $level = Yii::$app->request->get('level', 0);
-        $respond = ProductService::generateItemTable($this->sjId, $level, $this->mainId,$this->shop);
+        $respond = ProductService::generateItemTable($this->sjId, $level, $this->mainId);
         $file = $respond['file'] ?? '';
         $shortFile = $respond['shortFile'] ?? '';
         $fileUrl = Yii::$app->params['ghsHost'] . $file;

+ 4 - 11
biz-ghs/product/services/ProductService.php

@@ -116,14 +116,10 @@ class ProductService extends BaseService
     }
 
     //生成价格表 ssh 20210922
-    public static function generateItemTable($sjId, $level, $mainId = 0, $shop)
+    public static function generateItemTable($sjId, $level, $mainId = 0)
     {
         $status = 1;
 
-        $sjName = $shop->merchantName ?? '';
-        $name = $shop->shopName == '首店' ? $sjName : $sjName . ' ' . $shop->shopName;
-
-
         //获取所有当前供货商的分类
         //根据分类组装分类下的花材信息
         //中央ID
@@ -176,7 +172,7 @@ class ProductService extends BaseService
             ->setCategory("Test result file");
 
         //$objPHPExcel->getActiveSheet()->getHeaderFooter()->setOddHeader(date('n月j日') . " " . $levelName . "客户");
-        $objPHPExcel->getActiveSheet()->getHeaderFooter()->setOddHeader(date('n月j日') . " " . $name);
+        //$objPHPExcel->getActiveSheet()->getHeaderFooter()->setOddHeader(date('n月j日') . " 编号 " . $level);
         $topLevelName = $levelName;
         if ($level == CustomClass::LEVEL_SK) {
             $topLevelName = '';
@@ -255,13 +251,10 @@ class ProductService extends BaseService
     }
 
     //生成价格表 ssh 20210922
-    public static function generatePriceTable($sjId, $level, $mainId = 0, $shop)
+    public static function generatePriceTable($sjId, $level, $mainId = 0)
     {
         $status = 1;
 
-        $sjName = $shop->merchantName ?? '';
-        $name = $shop->shopName == '首店' ? $sjName : $sjName . ' ' . $shop->shopName;
-
         //获取所有当前供货商的分类
         //根据分类组装分类下的花材信息
         //中央ID
@@ -314,7 +307,7 @@ class ProductService extends BaseService
             ->setCategory("Test result file");
 
         //$objPHPExcel->getActiveSheet()->getHeaderFooter()->setOddHeader(date('n月j日') . " " . $levelName . "客户");
-        $objPHPExcel->getActiveSheet()->getHeaderFooter()->setOddHeader(date('n月j日') . " " . $name);
+        //$objPHPExcel->getActiveSheet()->getHeaderFooter()->setOddHeader(date('n月j日') . " 编号 " . $level);
         $topLevelName = $levelName;
         if ($level == CustomClass::LEVEL_SK) {
             $topLevelName = '';