采购

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -437,8 +437,8 @@ class PurchaseOrderClass extends BaseClass
             $content .= '录入人员：' . $orderInfo['shopAdminName'] . '<BR>';
         }
         $content .= "<BR>";
-        $bookSn = $shop->bookSn??0;
-        if(!empty($bookSn)){
+        $bookSn = $shop->bookSn ?? 0;
+        if (!empty($bookSn)) {
             $content .= "<CB>扫码查货位号</CB>";
             $content .= "<BR>";
             $host = Yii::$app->params['ghsHost'];
@@ -508,22 +508,21 @@ class PurchaseOrderClass extends BaseClass
         $bookSn = $shop->bookSn ?? 0;
         $pfLevel = $shop->pfLevel ?? 0;
         if ($pfLevel == 1 && !empty($bookSn)) {
-            if ($cg->bookSn != $bookSn) {
-                util::fail('预订编号不匹配');
-            }
-            //入库前再确认分配货位
-            $key = 'ghs_cg_order_scan_seat_' . $cg->id;
-            $noLock = util::lock($key);
-            if ($noLock) {
-                //可以获得锁，没有在分配货位，可以进行货位分配
-                $params = ['staffId' => $staffId, 'staffName' => $staffName];
-                self::assign($cg, $shop, $params);
-                util::unlock($key);
-                //分配货位后上架和入库
-                $shop = $data['shop'] ?? null;
-                CgOrderItemClass::assignToPutOn($cg, $shop, $params);
-            } else {
-                util::fail('正在分配货位，请1秒后再提交');
+            if ($cg->bookSn == $bookSn) {
+                //入库前再确认分配货位
+                $key = 'ghs_cg_order_scan_seat_' . $cg->id;
+                $noLock = util::lock($key);
+                if ($noLock) {
+                    //可以获得锁，没有在分配货位，可以进行货位分配
+                    $params = ['staffId' => $staffId, 'staffName' => $staffName];
+                    self::assign($cg, $shop, $params);
+                    util::unlock($key);
+                    //分配货位后上架和入库
+                    $shop = $data['shop'] ?? null;
+                    CgOrderItemClass::assignToPutOn($cg, $shop, $params);
+                } else {
+                    util::fail('正在分配货位，请1秒后再提交');
+                }
             }
         }