添加花材

app-hd/controllers/ProductController.php

@@ -12,6 +12,7 @@ use biz\shop\classes\ShopClass;
 use bizGhs\item\classes\ItemClassClass;
 use bizGhs\product\classes\ProductClass;
 use bizGhs\product\services\ProductService;
+use common\components\stringUtil;
 use common\components\util;
 use Yii;
 
@@ -20,6 +21,14 @@ class ProductController extends BaseController
 
     public $guestAccess = ['ghs-item'];
 
+    //获取拼音缩写 ssh 20210707
+    public function actionPy()
+    {
+        $name = Yii::$app->request->get('name');
+        $py = stringUtil::py($name);
+        util::success(['py' => $py]);
+    }
+
     //所有花材
     public function actionAll()
     {

app-hd/controllers/PtItemController.php

@@ -3,6 +3,7 @@
 namespace hd\controllers;
 
 use biz\item\classes\PtItemClass;
+use common\components\imgUtil;
 use common\components\stringUtil;
 use common\components\util;
 use Yii;
@@ -31,4 +32,17 @@ class PtItemController extends BaseController
         util::success($list);
     }
 
+    //获取平台花材详情 ssh 20210826
+    public function actionDetail()
+    {
+        $id = Yii::$app->request->get('id', 0);
+        $info = PtItemClass::getById($id);
+        if (empty($info)) {
+            util::fail('没有找到花材');
+        }
+        $info['shortCover'] = $info['cover'] ?? '';
+        $info['cover'] = imgUtil::groupImg($info['shortCover']);
+        util::success($info);
+    }
+
 }

biz-ghs/product/classes/ProductClass.php

@@ -780,7 +780,7 @@ class ProductClass extends BaseClass
                     util::fail('库存请填写整数');
                 }
                 //增加盘点记录 2021.7.27
-                $ratio = $upData['ratio'] ?? $product->ratio;//取最新比例
+                $ratio = $product->ratio ?? 0;
                 $formNum = ProductClass::formatStock($data['stock'], $ratio);
                 $ghsItemInfo = [['productId' => $product->id, 'bigNum' => $formNum['bigNum'], 'smallNum' => $formNum['smallNum'],]];
                 $pdData = [];
@@ -826,14 +826,6 @@ class ProductClass extends BaseClass
             //修改价格
             self::changePrice($product, $data['price'], self::PRICE_LABEL_CHANGE);
         }
-
-        if (isset($data['weight'])) {
-            $upData['weight'] = $data['weight'];
-        }
-        if (isset($data['smallRatio'])) {
-            $upData['smallRatio'] = $data['smallRatio'];
-        }
-
         if (isset($data['skPrice']) && is_numeric($data['skPrice'])) {
             $upData['skPrice'] = $data['skPrice'];
         } else {
@@ -871,17 +863,7 @@ class ProductClass extends BaseClass
         if (isset($data['stockWarning'])) {
             $upData['stockWarning'] = $data['stockWarning'];
         }
-        if (isset($data['bigUnitId']) || isset($data['smallUnitId'])) {
-            $unit = UnitClass::getAllByCondition([], null, '*', 'id');
-            if (isset($data['bigUnitId']) && is_numeric($data['bigUnitId'])) {
-                $upData['bigUnitId'] = $data['bigUnitId'];
-                $upData['bigUnit'] = $unit[$data['bigUnitId']]['name'] ?? '';
-            }
-            if (isset($data['smallUnitId']) && is_numeric($data['smallUnitId'])) {
-                $upData['smallUnitId'] = $data['smallUnitId'];
-                $upData['smallUnit'] = $unit[$data['smallUnitId']]['name'] ?? '';
-            }
-        }
+
         if (isset($data['inTurn'])) {
             $upData['inTurn'] = $data['inTurn'];
         }