下单和制作单流程优化

biz-hd/goods/classes/GoodsClass.php

@@ -7,6 +7,7 @@ use biz\shop\classes\ShopCapitalClass;
 use biz\stat\classes\StatCgPlantClass;
 use biz\stat\classes\StatOutClass;
 use bizHd\goods\services\GoodsCategoryService;
+use bizHd\order\classes\OrderClass;
 use bizHd\work\classes\WorkClass;
 use bizHd\work\classes\WorkItemClass;
 use common\components\business;
@@ -502,6 +503,20 @@ class GoodsClass extends BaseClass
             $sjId = $goodsData['sjId'] ?? 0;
             $orderSn = $params['orderSn'] ?? '';
             $orderId = $params['orderId'] ?? 0;
+            $hasReachTime = 0;
+            $reachPeriod = 0;
+            $reachDate = '0000-00-00';
+            if (!empty($orderId)) {
+                $order = OrderClass::getById($orderId, true);
+                if (!empty($order)) {
+                    $reachDate = $order->reachDate ?? '';
+                    if (!empty($reachDate) && $reachDate != '0000-00-00') {
+                        $hasReachTime = 1;
+                    }
+                    $reachPeriod = $order->reachPeriod ?? 0;
+                }
+
+            }
             $params = [
                 'goods' => [['productId' => $goodsId, 'num' => abs($newStock)]],
                 'remark' => '',
@@ -509,6 +524,9 @@ class GoodsClass extends BaseClass
                 'mainId' => $mainId,
                 'orderSn' => $orderSn,
                 'orderId' => $orderId,
+                'hasReachTime' => $hasReachTime,
+                'reachPeriod' => $reachPeriod,
+                'reachDate' => $reachDate,
             ];
             $main = MainClass::getById($mainId, true);
             if (empty($main)) {

biz-hd/work/classes/WorkClass.php

@@ -66,6 +66,10 @@ class WorkClass extends BaseClass
         $sjId = $data['sjId'] ?? 0;
         $shopId = $data['shopId'] ?? 0;
         $mainId = $data['mainId'] ?? 0;
+        $hasReachTime = $data['hasReachTime'] ?? 0;
+        $reachPeriod = $data['reachPeriod'] ?? 0;
+        $reachDate = $data['reachDate'] ?? '0000-00-00';
+
         $ids = array_column($goods, 'productId');
         $info = GoodsClass::getByIds($ids, null, 'id');
         foreach ($goods as $key => $val) {
@@ -116,6 +120,9 @@ class WorkClass extends BaseClass
                 'flowerNum' => $flowerNum,
                 'orderSn' => $orderSn,
                 'orderId' => $orderId,
+                'hasReachTime' => $hasReachTime,
+                'reachDate' => $reachDate,
+                'reachPeriod' => $reachPeriod,
             ];
             self::createFinish($current, $main);
         }