inbook

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -69,7 +69,7 @@ class PurchaseOrderClass extends BaseClass
     const IN_TYPE_LATER = 0;
     const IN_TYPE_NOW = 1;
 
-    public static function assign($cg,$shop,$params)
+    public static function assign($cg, $shop, $params)
     {
         $bookSn = $cg->bookSn ?? 0;
         $orderSn = $cg->orderSn ?? '';
@@ -155,8 +155,8 @@ class PurchaseOrderClass extends BaseClass
 
                 //路上数量增加
                 $bookItemCustomRes = BookItemCustomClass::addRoadNum($bookItemCustomRes, $remainNeedSendNum, $cg, $shop, $currentItemInfo, $params);
-                $bookCustomRes = BookCustomClass::addRoadNum($bookCustomRes,$remainNeedSendNum,$cg,$shop,$currentItemInfo,$params);
-                $bookItemRes = BookItemClass::addRoadNum($bookItemRes,$remainNeedSendNum,$cg,$shop,$currentItemInfo,$params);
+                $bookCustomRes = BookCustomClass::addRoadNum($bookCustomRes, $remainNeedSendNum, $cg, $shop, $currentItemInfo, $params);
+                $bookItemRes = BookItemClass::addRoadNum($bookItemRes, $remainNeedSendNum, $cg, $shop, $currentItemInfo, $params);
 
                 //确认已分配数量增加
                 $cgItem->confirmSendNum = bcadd($cgItem->confirmSendNum, $remainNeedSendNum);
@@ -510,12 +510,12 @@ class PurchaseOrderClass extends BaseClass
             $noLock = util::lock($key);
             if ($noLock) {
                 //可以获得锁，没有在分配货位，可以进行货位分配
-                $params = ['staffId'=>$staffId,'staffName'=>$staffName];
-                self::assign($cg,$shop,$params);
+                $params = ['staffId' => $staffId, 'staffName' => $staffName];
+                self::assign($cg, $shop, $params);
                 util::unlock($key);
                 //分配货位后上架和入库
-                $shop = $data['shop']??null;
-                CgOrderItemClass::assignToPutOn($cg,$shop,$params);
+                $shop = $data['shop'] ?? null;
+                CgOrderItemClass::assignToPutOn($cg, $shop, $params);
             } else {
                 util::fail('正在分配货位，请1秒后再提交');
             }
@@ -1268,12 +1268,16 @@ class PurchaseOrderClass extends BaseClass
         $bookSn = $orderData['bookSn'] ?? 0;
         //是否需要提醒更新货位
         $needRemindRefreshSeat = 0;
+        $inBooking = 0;
         if (!empty($shopBookSn) && $shopBookSn == $bookSn) {
+            //在预订状态，用于采购单售后时判断是否也要退货位上花材
+            $inBooking = 1;
             if (isset($orderData['status']) && $orderData['status'] == 3) {
                 $needRemindRefreshSeat = 1;
             }
         }
         $orderData['needRemindRefreshSeat'] = $needRemindRefreshSeat;
+        $orderData['inBooking'] = $inBooking;
         return $orderData;
     }