花材字段修改

biz-ghs/item/classes/ItemClass.php

@@ -25,11 +25,8 @@ class ItemClass extends BaseClass
         if (empty($list)) {
             return $data;
         }
-        $itemIds = array_column($list, 'itemId');
-        $itemData = xhItemService::getByIds($itemIds);
-        $itemData = array_column($itemData, null, 'id');
         foreach ($list as $k => $v) {
-            $list[$k]['itemName'] = $itemData[$v['itemId']]['name'] ?? '';
+            $list[$k]['itemName'] = $list[$k]['name'] ?? '';
         }
         $data['list'] = $list;
         if (isset($where['classId'])) {

biz-ghs/item/services/ItemService.php

@@ -29,6 +29,7 @@ class ItemService extends BaseService
         $itemId = $data['itemId']??0;
         $cost = $data['cost']??false;
         $addPrice = $data['addPrice']??false;
+        $stockWarning = $data['stockWarning']??false;
         //$shopId = $data['shopId']??0;
         if(!$merchantId ){
             util::fail("请选择供应商");
@@ -45,6 +46,9 @@ class ItemService extends BaseService
         if($addPrice===false){
             util::fail("请输入花材的加价");
         }
+        if($stockWarning===false){
+            util::fail("请输入库存预警值");
+        }
 
         //判断花材是否存在 调用平台花材的方法
         $checkItem = PtItemClass::getById($itemId);
@@ -56,10 +60,22 @@ class ItemService extends BaseService
         if(!$existItemClass){
             util::fail("花材分类不存在");
         }
+
         $existItem = ItemClass::exists(['itemId'=>$itemId,'merchantId'=>$merchantId]);
         if($existItem){
-            util::fail("花材已存在");
-        }
+            util::fail("花材已添加");
+        }
+        //补全花材信息
+        $data['name'] = $checkItem['name'];
+        $data['alias'] = $checkItem['alias'];
+        $data['py'] = $checkItem['py'];
+        $data['cover'] = $checkItem['cover'];
+        $data['ratio'] = $checkItem['ratio'];
+        $data['weight'] = $checkItem['weight'];
+        $data['bigUnit'] = $checkItem['bigUnit'];
+        $data['smallUnit'] = $checkItem['smallUnit'];
+
+
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try{

sql.sql

@@ -1979,3 +1979,34 @@ ALTER TABLE xhCustom DROP COLUMN totalRecharge;
 ALTER TABLE xhCustom CHANGE `rechargeAmount` `recharge` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值';
 ALTER TABLE xhGhsCustom CHANGE `rechargeAmount` `recharge` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计充值';
 
+=============linqh 2021.04.07
+=====
+ALTER TABLE `xhItem`
+MODIFY COLUMN `weight`  decimal(9,2) NOT NULL DEFAULT 0.00 COMMENT '每扎(大单位)重量(公斤)' AFTER `rank`,
+ADD COLUMN `name`  varchar(50) NOT NULL DEFAULT '' COMMENT '花材名称' AFTER `rank`,
+ADD COLUMN `alias`  varchar(50) NOT NULL DEFAULT '' COMMENT '别名' AFTER `name`,
+ADD COLUMN `py`  varchar(20) NOT NULL DEFAULT '' COMMENT '拼音' AFTER `alias`,
+ADD COLUMN `cover`  varchar(500) NOT NULL DEFAULT '' COMMENT '图片' AFTER `py`,
+ADD COLUMN `ratio`  tinyint(4) NOT NULL DEFAULT 1 COMMENT '比例' AFTER `cover`,
+ADD COLUMN `bigUnit`  smallint(6) NULL DEFAULT 0 COMMENT '大单位' AFTER `addPrice`,
+ADD COLUMN `smallUnit`  smallint(6) NULL DEFAULT 0 COMMENT '小单位' AFTER `bigUnit`;
+
+ALTER TABLE `xhGhsItem`
+MODIFY COLUMN `weight`  decimal(9,2) NOT NULL DEFAULT 0.00 COMMENT '每扎(大单位)重量(公斤)' AFTER `rank`,
+ADD COLUMN `name`  varchar(50) NOT NULL DEFAULT '' COMMENT '花材名称' AFTER `rank`,
+ADD COLUMN `alias`  varchar(50) NOT NULL DEFAULT '' COMMENT '别名' AFTER `name`,
+ADD COLUMN `py`  varchar(20) NOT NULL DEFAULT '' COMMENT '拼音' AFTER `alias`,
+ADD COLUMN `cover`  varchar(500) NOT NULL DEFAULT '' COMMENT '图片' AFTER `py`,
+ADD COLUMN `ratio`  tinyint(4) NOT NULL DEFAULT 1 COMMENT '比例' AFTER `cover`,
+ADD COLUMN `bigUnit`  smallint(6) NULL DEFAULT 0 COMMENT '大单位' AFTER `addPrice`,
+ADD COLUMN `smallUnit`  smallint(6) NULL DEFAULT 0 COMMENT '小单位' AFTER `bigUnit`;
+
+
+ALTER TABLE `xhGhsProduct`
+MODIFY COLUMN `stockWarning`  mediumint(9) NOT NULL DEFAULT 0 COMMENT '库存预警' AFTER `addPrice`,
+ADD COLUMN `weight`  decimal(9,2) NOT NULL DEFAULT 0 COMMENT '大单位重量 公斤' AFTER `stockWarning`,
+ADD COLUMN `alias`  varchar(50) NOT NULL DEFAULT '' COMMENT '别名' AFTER `weight`,
+ADD COLUMN `py`  varchar(20) NOT NULL DEFAULT '' COMMENT '拼音' AFTER `alias`,
+ADD COLUMN `ratio`  tinyint(4) NOT NULL DEFAULT 1 COMMENT '比例' AFTER `py`,
+ADD COLUMN `bigUnit`  smallint(6) NOT NULL DEFAULT 0 COMMENT '大单位' AFTER `ratio`,
+ADD COLUMN `smallUnit`  smallint(6) NOT NULL DEFAULT 0 COMMENT '小单位' AFTER `bigUnit`;