|
|
@@ -26,7 +26,7 @@ class WorkClass extends BaseClass
|
|
|
const STATUS_CANCEL = 2;
|
|
|
|
|
|
//打印工单 ssh 20220601
|
|
|
- public static function print($work)
|
|
|
+ public static function print($work, $shop)
|
|
|
{
|
|
|
$orderSn = $work->orderSn ?? '';
|
|
|
if (!empty($orderSn)) {
|
|
|
@@ -36,14 +36,14 @@ class WorkClass extends BaseClass
|
|
|
}
|
|
|
OrderClass::onlinePrint($order);
|
|
|
} 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]);
|
|
|
$printSn = $ext['printSn'] ?? '';
|
|
|
if (empty($printSn)) {
|