代码目录调整

app/ghs/controllers/ItemClassController.php

@@ -7,7 +7,7 @@
 namespace ghs\controllers;
 
 
-use bizGhs\itemClass\services\ItemClassService;
+use bizGhs\item\classes\ItemClassClass;
 use common\components\util;
 use Yii;
 class ItemClassController extends BaseController
@@ -16,14 +16,14 @@ class ItemClassController extends BaseController
     public function actionList()
     {
         $where = ['ghsId' => $this->ghsId];
-        $list = ItemClassService::getGhsItemClassList($where);
+        $list = ItemClassClass::getGhsItemClassList($where);
         util::success($list);
     }
 
     public function actionAdd()
     {
         $get = Yii::$app->request->get();
-        $res = ItemClassService::addGhsItemClass($this->ghsId,$get);
+        $res = ItemClassClass::addGhsItemClass($this->ghsId,$get);
         util::complete('添加成功');
     }
 }

biz-ghs/demo/classes/DemoClass.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizGhs\demo\classes;
+
+
+use bizGhs\base\classes\BaseClass;
+
+class DemoClass extends BaseClass
+{
+
+    public static $baseFile = '\bizGhs\demo\models\Demo';
+
+
+}

biz-ghs/demo/models/Demo.php

@@ -0,0 +1,10 @@
+<?php
+namespace bizGhs\demo\models;
+use bizGhs\base\models\Base;
+class Demo extends Base
+{
+    public static function tableName()
+    {
+        return 'xhGhsItem';
+    }
+}

biz-ghs/demo/services/DemoService.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizGhs\demo\services;
+
+
+use bizGhs\base\services\BaseService;
+
+class DemoService extends BaseService
+{
+
+
+
+
+}

biz-ghs/item/classes/ItemClass.php

@@ -8,6 +8,7 @@ namespace bizGhs\item\classes;
 
 
 use bizGhs\base\classes\BaseClass;
+use common\components\util;
 
 class ItemClass extends BaseClass
 {
@@ -15,4 +16,60 @@ class ItemClass extends BaseClass
     public static $baseFile = '\bizGhs\item\models\Item';
 
 
+    //新增花材
+    public static function addGhsItem($data)
+    {
+        $ghsId = $data['ghsId']??0;
+        $classId = $data['classId']??0;
+        $itemId = $data['itemId']??0;
+
+        if(!$ghsId){
+            util::fail("请选择供应商");
+        }
+        if(!$classId){
+            util::fail("请选择分类");
+        }
+        if(!$itemId){
+            util::fail("请选择花材");
+        }
+        //判断花材是否存在 调用平台花材的方法
+        //todo
+        $res = ItemClass::add($data);
+        return $res;
+    }
+
+    //批量新增花材（初始化使用）
+    public static function batchAddGhsItem($data)
+    {
+        ItemClass::batchAdd($data);
+        return true;
+    }
+
+    //修改花材的信息（库存预警、每扎加价、每扎重量）
+    public static function updateGshItem($id,$stockWarning,$unitAddPrice,$unitWeight)
+    {
+        $model = ItemClass::getById($id);
+        if(!$model){
+            util::fail("该花材不存在");
+        }
+        $data['stockWarning'] = $stockWarning;
+        $data['unitAddPrice'] = $unitAddPrice;
+        $data['unitWeight'] = $unitWeight;
+        ItemClass::updateById($id,$data);
+        return true;
+
+    }
+
+    //删除花材
+    public static function deleteGhsItem($id)
+    {
+        $model = ItemClass::getById($id);
+        if(!$model){
+            util::fail("该花材不存在");
+        }
+        //todo 要修改相应得花材详情表
+
+        ItemClass::deleteById($id);
+        return true;
+    }
 }

biz-ghs/itemClass/services/ItemClassService.php → biz-ghs/item/classes/ItemClassClass.php

@@ -1,18 +1,22 @@
 <?php
 /**
  * User: admin
- * Date Time: 2021/1/13 17:16
+ * Date Time: 2021/1/13 17:12
  */
 
-namespace bizGhs\itemClass\services;
+namespace bizGhs\item\classes;
 
 
-use bizGhs\base\services\BaseService;
-use bizGhs\itemClass\classes\ItemClassClass;
+use bizGhs\base\classes\BaseClass;
 use common\components\util;
