shish 4 лет назад
Родитель
Сommit
233e7dc2c0
2 измененных файлов с 5 добавлено и 5 удалено
  1. 1 1
      app-hd/controllers/WorkController.php
  2. 4 4
      biz-hd/work/classes/WorkClass.php

+ 1 - 1
app-hd/controllers/WorkController.php

@@ -23,7 +23,7 @@ class WorkController extends BaseController
         $id = $get['id'] ?? 0;
         $id = $get['id'] ?? 0;
         $work = WorkClass::getById($id, true);
         $work = WorkClass::getById($id, true);
         WorkClass::valid($work, $this->mainId);
         WorkClass::valid($work, $this->mainId);
-        WorkClass::print($work);
+        WorkClass::print($work, $this->shop);
         util::complete();
         util::complete();
     }
     }
 
 

+ 4 - 4
biz-hd/work/classes/WorkClass.php

@@ -26,7 +26,7 @@ class WorkClass extends BaseClass
     const STATUS_CANCEL = 2;
     const STATUS_CANCEL = 2;
 
 
     //打印工单 ssh 20220601
     //打印工单 ssh 20220601
-    public static function print($work)
+    public static function print($work, $shop)
     {
     {
         $orderSn = $work->orderSn ?? '';
         $orderSn = $work->orderSn ?? '';
         if (!empty($orderSn)) {
         if (!empty($orderSn)) {
@@ -36,14 +36,14 @@ class WorkClass extends BaseClass
             }
             }
             OrderClass::onlinePrint($order);
             OrderClass::onlinePrint($order);
         } else {
         } else {
-            self::printWork($work);
+            self::printWork($work, $shop);
         }
         }
     }
     }
 
 
     //云打印
     //云打印
-    public static function printWork($work)
+    public static function printWork($work, $shop)
     {
     {
-        $shopId = $work->shopId ?? 0;
+        $shopId = $shop->id ?? 0;
         $ext = ShopExtClass::getByCondition(['shopId' => $shopId]);
         $ext = ShopExtClass::getByCondition(['shopId' => $shopId]);
         $printSn = $ext['printSn'] ?? '';
         $printSn = $ext['printSn'] ?? '';
         if (empty($printSn)) {
         if (empty($printSn)) {