shish 5 жил өмнө
parent
commit
d18d1965e4

+ 26 - 7
app-ghs/controllers/ItemClassController.php

@@ -11,6 +11,7 @@ use bizGhs\item\classes\ItemClassClass;
 use bizGhs\item\services\ItemClassService;
 use common\components\util;
 use Yii;
+
 class ItemClassController extends BaseController
 {
 
@@ -25,24 +26,42 @@ class ItemClassController extends BaseController
     {
         $post = Yii::$app->request->post();
         $post['adminId'] = $this->adminId;
-        $res = ItemClassClass::addGhsItemClass($this->sjId,$post);
+        ItemClassClass::addGhsItemClass($this->sjId, $post);
         util::complete('添加成功');
     }
 
     public function actionUpdate()
     {
         $data = Yii::$app->request->post();
-
-        $data['adminId'] = $this->adminId;
-        $data['sjId'] = $this->sjId;
-        ItemClassClass::updateGhsItemClass($data);
+        $id = $data['id'] ?? 0;
+        $name = $data['name'] ?? '';
+        $class = ItemClassClass::getById($id, true);
+        if (empty($class)) {
+            util::fail('没有找到分类');
+        }
+        if ($class->isDefault == 1) {
+            util::fail('不能修改默认分组');
+        }
+        $itemName = $class->name;
+        if ($itemName == $name) {
+            util::success('修改成功');
+        }
+        if ($class->sjId != $this->sjId) {
+            util::fail('没有权限修改');
+        }
+        $has = ItemClassClass::getByCondition(['sjId' => $this->sjId, 'name' => $name]);
+        if (!empty($has)) {
+            util::fail('名称已经存在');
+        }
+        $class->name = $name;
+        $class->save();
         util::complete('修改成功');
     }
 
     public function actionDelete()
     {
-        $id = Yii::$app->request->get('id',0);
-        ItemClassService::deleteGhsItemClass($id,$this->sjId);
+        $id = Yii::$app->request->get('id', 0);
+        ItemClassService::deleteGhsItemClass($id, $this->sjId);
         util::complete('操作成功');
     }
 

+ 26 - 7
app-hd/controllers/ItemClassController.php

@@ -10,6 +10,7 @@ use bizGhs\item\classes\ItemClassClass;
 use bizGhs\item\services\ItemClassService;
 use common\components\util;
 use Yii;
+
 class ItemClassController extends BaseController
 {
     public function actionList()
@@ -23,24 +24,42 @@ class ItemClassController extends BaseController
     {
         $post = Yii::$app->request->post();
         $post['adminId'] = $this->adminId;
-        ItemClassClass::addGhsItemClass($this->sjId,$post);
+        ItemClassClass::addGhsItemClass($this->sjId, $post);
         util::complete('添加成功');
     }
 
     public function actionUpdate()
     {
         $data = Yii::$app->request->post();
-
-        $data['adminId'] = $this->adminId;
-        $data['sjId'] = $this->sjId;
-        ItemClassClass::updateGhsItemClass($data);
+        $id = $data['id'] ?? 0;
+        $name = $data['name'] ?? '';
+        $class = ItemClassClass::getById($id, true);
+        if (empty($class)) {
+            util::fail('没有找到分类');
+        }
+        if ($class->isDefault == 1) {
+            util::fail('不能修改默认分组');
+        }
+        $itemName = $class->name;
+        if ($itemName == $name) {
+            util::success('修改成功');
+        }
+        if ($class->sjId != $this->sjId) {
+            util::fail('没有权限修改');
+        }
+        $has = ItemClassClass::getByCondition(['sjId' => $this->sjId, 'name' => $name]);
+        if (!empty($has)) {
+            util::fail('名称已经存在');
+        }
+        $class->name = $name;
+        $class->save();
         util::complete('修改成功');
     }
 
     public function actionDelete()
     {
-        $id = Yii::$app->request->get('id',0);
-        ItemClassService::deleteGhsItemClass($id,$this->sjId);
+        $id = Yii::$app->request->get('id', 0);
+        ItemClassService::deleteGhsItemClass($id, $this->sjId);
         util::complete('操作成功');
     }