从平台导入花材

app-ghs/controllers/ItemController.php

@@ -85,7 +85,6 @@ class ItemController extends BaseController
             $transaction->rollBack();
             util::fail();
         }
-
     }
 
     public function actionUpdate()

biz-ghs/product/classes/ProductClass.php

@@ -995,81 +995,80 @@ class ProductClass extends BaseClass
 
             $itemData = $data;
             $itemData['classId'] = $defaultClassId;
-            $itemRes = PtItemClass::addItem($itemData);
+            //从平台导入花材方式添加有带itemId
+            if (isset($data['itemId']) == false || empty($data['itemId'])) {
+                $ptItemInfo = PtItemClass::addItem($itemData);
+                $data['itemId'] = $ptItemInfo['id'];
+            }
+
             $data['price'] = $data['cost'] + $data['addPrice'];
-            //获取到itemId
-            if ($itemRes && $itemRes['id']) {
-                $data['itemId'] = $itemRes['id'];
-                //根据sjId, 找到所有的shopId,都添加
-                $shopIds = ShopService::getShopIds($data['sjId']);
-                foreach ($shopIds as $shopId) {
-                    $data['shopId'] = $shopId;
-                    //不是当前门店不增加库存
-                    if ($currentShopId != $shopId) {
-                        $data['stock'] = 0;
-                    }
-                    $res = self::add($data);
-                    if ($stock > 0 && $res && $currentShopId == $shopId) {
-                        //有库存数量，增加盘盈记录 2021.7.9 linqh
-                        //增加盘点订单
-                        $pdOrderSn = orderSn::getGhsCheckSn();
-                        $pdOrderData = [];
-                        $pdOrderData['orderSn'] = $pdOrderSn;
-                        $pdOrderData['sjId'] = $data['sjId'];
-                        $pdOrderData['shopId'] = $data['shopId'];
-                        $pdOrderData['status'] = CheckOrderClass::STATUS_COMPLETE;
-                        $pdOrderData['bigNum'] = $stock;
-                        $pdOrderData['adminId'] = $data['adminId'];
-                        $pdOrderData['smallNum'] = 0;
-                        $pdOrderData['price'] = $data['price'];
-                        $pdOrderData['remark'] = '添加花材时初始化库存';
-                        CheckOrderClass::add($pdOrderData);
-
-                        $pdOrderItemData = [];
-                        $pdOrderItemData['orderSn'] = $pdOrderSn;
-                        $pdOrderItemData['productId'] = $res['id'];
-                        $pdOrderItemData['itemId'] = $data['itemId'];
-                        $pdOrderItemData['itemId'] = $data['itemId'];
-                        $pdOrderItemData['itemNum'] = $stock;
-                        $pdOrderItemData['itemStock'] = 0;
-                        $pdOrderItemData['profitLostNum'] = $stock;
-                        $itemInfo = [
-                            'itemName' => $name,
-                            'itemCover' => $data['cover'],
-                            'bigNum' => $stock,
-                            'smallNum' => 0,
-                            'bigNumStock' => 0,
-                            'smallNumStock' => 0,
-                            'bigNumProfitLoss' => $stock,
-                            'smallNumProfitLoss' => 0,
-                            'itemUnit' => 0,
-                            'ratio' => $ratio,
-                            'rank' => 'A',
-                            'bigUnit' => $data['bigUnit'],
-                            'smallUnit' => $data['smallUnit'],
-                        ];
-                        $pdOrderItemData['itemInfo'] = json_encode($itemInfo);
-                        $pdOrderItemData['itemPrice'] = $data['price'];
-                        $pdOrderItemData['itemCost'] = $data['cost'];
-                        CheckOrderItemClass::add($pdOrderItemData);
-
-                        $record = [];
-                        $record['sjId'] = $data['sjId'];
-                        $record['shopId'] = $data['shopId'];
-                        $record['orderSn'] = $pdOrderSn;
-                        $record['itemId'] = $data['itemId'];
-                        $record['productId'] = $res['id'];
-                        $record['itemNum'] = $stock;//盈亏数
-                        $record['oldStock'] = 0;
-                        $record['newStock'] = $stock; //新库存直接等于盘点的数量
-                        StockRecordService::addCheckOrderRecord($record);
-                    }
+            //根据sjId, 找到所有的shopId,都添加
+            $shopIds = ShopService::getShopIds($data['sjId']);
+            foreach ($shopIds as $shopId) {
+                $data['shopId'] = $shopId;
+                //非当前门店库存默认为0
+                if ($currentShopId != $shopId) {
+                    $data['stock'] = 0;
+                }
+                $res = self::add($data);
+                if ($stock > 0 && $res && $currentShopId == $shopId) {
+                    //有库存数量，增加盘盈记录 2021.7.9 linqh
+                    //增加盘点订单
+                    $pdOrderSn = orderSn::getGhsCheckSn();
+                    $pdOrderData = [];
+                    $pdOrderData['orderSn'] = $pdOrderSn;
+                    $pdOrderData['sjId'] = $data['sjId'];
+                    $pdOrderData['shopId'] = $data['shopId'];
+                    $pdOrderData['status'] = CheckOrderClass::STATUS_COMPLETE;
+                    $pdOrderData['bigNum'] = $stock;
+                    $pdOrderData['adminId'] = $data['adminId'];
+                    $pdOrderData['smallNum'] = 0;
+                    $pdOrderData['price'] = $data['price'];
+                    $pdOrderData['remark'] = '添加花材时初始化库存';
+                    CheckOrderClass::add($pdOrderData);
+
+                    $pdOrderItemData = [];
+                    $pdOrderItemData['orderSn'] = $pdOrderSn;
+                    $pdOrderItemData['productId'] = $res['id'];
+                    $pdOrderItemData['itemId'] = $data['itemId'];
+                    $pdOrderItemData['itemId'] = $data['itemId'];
+                    $pdOrderItemData['itemNum'] = $stock;
+                    $pdOrderItemData['itemStock'] = 0;
+                    $pdOrderItemData['profitLostNum'] = $stock;
+                    $itemInfo = [
+                        'itemName' => $name,
+                        'itemCover' => $data['cover'],
+                        'bigNum' => $stock,
+                        'smallNum' => 0,
+                        'bigNumStock' => 0,
+                        'smallNumStock' => 0,
+                        'bigNumProfitLoss' => $stock,
+                        'smallNumProfitLoss' => 0,
+                        'itemUnit' => 0,
+                        'ratio' => $ratio,
+                        'rank' => 'A',
+                        'bigUnit' => $data['bigUnit'],
+                        'smallUnit' => $data['smallUnit'],
+                    ];
+                    $pdOrderItemData['itemInfo'] = json_encode($itemInfo);
+                    $pdOrderItemData['itemPrice'] = $data['price'];
+                    $pdOrderItemData['itemCost'] = $data['cost'];
+                    CheckOrderItemClass::add($pdOrderItemData);
+
+                    $record = [];
+                    $record['sjId'] = $data['sjId'];
+                    $record['shopId'] = $data['shopId'];
+                    $record['orderSn'] = $pdOrderSn;
+                    $record['itemId'] = $data['itemId'];
+                    $record['productId'] = $res['id'];
+                    $record['itemNum'] = $stock;//盈亏数
+                    $record['oldStock'] = 0;
+                    $record['newStock'] = $stock; //新库存直接等于盘点的数量
+                    StockRecordService::addCheckOrderRecord($record);
                 }
-                $transaction->commit();
-            } else {
-                $transaction->rollBack();
-                util::fail("花材添加失败");
             }
+            $transaction->commit();
+
         } catch (\Exception $exception) {
             $transaction->rollBack();
             util::fail($exception->getMessage());