Merge branch 'ttxh-linqh' into ttxh

app-hd/controllers/StockController.php

@@ -6,6 +6,7 @@
 
 namespace hd\controllers;
 
+use biz\stock\classes\GoodsStockRecordClass;
 use bizGhs\stock\classes\StockRecordClass;
 use common\components\dateUtil;
 use common\components\util;
@@ -30,4 +31,21 @@ class StockController extends BaseController
         $list = StockRecordClass::getRecordList($where);
         util::success($list);
     }
+
+    //成品（goods）明细
+    public function actionGoodsDetail()
+    {
+        $get = Yii::$app->request->get();
+        $goodsId = $get['goodsId']??0;
+        $where = ['goodsId'=>$goodsId,'mainId'=>$this->mainId];
+        $searchTime = $get['searchTime'] ?? '';
+        if (!empty($searchTime)) {
+            $startTime = $get['startTime'] ?? '';
+            $endTime = $get['endTime'] ?? '';
+            $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
+            $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
+        }
+        $list = GoodsStockRecordClass::getRecordList($where);
+        util::success($list);
+    }
 }

console/controllers/InitController.php

@@ -47,8 +47,38 @@ class InitController extends Controller
     public function actionGhsCenter()
     {
 
-        //todo 分店需要建立自己独立的分类 和 花材与分类关系
-
+        //todo 分店需要建立自己独立的分类 和 花材与分类关系 --待测试
+        $shopList = ShopClass::getAllByCondition(['ptStyle' => 2], null, '*', null, true);
+        if (empty($shopList)) {
+            return false;
+        }
+        foreach ($shopList as $shop){
+            $mainId = $shop->mainId ?? 0;
+            $sjId = $shop->sjId;
+            $shopId = $shop->id;
+            if($mainId){
+                //判断花材分类是否存在
+                $itemClassResByMainId = ItemClassClass::getAllByCondition(['mainId'=>$mainId,'sjId'=>$sjId],null,"*");
+                if(empty($itemClassResByMainId)){
+                    //无，则要新增花材分类，根据sjId
+                    $itemClassResBySjId = ItemClassClass::getAllByCondition(['sjId'=>$sjId],null,"*");
+                    if($itemClassResBySjId){
+                        foreach ($itemClassResBySjId as $itemClass){
+                            $data = $itemClass;
+                            $oldItemClassId = $data['id'];
+                            unset($data['id']);
+                            unset($data['addTime']);
+                            unset($data['updateTime']);
+                            $data['mainId'] = $mainId;
+                            $save = ItemClassClass::add($data);
+                            $newItemClassId = $save['id'];
+                            ItemClass::updateByCondition(['shopId' => $shopId,'classId'=>$oldItemClassId], ['mainId' => $mainId,'classId'=>$newItemClassId]);
+                        }
+                    }
+                }
+            }
+        }
+        /***分店需要建立自己独立的分类 和 花材与分类关系*  end **/
 
 
         //批发
@@ -123,8 +153,7 @@ class InitController extends Controller
 
 
             //花材
-            ItemClass::updateByCondition(['shopId' => $shopId], ['mainId' => $mainId]);
-            //花材分类
+
 
 //todo 临时处理
 if($shop->default == 1){