修改

biz-hd/work/classes/WorkClass.php

@@ -263,7 +263,7 @@ class WorkClass extends BaseClass
             util::fail('制作单已取消');
         }
         if (isset($work->orderSn) && !empty($work->orderSn)) {
-            util::fail('本制作单有订单，请通过订单取消');
+            util::fail('请通过订单取消');
         }
         //取消锁定，释放库存
         WorkItemClass::cancelLock($work);

biz/shop/classes/ShopExtClass.php

@@ -17,23 +17,36 @@ class ShopExtClass extends BaseClass
     public static function orderCancelRemind($shopExt, $order)
     {
         $sendNum = $order->sendNum ?? 0;
-        $sound = $sendNum . '号单已被取消或修改';
-        if ($order->fromType == 4) {
-            $mtSn = $order->thirdSn ?? 0;
-            $sound = '美团' . $mtSn . '号单已被取消或修改';
-        }
         $hasSh = 0;
         $hasHs = 0;
         $workList = WorkClass::getAllByCondition(['orderId' => $order->id], null, '*', null, true);
         if (!empty($workList)) {
             foreach ($workList as $work) {
-                if ($work->status == 2 || $work->preNum > $work->num) {
+                if ($work->status == 2) {
+                    $sh = $work->sh ?? 0;
+                    if ($sh == 0) {
+                        $hasHs = 1;
+                    } else {
+                        $hasSh = 1;
+                    }
+                    $sound = $sendNum . '号单已被取消';
+                    if ($order->fromType == 4) {
+                        $mtSn = $order->thirdSn ?? 0;
+                        $sound = '美团' . $mtSn . '号单已被取消';
+                    }
+                }
+                if ($work->preNum > $work->num && $work->status == 0) {
                     $sh = $work->sh ?? 0;
                     if ($sh == 0) {
                         $hasHs = 1;
                     } else {
                         $hasSh = 1;
                     }
+                    $sound = $sendNum . '号单已被修改';
+                    if ($order->fromType == 4) {
+                        $mtSn = $order->thirdSn ?? 0;
+                        $sound = '美团' . $mtSn . '号单已被修改';
+                    }
                 }
             }
         }