shish преди 3 години
родител
ревизия
26da8f2476
променени са 2 файла, в които са добавени 24 реда и са изтрити 3 реда
  1. 7 1
      app-ghs/controllers/ProductController.php
  2. 17 2
      app-ghs/controllers/PurchaseOrderController.php

+ 7 - 1
app-ghs/controllers/ProductController.php

@@ -50,6 +50,7 @@ class ProductController extends BaseController
         }
         $name = $info->name ?? '';
         $ptItemId = $info->itemId ?? 0;
+        $mainId = $info->mainId ?? 0;
 
         $ext = $this->shopExt;
         $printLabelSn = $ext->printLabelSn ?? '';
@@ -63,7 +64,12 @@ class ProductController extends BaseController
         $p->times = $num;
         $content = '<TEXT x="360" y="30" font="12" w="2" h="2" r="90">' . $name . '</TEXT>';
         $content .= '<BC128 x="260" y="30" h="80" s="1" r="90" n="5" w="12">' . $ptItemId . '</BC128>';
-        $content .= '<TEXT x="60" y="30" font="12" w="2" h="2" r="90">' . $unit . '</TEXT>';
+        if (in_array($mainId, [52, 1459])) {
+            $content .= '<TEXT x="60" y="30" font="12" w="2" h="2" r="90">惠雅鲜花</TEXT>';
+        } else {
+            $content .= '<TEXT x="60" y="30" font="12" w="2" h="2" r="90">' . $unit . '</TEXT>';
+        }
+
         $content .= '<QR x="30"  y="390"  e="L"  w="5">' . Yii::$app->params['mallHost'] . "/item/show-info?id=" . $id . '</QR>';
         $content .= '<TEXT x="220" y="400" font="12" w="1" h="1" r="90">扫码看价格</TEXT>';
         $p->printLabelMsg($content);

+ 17 - 2
app-ghs/controllers/PurchaseOrderController.php

@@ -25,6 +25,9 @@ class PurchaseOrderController extends BaseController
             util::fail('没有商品');
         }
 
+        $order = PurchaseOrderClass::getByCondition(['orderSn' => $orderSn], true);
+        $mainId = $order->mainId ?? 0;
+
         $ext = $this->shopExt;
         $printLabelSn = $ext->printLabelSn ?? '';
         if (empty($printLabelSn)) {
@@ -52,7 +55,11 @@ class PurchaseOrderController extends BaseController
             if ($key % 2 == 1) {
                 $content .= '<TEXT x="415" y="20" font="12" w="2" h="2" r="90">.</TEXT>';
             }
-            $content .= '<TEXT x="60" y="30" font="12" w="2" h="2" r="90">' . $unit . '</TEXT>';
+            if(in_array($mainId,[52,1459])){
+                $content .= '<TEXT x="60" y="30" font="12" w="2" h="2" r="90">惠雅鲜花</TEXT>';
+            }else{
+                $content .= '<TEXT x="60" y="30" font="12" w="2" h="2" r="90">' . $unit . '</TEXT>';
+            }
 
             $content .= '<QR x="30"  y="390"  e="L"  w="5">' . Yii::$app->params['mallHost'] . "/item/show-info?id=" . $productId . '</QR>';
             $content .= '<TEXT x="220" y="400" font="12" w="1" h="1" r="90">扫码看价格</TEXT>';
@@ -76,6 +83,9 @@ class PurchaseOrderController extends BaseController
         if (empty($num)) {
             util::fail('没有花材数量');
         }
+        $orderSn = $item->orderSn ?? '';
+        $order = PurchaseOrderClass::getByCondition(['orderSn' => $orderSn], true);
+        $mainId = $order->mainId ?? 0;
 
         $ext = $this->shopExt;
         $printLabelSn = $ext->printLabelSn ?? '';
@@ -93,7 +103,12 @@ class PurchaseOrderController extends BaseController
         $p->times = $num;
         $content = '<TEXT x="360" y="30" font="12" w="2" h="2" r="90">' . $name . '</TEXT>';
         $content .= '<BC128 x="260" y="30" h="80" s="1" r="90" n="5" w="12">' . $ptItemId . '</BC128>';
-        $content .= '<TEXT x="60" y="30" font="12" w="2" h="2" r="90">' . $unit . '</TEXT>';
+        if(in_array($mainId,[52,1459])){
+            $content .= '<TEXT x="60" y="30" font="12" w="2" h="2" r="90">惠雅鲜花</TEXT>';
+        }else{
+            $content .= '<TEXT x="60" y="30" font="12" w="2" h="2" r="90">' . $unit . '</TEXT>';
+        }
+
 
         $content .= '<QR x="30"  y="390"  e="L"  w="5">' . Yii::$app->params['mallHost'] . "/item/show-info?id=" . $productId . '</QR>';
         $content .= '<TEXT x="220" y="400" font="12" w="1" h="1" r="90">扫码看价格</TEXT>';