shish пре 4 година
родитељ
комит
ebc92e1372
2 измењених фајлова са 15 додато и 1 уклоњено
  1. 9 1
      biz-hd/goods/classes/GoodsClass.php
  2. 6 0
      biz-hd/work/classes/WorkClass.php

+ 9 - 1
biz-hd/goods/classes/GoodsClass.php

@@ -592,6 +592,9 @@ class GoodsClass extends BaseClass
             $hasReachTime = 0;
             $reachPeriod = 0;
             $reachDate = '0000-00-00';
+            $staffName = '';
+            $staffId = 0;
+            $bookName = '';
             if (!empty($orderId)) {
                 $order = OrderClass::getById($orderId, true);
                 if (!empty($order)) {
@@ -600,8 +603,10 @@ class GoodsClass extends BaseClass
                         $hasReachTime = 1;
                     }
                     $reachPeriod = $order->reachPeriod ?? 0;
+                    $staffName = $order->shopAdminName ?? '';
+                    $staffId = $order->shopAdminId ?? '';
+                    $bookName = $order->bookName ?? '';
                 }
-
             }
             $params = [
                 'goods' => [['productId' => $goodsId, 'num' => abs($newStock)]],
@@ -614,6 +619,9 @@ class GoodsClass extends BaseClass
                 'reachPeriod' => $reachPeriod,
                 'reachDate' => $reachDate,
                 'shopId' => $shopId,
+                'staffName' => $staffName,
+                'staffId' => $staffId,
+                'bookName' => $bookName,
             ];
             $main = MainClass::getById($mainId, true);
             if (empty($main)) {

+ 6 - 0
biz-hd/work/classes/WorkClass.php

@@ -93,6 +93,9 @@ class WorkClass extends BaseClass
         $hasReachTime = $data['hasReachTime'] ?? 0;
         $reachPeriod = $data['reachPeriod'] ?? 0;
         $reachDate = $data['reachDate'] ?? '0000-00-00';
+        $bookName = $data['bookName'] ?? '';
+        $staffName = $data['staffName'] ?? '';
+        $staffId = $data['staffId'] ?? 0;
 
         $ids = array_column($goods, 'productId');
         $info = GoodsClass::getByIds($ids, null, 'id');
@@ -149,6 +152,9 @@ class WorkClass extends BaseClass
                 'reachDate' => $reachDate,
                 'reachPeriod' => $reachPeriod,
                 'setItemNum' => $setItemNum,
+                'bookName' => $bookName,
+                'staffName' => $staffName,
+                'staffId' => $staffId,
             ];
             self::createFinish($current, $main);
         }