供货商添加花材

app-ghs/controllers/ItemController.php

@@ -37,6 +37,7 @@ class ItemController extends BaseController
     {
         $post = Yii::$app->request->post();
         $data = $post['data']; //[{itemId:1000,classId:2,cost:1,addPrice:1,stockWarning:1}]
+        //2021.7.11 linqh  参数改为 只传售价，成本价和加价 各一半[{itemId:1000,classId:2,price:1,stockWarning:1}]
         if(empty($data)){
             util::fail("参数错误");
         }

app-ghs/controllers/PtItemController.php

@@ -30,6 +30,8 @@ class PtItemController extends BaseController
         if (!empty($classId)) {
             $where['classId'] = $classId;
         }
+        //增加状态正常的 delStatus = 0  2021.7.7
+        $where['delStatus'] = 0;
         $sjId = $this->sjId;
         $list = PtItemClass::getItemList($where, true, $sjId);
         util::success($list);

biz-ghs/item/services/ItemService.php

@@ -32,6 +32,7 @@ class ItemService extends BaseService
         $cost = $data['cost'] ?? false;
         $addPrice = $data['addPrice'] ?? false;
         $stockWarning = $data['stockWarning'] ?? false;
+        $price = $data['price']??false;
         //$shopId = $data['shopId']??0;
         if (!$sjId) {
             util::fail("请选择供应商");
@@ -43,11 +44,20 @@ class ItemService extends BaseService
             util::fail("请选择花材");
         }
         if ($cost === false) {
-            util::fail("请输入花材的成本价");
+            //util::fail("请输入花材的成本价");
         }
         if ($addPrice === false) {
-            util::fail("请输入花材的加价");
+            //util::fail("请输入花材的加价");
         }
+        if($price==false || $price <= 0){
+            util::fail("请输入正确花材的售价");
+        }
+        $cost = bcdiv($price,2,2);
+        $addPrice = bcsub($price,$cost,2);
+        $data['cost'] = $cost;
+        $data['addPrice'] = $addPrice;
+
+        
         if ($stockWarning === false) {
             util::fail("请输入库存预警值");
         }
@@ -76,7 +86,7 @@ class ItemService extends BaseService
         $data['weight'] = $checkItem['weight'];
         $data['bigUnit'] = $checkItem['bigUnit'];
         $data['smallUnit'] = $checkItem['smallUnit'];
-        $data['price'] = bcadd($cost,$addPrice,2);
+        //$data['price'] = bcadd($cost,$addPrice,2);
 
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();

biz/item/classes/PtItemClass.php

@@ -22,8 +22,11 @@ class PtItemClass extends BaseClass
         $list = $data['list'];
         $sjItemIds = [];
         if ($showSelect && $sjId) {
-            $sjItemIds = ItemClass::getGhsItemAll($sjId);
+            //$sjItemIds = ItemClass::getGhsItemAll($sjId);
+            //改为从product表中取 最准确 linqh 2021.7.11
+            $sjItemIds = ProductClass::getAllByCondition($where = ['sjId'=>$sjId],null,"*");
             $sjItemIds = array_column($sjItemIds, 'itemId');
+            $sjItemIds = array_unique($sjItemIds);
         }
         $classIds = array_column($list, "classId");
         $classNameMap = PtItemClassClass::getNameMap($classIds);