shish 2 years ago
parent
commit
27ba4fe619

+ 9 - 1
app-ghs/controllers/PurchaseOrderController.php

@@ -477,11 +477,12 @@ class PurchaseOrderController extends BaseController
                 $order->location = 1;
                 $order->save();
             }
+            $transaction->commit();
+
             if (isset($order->needPrint) && $order->needPrint == 1) {
                 PurchaseOrderClass::printTicket($order);
             }
 
-            $transaction->commit();
             util::success($order);
         } catch (\Exception $e) {
             $transaction->rollBack();
@@ -491,6 +492,13 @@ class PurchaseOrderController extends BaseController
         }
     }
 
+    //分配货位号 ssh 20240619
+    public function actionAssignSeat()
+    {
+        $get = Yii::$app->request->get();
+        $id = $get['id'] ?? 0;
+    }
+
     //订单列表
     public function actionList()
     {

+ 8 - 0
biz-ghs/book/classes/BookItemClass.php

@@ -3,6 +3,7 @@
 namespace bizGhs\book\classes;
 
 use bizGhs\base\classes\BaseClass;
+use bizGhs\custom\classes\CustomClass;
 use bizGhs\product\classes\ProductClass;
 use bizGhs\shop\classes\ShopClass;
 use common\components\noticeUtil;
@@ -231,6 +232,11 @@ class BookItemClass extends BaseClass
         $customId = $order->customId ?? 0;
         $customName = $order->customName ?? '';
         $customNamePy = $order->customNamePy ?? '';
+        $custom = CustomClass::getById($customId, true);
+        if (empty($custom)) {
+            util::fail('没有找到客户');
+        }
+        $seatSn = $custom->seatSn ?? '';
 
         $ids = array_column($batchData, 'productId');
         $infoList = ProductClass::getAllByCondition(['id' => ['in', $ids]], null, '*', 'id', true);
@@ -282,6 +288,7 @@ class BookItemClass extends BaseClass
                     'customId' => $customId,
                     'customName' => $customName,
                     'customNamePy' => $customNamePy,
+                    'seatSn' => $seatSn,
                     'cgStaffId' => $cgStaffId,
                     'cgStaffName' => $cgStaffName,
                     'bookSn' => $bookSn,
@@ -298,6 +305,7 @@ class BookItemClass extends BaseClass
                 $currentData = [
                     'name' => $customName,
                     'py' => $customNamePy,
+                    'seatSn' => $seatSn,
                     'mainId' => $mainId,
                     'customId' => $customId,
                     'bookSn' => $bookSn,