-class ItemClassService extends BaseService
+
+//use biz\base\classes\BaseClass;
+class ItemClassClass extends BaseClass
 {
 
+    public static $baseFile = '\bizGhs\item\models\ItemClass';
+
+
 
     public static function getGhsItemClassList($where)
     {
@@ -28,7 +32,6 @@ class ItemClassService extends BaseService
     //新增花材分类
     public static function addGhsItemClass($gshId,$data)
     {
-
         if(!$gshId){
             util::fail("请选择供应商");
         }
@@ -42,7 +45,7 @@ class ItemClassService extends BaseService
     }
 
     //批量新增花材分类
-    public static function batchAddGhsItemClass(array $data)
+    public static function batchAddGhsItemClass($data)
     {
         ItemClassClass::batchAdd($data);
         return true;
@@ -72,4 +75,6 @@ class ItemClassService extends BaseService
         ItemClassClass::deleteById($id);
         return true;
     }
+
+
 }

biz-ghs/itemInfo/classes/ItemInfoClass.php → biz-ghs/item/classes/ItemInfoClass.php

@@ -4,7 +4,7 @@
  * Date Time: 2021/1/13 17:12
  */
 
-namespace bizGhs\itemInfo\classes;
+namespace bizGhs\item\classes;
 
 
 use bizGhs\base\classes\BaseClass;
@@ -12,7 +12,7 @@ use bizGhs\base\classes\BaseClass;
 class ItemInfoClass extends BaseClass
 {
 
-    public static $baseFile = '\bizGhs\itemInfo\models\ItemInfo';
+    public static $baseFile = '\bizGhs\item\models\ItemInfo';
 
 
 }

biz-ghs/itemClass/models/ItemClass.php → biz-ghs/item/models/ItemClass.php

@@ -3,7 +3,7 @@
  * User: admin
  * Date Time: 2021/1/13 14:13
  */
-namespace bizGhs\itemClass\models;
+namespace bizGhs\item\models;
 use bizGhs\base\models\Base;
 class ItemClass extends Base
 {

biz-ghs/itemInfo/models/ItemInfo.php → biz-ghs/item/models/ItemInfo.php

@@ -3,7 +3,7 @@
  * User: admin
  * Date Time: 2021/1/13 14:13
  */
-namespace bizGhs\itemInfo\models;
+namespace bizGhs\item\models;
 use bizGhs\base\models\Base;
 class ItemInfo extends Base
 {

biz-ghs/item/services/ItemClassService.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * User: admin
+ * Date Time: 2021/1/13 17:16
+ */
+
+namespace bizGhs\item\services;
+
+
+use bizGhs\base\services\BaseService;
+
+class ItemClassService extends BaseService
+{
+
+
+
+}

biz-ghs/itemInfo/services/ItemInfoService.php → biz-ghs/item/services/ItemInfoService.php

@@ -4,7 +4,7 @@
  * Date Time: 2021/1/13 17:16
  */
 
-namespace bizGhs\itemInfo\services;
+namespace bizGhs\item\services;
 
 
 use bizGhs\base\services\BaseService;

biz-ghs/item/services/ItemService.php

@@ -6,70 +6,12 @@
 
 namespace bizGhs\item\services;
 
-
 use bizGhs\base\services\BaseService;
-use bizGhs\item\classes\ItemClass;
-use common\components\util;
 
 
 class ItemService extends BaseService
 {
 
-    //新增花材
-    public static function addGhsItem($data)
-    {
-        $ghsId = $data['ghsId']??0;
-        $classId = $data['classId']??0;
-        $itemId = $data['itemId']??0;
-
-        if(!$ghsId){
-            util::fail("请选择供应商");
-        }
-        if(!$classId){
-            util::fail("请选择分类");
-        }
-        if(!$itemId){
-            util::fail("请选择花材");
-        }
-        //判断花材是否存在 调用平台花材的方法
-        //todo
-        $res = ItemClass::add($data);
-        return $res;
-    }
-
-    //批量新增花材（初始化使用）
-    public static function batchAddGhsItem($data)
-    {
-        ItemClass::batchAdd($data);
-        return true;
-    }
-
-    //修改花材的信息（库存预警、每扎加价、每扎重量）
-    public static function updateGshItem($id,$stockWarning,$unitAddPrice,$unitWeight)
-    {
-        $model = ItemClass::getById($id);
-        if(!$model){
-            util::fail("该花材不存在");
-        }
-        $data['stockWarning'] = $stockWarning;
-        $data['unitAddPrice'] = $unitAddPrice;
-        $data['unitWeight'] = $unitWeight;
-        ItemClass::updateById($id,$data);
-        return true;
-
-    }
-
-    //删除花材
-    public static function deleteGhsItem($id)
-    {
-        $model = ItemClass::getById($id);
-        if(!$model){
-            util::fail("该花材不存在");
-        }
-        //todo 要修改相应得花材详情表
 
-        ItemClass::deleteById($id);
-        return true;
-    }
 
 }

biz-ghs/itemClass/classes/ItemClassClass.php

@@ -1,22 +0,0 @@
-<?php
-/**
- * User: admin
- * Date Time: 2021/1/13 17:12
- */
-
-namespace bizGhs\itemClass\classes;
-
-
-use bizGhs\base\classes\BaseClass;
-//use biz\base\classes\BaseClass;
-class ItemClassClass extends BaseClass
-{
-
-    public static $baseFile = '\bizGhs\itemClass\models\ItemClass';
-
-
-
-
-
-
-}