订单驱动任务

app-hd/controllers/WorkController.php

@@ -119,16 +119,9 @@ class WorkController extends BaseController
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
-            $product = $post['product'] ?? '';
+            //去掉花束所用的花材，没有意义，不考虑花束用了多少花材
             $post['product'] = [];
-            if (!empty($product)) {
-                $arr = json_decode($product, true);
-                if (!empty($arr)) {
-                    $post['product'] = $arr;
-                }
-            }
             $post['num'] = isset($post['num']) && $post['num'] > 0 ? $post['num'] : 1;
-
             $default = CategoryClass::getByCondition(['mainId' => $mainId, 'flower' => 1, 'default' => 1], true);
             if (empty($default)) {
                 $catData = [
@@ -152,13 +145,11 @@ class WorkController extends BaseController
             $main = $this->main;
             $work = WorkClass::createFinish($post, $main);
             $transaction->commit();
-
             $complete = $post['complete'] ?? 0;
             $print = $post['print'] ?? 1;
             if ($complete == 1 && $print == 1) {
                 WorkClass::print($work, $this->shop, false);
             }
-
             util::success($work);
         } catch (\Exception $e) {
             $transaction->rollBack();

biz-hd/work/classes/WorkClass.php

@@ -106,7 +106,7 @@ class WorkClass extends BaseClass
 
     public static function goodsCreateFinish($data, $main)
     {
-        $goods = $data['goods'] ?? '';
+        $goods = $data['goods'] ?? [];
         $remark = $data['remark'] ?? '';
         $sjId = $data['sjId'] ?? 0;
         $shopId = $data['shopId'] ?? 0;
@@ -143,20 +143,6 @@ class WorkClass extends BaseClass
             $setItemNum = $currentInfo['setItemNum'] ?? 0;
             $workNum = $val['num'] ?? 0;
             $cover = !empty($currentInfo['cover']) ? $currentInfo['cover'] : 'hhb_small.png';
-            $product = [];
-            $goodsItem = GoodsItemClass::getAllByCondition(['goodsId' => $goodsId], null, '*');
-            if (!empty($goodsItem)) {
-                foreach ($goodsItem as $one) {
-                    $itemId = $one['itemId'] ?? 0;
-                    $unitType = $one['unitType'] ?? 0;
-                    $num = $one['num'] ?? 0;
-                    $product[] = [
-                        'productId' => $itemId,
-                        'num' => $num,
-                        'unitType' => $unitType,
-                    ];
-                }
-            }
             $goodsCat = GoodsCategoryClass::getByCondition(['gId' => $goodsId], true);
             $catId = $goodsCat->cId ?? 0;
             if (empty($catId)) {
@@ -178,7 +164,6 @@ class WorkClass extends BaseClass
                 'remark' => $remark,
                 'catId' => $catId,
                 'catName' => $catName,
-                'product' => $product,
                 'goodsId' => $goodsId,
                 'goodsSn' => $goodsSn,
                 'sjId' => $sjId,
@@ -214,30 +199,11 @@ class WorkClass extends BaseClass
 
     public static function createFinish($data, $main)
     {
-        $setItemNum = $data['setItemNum'] ?? 0;
         unset($data['setItemNum']);
         $data['flowerNum'] = isset($data['flowerNum']) && is_numeric($data['flowerNum']) ? $data['flowerNum'] : 0;
         $data['sn'] = StatWorkCountClass::addOrder($main);
         $work = WorkClass::addWork($data, $main);
-        $product = $data['product'] ?? [];
         $complete = $data['complete'] ?? 0;
-        if (!empty($product)) {
-            $mainId = $main->id ?? 0;
-            $hd = dict::getDict('ptStyle', 'hd');
-            $shop = ShopClass::getByCondition(['mainId' => $mainId, 'ptStyle' => $hd], true);
-            $stockModel = $shop->stockModel ?? 0;
-            //库存管理管到支模式，并且商品的花材数量设置ok，则制作单自动锁定并扣库存 或者 收银台直接完成花材的情况
-            if (($stockModel == 1 && $setItemNum == 1) || $complete == 1) {
-                //修改用材
-                WorkItemClass::modifyItem($work, $product);
-                //锁定库存
-                //WorkItemClass::lock($work);
-            } else {
-                //库存管理管到扎模式，不再自动扣库存，并且清空花材
-                $workSn = $work->workSn ?? '';
-                WorkItemClass::deleteByCondition(['workSn' => $workSn]);
-            }
-        }
         if ($complete == 1) {
             //直接完成
             WorkClass::finish($work);