制作单

app-hd/controllers/ProductController.php

@@ -7,14 +7,9 @@
 namespace hd\controllers;
 
 use biz\ghs\classes\GhsClass;
-use biz\shop\classes\ShopClass;
-use bizGhs\admin\classes\AdminClass;
-use bizGhs\custom\classes\CustomClass;
 use bizGhs\item\classes\ItemClassClass;
 use bizGhs\product\classes\ProductClass;
 use bizGhs\product\services\ProductService;
-use bizGhs\item\services\ItemService;
-use common\components\dict;
 use common\components\util;
 use Yii;
 

biz-ghs/product/classes/ProductClass.php

@@ -133,8 +133,9 @@ class ProductClass extends BaseClass
 
             $list[$k]['price'] = $price;
             $list[$k]['bigPrice'] = $price;
-
+            $smallRatio = $v['smallRatio'] ?? 0;
             $smallPrice = bcdiv($price, $ratio, 2);
+            $smallPrice = bcmul($smallPrice, $smallRatio, 2);
             $list[$k]['smallPrice'] = $smallPrice;
 
             //自动调价的价格
@@ -811,6 +812,9 @@ class ProductClass extends BaseClass
         if (isset($data['weight'])) {
             $upData['weight'] = $data['weight'];
         }
+        if (isset($data['smallRatio'])) {
+            $upData['smallRatio'] = $data['smallRatio'];
+        }
         //加价
         $skAddPrice = $data['skAddPrice'] ?? 0;
         $upData['skAddPrice'] = $skAddPrice;

sql.txt

@@ -48,8 +48,47 @@ ALTER TABLE xhStatIncomeMonth ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央i
 
 === 资产相关表中央化 shish 20220313
 
-执行供货商资产中央化 ./yii init/ghs-center 【库存也要中央化处理，要加入时来】!!!!
+
+执行供货商资产中央化 ./yii init/ghs-center 【库存也要中央化处理，要加入进来】!!!!
 
 ALTER TABLE xhStaff COMMENT '员工';
+ALTER TABLE xhGhsItem DROP COLUMN `oneRatio`;
+ALTER TABLE xhGhsItem ADD smallRatio SMALLINT(6) NOT NULL DEFAULT '1' COMMENT '小单位价格系数，一支花价格系数，一支花=(skPrice/ratio)*smallRatio' AFTER `rank`;
+ALTER TABLE xhCategory ADD property TINYINT NOT NULL DEFAULT 0 COMMENT '属性 0鲜花类 1盆栽绿植花瓶类' AFTER `sjId`;
+ALTER TABLE xhGoods ADD property TINYINT NOT NULL DEFAULT 0 COMMENT '属性 0鲜花类 1盆栽绿植花瓶类' AFTER `sjId`;
+
+DROP TABLE IF EXISTS `xhMake`;
+CREATE TABLE IF NOT EXISTS `xhMake`(
+id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+`makeSn` CHAR(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '制作单编号',
+`orderSn` CHAR(20) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '关联订单编号',
+`orderId` INT NOT NULL DEFAULT 0 COMMENT '关联订单id',
+`num` SMALLINT NOT NULL DEFAULT 0 COMMENT '数量',
+`categoryId` INT NOT NULL DEFAULT 0 COMMENT '分类id',
+`goodsId` INT NOT NULL DEFAULT 0 COMMENT '商品id',
+`from` TINYINT NOT NULL DEFAULT 0 COMMENT '来源 0门店下单 1小程序下单...',
+`remark` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '备注',
+`status` TINYINT NOT NULL DEFAULT 0 COMMENT '状态 0待制作 1已完成 2已取消',
+`addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+`updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间'
+)COMMENT='制作单';
+DROP TABLE IF EXISTS `xhMakeItem`;
+CREATE TABLE IF NOT EXISTS `xhMakeItem`(
+id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+`name` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '花材名称',
+`cover` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '花材封面',
+`makeSn` CHAR(20) NOT NULL DEFAULT '' COMMENT '制作单编号',
+`itemId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家花材id',
+`ptItemId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家花材id',
+`sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+`shopId` INT(11) NOT NULL DEFAULT '0' COMMENT '门店id',
+`mainId` INT(11) NOT NULL DEFAULT '0' COMMENT '中央id',
+`num` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '数量，包括大小单位总合',
+`cost` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '花材单位成本',
+`bigPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '大单位价格',
+`smallPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '小单位价格',
+`addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
+`updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间'
+)COMMENT='制作单花材明细';
 
 ==== 员工中央化 shish 20223013