shish 4 år sedan
förälder
incheckning
87e9a06e44
2 ändrade filer med 4 tillägg och 1 borttagningar
  1. 3 0
      biz-hd/order/classes/OrderClass.php
  2. 1 1
      biz-hd/work/classes/WorkClass.php

+ 3 - 0
biz-hd/order/classes/OrderClass.php

@@ -436,6 +436,9 @@ class OrderClass extends BaseClass
         $printSn = $ext['printSn'] ?? '';
         if ($port == 'make') {
             $printSn = $ext['makePrintSn'] ?? '';
+            if ($order->fromType == 4) {
+                $printSn = $ext['mtPrintLabelSn'] ?? '';
+            }
         }
         if (empty($printSn)) {
             return false;

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

@@ -56,7 +56,7 @@ class WorkClass extends BaseClass
         } else {
             $shopId = $shop->id ?? 0;
             $ext = ShopExtClass::getByCondition(['shopId' => $shopId], true);
-            $printLabelSn = $ext->makePrintLabelSn ?? '';
+            $printLabelSn = $work->fromType == 4 ? $ext->mtPrintLabelSn : $ext->makePrintLabelSn;
             if (empty($printLabelSn)) {
                 if ($mustPrint) {
                     util::fail('请设置标签打印机');