Merge branch 'zhongqi-itemUpdate' into dev

biz-ghs/order/classes/OrderClass.php

@@ -3160,12 +3160,12 @@ XL;
         }
 
         $productName = $product->name ?? '';
-        $content = '<TEXT x="400" y="30" font="12" w="2" h="2" r="90">客户：' . $customName . '</TEXT>';
-        $content .= '<TEXT x="325" y="30" font="12" w="2" h="2" r="90">地址：' . $fullAddress . '</TEXT>';
-        $content .= '<TEXT x="250" y="30" font="12" w="2" h="2" r="90">电话：' . $customMobile . '</TEXT>';
-        $content .= '<TEXT x="180" y="30" font="12" w="2" h="2" r="90">备注：' . $remark . '</TEXT>';
-        $content .= '<TEXT x="120" y="30" font="12" w="2" h="2" r="90">————————————————————</TEXT>';
-        $content .= '<TEXT x="60" y="30" font="12" w="2" h="2" r="90">' . $productName . ' 装箱数：' . $boxNum . '</TEXT>';
+        $content = '<TEXT x="400" y="30" font="12" w="2" h="2" r="90">' . $productName . ' 装箱数：' . $boxNum . '</TEXT>';
+        $content .= '<TEXT x="325" y="30" font="12" w="2" h="2" r="90">————————————————————</TEXT>';
+        $content .= '<TEXT x="250" y="30" font="12" w="2" h="2" r="90">客户：' . $customName . '</TEXT>';
+        $content .= '<TEXT x="180" y="30" font="12" w="2" h="2" r="90">地址：' . $fullAddress . '</TEXT>';
+        $content .= '<TEXT x="120" y="30" font="12" w="2" h="2" r="90">电话：' . $customMobile . '</TEXT>';
+        $content .= '<TEXT x="60" y="30" font="12" w="2" h="2" r="90">备注：' . $remark . '</TEXT>';
         $p->printLabelMsg($content);
         return true;
     }