名称修改

app-hd/controllers/RefundController.php

@@ -70,7 +70,7 @@ class RefundController extends BaseController
             $refundType = $post['refundType'] ?? 1;
 
             if ($refundType == HdRefundClass::REFUND_TYPE_MONEY_GOOD) {
-                //商品花材结构 property 0成品 1花材
+                //商品花材结构 property 0商品 1花材
                 //[{productId:0,num:1,unitType:0,unitPrice:12,unitName:'扎',property:1}]
                 $productJson = $post['product'] ?? '';
                 if (empty($productJson)) {

app-hd/controllers/StockController.php

@@ -33,7 +33,7 @@ class StockController extends BaseController
         util::success($list);
     }
 
-    //成品库存变动明细
+    //商品库存变动明细
     public function actionGoodsStockChange()
     {
         $get = Yii::$app->request->get();

app-hd/controllers/WastageController.php

@@ -14,7 +14,7 @@ class WastageController extends BaseController
 
     public $guestAccess = [];
 
-    //成品报损 ssh 20220424
+    //商品报损 ssh 20220424
     public function actionGoodsWastage()
     {
         $shopAdmin = $this->shopAdmin;
@@ -31,11 +31,11 @@ class WastageController extends BaseController
         $post['shopAdminName'] = $adminName;
         $goodsJson = $post['goodsList'] ?? '';
         if (empty($goodsJson)) {
-            util::fail('请选择成品');
+            util::fail('请选择商品');
         }
         $goodsList = json_decode($goodsJson, true);
         if (empty($goodsList)) {
-            util::fail('请选择成品');
+            util::fail('请选择商品');
         }
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
@@ -103,7 +103,7 @@ class WastageController extends BaseController
                 util::fail('数量不能为0');
             }
             if (isset($v['property']) && $v['property'] == 0) {
-                util::fail('花材和成品请分开报损');
+                util::fail('花材和商品请分开报损');
             }
         }
         $connection = Yii::$app->db;

app-hd/controllers/WorkController.php

@@ -83,7 +83,7 @@ class WorkController extends BaseController
         }
     }
 
-    //成品新建制作 ssh 20220320
+    //商品新建制作 ssh 20220320
     public function actionGoodsCreate()
     {
         $post = Yii::$app->request->post();
@@ -96,7 +96,7 @@ class WorkController extends BaseController
             $goodsJson = $post['goods'] ?? '';
             $goods = json_decode($goodsJson, true);
             if (empty($goods)) {
-                util::fail('没有找到成品');
+                util::fail('没有找到商品');
             }
             $post['goods'] = $goods;
             $work = WorkClass::goodsCreateFinish($post);

biz-ghs/stock/classes/StockRecordClass.php

@@ -25,8 +25,8 @@ class StockRecordClass extends BaseClass
     const STOCK_RECORD_TYPE_WASTAGE = 9;// 报损
     const STOCK_RECORD_TYPE_REFUND = 10;// 退款退货
     const STOCK_RECORD_TYPE_HD_ORDER = 11;//花店销售单
-    const STOCK_RECORD_TYPE_GOODS_CONSUME = 12;//制作成品
-    const STOCK_RECORD_TYPE_GOODS_WASTAGE = 13;//制作成品损耗
+    const STOCK_RECORD_TYPE_GOODS_CONSUME = 12;//制作商品
+    const STOCK_RECORD_TYPE_GOODS_WASTAGE = 13;//制作商品损耗
     const STOCK_RECORD_TYPE_GOODS_CONSUME_CANCEL = 14;//取消制作
     const STOCK_RECORD_TYPE_GOODS_WASTAGE_CANCEL = 15;//取消制作已报损
     const STOCK_RECORD_TYPE_HD_REFUND = 16;//花店退货退款
@@ -44,7 +44,7 @@ class StockRecordClass extends BaseClass
         self::STOCK_RECORD_TYPE_REFUND => '退货',
         self::STOCK_RECORD_TYPE_HD_ORDER => '开单',
         self::STOCK_RECORD_TYPE_GOODS_CONSUME => '制作',
-        self::STOCK_RECORD_TYPE_GOODS_WASTAGE => '制作成品损耗',
+        self::STOCK_RECORD_TYPE_GOODS_WASTAGE => '制作商品损耗',
         self::STOCK_RECORD_TYPE_GOODS_CONSUME_CANCEL => '取消制作',
         self::STOCK_RECORD_TYPE_GOODS_WASTAGE_CANCEL => '取消制作损耗',
         self::STOCK_RECORD_TYPE_HD_REFUND => '退货退款',
@@ -205,14 +205,14 @@ class StockRecordClass extends BaseClass
         return self::addRecord($data);
     }
 
-    //制作成品 lqh 2022.03.20
+    //制作商品 lqh 2022.03.20
     public static function makeGoodsConsume($data)
     {
         $data['recordType'] = self::STOCK_RECORD_TYPE_GOODS_CONSUME;
         return self::addRecord($data);
     }
 
-    //制作成品损耗 lqh 2022.03.20
+    //制作商品损耗 lqh 2022.03.20
     public static function makeGoodsWastage($data)
     {
         $data['recordType'] = self::STOCK_RECORD_TYPE_GOODS_WASTAGE;

biz-hd/goods/classes/GoodsClass.php

@@ -448,7 +448,7 @@ class GoodsClass extends BaseClass
         $goodsData = self::getById($goodsId);
         if (!$goodsData) {
             util::unlock($key);
-            util::fail("成品不存在");
+            util::fail("商品不存在");
         }
         $goodsMainId = $goodsData['mainId'];
         if ($mainId != $goodsMainId) {
@@ -475,7 +475,7 @@ class GoodsClass extends BaseClass
         $goodsData = self::getById($goodsId);
         if (!$goodsData) {
             util::unlock($key);
-            util::fail("成品不存在");
+            util::fail("商品不存在");
         }
         $goodsMainId = $goodsData['mainId'];
         if ($mainId != $goodsMainId) {

biz-hd/order/classes/OrderGoodsClass.php

@@ -74,9 +74,9 @@ class OrderGoodsClass extends BaseClass
     //退货增加库存 ssh 20220427
     public static function refundAddStock($orderSn, $sjId, $shopId, $mainId, $goodsId, $goodsNum, $shopAdminName)
     {
-        //加成品库存
+        //加商品库存
         $respond = GoodsClass::addStock($goodsId, $mainId, $goodsNum);
-        //成品流水记录
+        //商品流水记录
         $data = [];
         $data['sjId'] = $sjId;
         $data['shopId'] = $shopId;
@@ -91,12 +91,12 @@ class OrderGoodsClass extends BaseClass
         return true;
     }
 
-    //制作工单完成，新增成品库存
+    //制作工单完成，新增商品库存
     public static function addGoodsStockByMakeGoods($orderSn, $sjId, $shopId, $mainId, $goodsId, $goodsNum, $staffName)
     {
-        //加成品库存
+        //加商品库存
         $respond = GoodsClass::addStock($goodsId, $mainId, $goodsNum);
-        //成品流水记录
+        //商品流水记录
         $data = [];
         $data['sjId'] = $sjId;
         $data['shopId'] = $shopId;
@@ -310,7 +310,7 @@ class OrderGoodsClass extends BaseClass
     }
 
     //工单取消
-    //退回花材损耗，退回花材消耗，退回成品库存
+    //退回花材损耗，退回花材消耗，退回商品库存
     public static function cancelMakeGoods($orderSn)
     {
         //是否有损耗
@@ -348,7 +348,7 @@ class OrderGoodsClass extends BaseClass
             }
         }
 
-        //是否有成品
+        //是否有商品
         $whereGoods = [];
         $whereGoods['orderSn'] = $orderSn;
         $whereGoods['recordType'] = GoodsStockRecordClass::STOCK_RECORD_TYPE_PURCHASE;
@@ -364,15 +364,15 @@ class OrderGoodsClass extends BaseClass
     }
 
     //该方法已经拆开来了（弃用）
-    //制作成品库存变更方法（加成品库存，减花材库存(消耗、损耗))
+    //制作商品库存变更方法（加商品库存，减花材库存(消耗、损耗))
     //消耗花材信息：$consumeItemInfo = [{"id":12233,"num":1,"unitType":0}]
     //损耗花材信息：$wastageItemInfo = [{"id":12233,"num":1,"unitType":0}]
     //id 是当前产品的id，单价unitType 是当前单位类型，0表示大单位，1表示小单位，默认0 num 是当前花材数量
     public static function changeStockByMakeGoods($orderSn, $sjId, $shopId, $mainId, $goodsId, $goodsNum, $consumeItemInfo, $wastageItemInfo)
     {
-        //加成品库存
+        //加商品库存
         GoodsClass::addStock($goodsId, $mainId, $goodsNum);
-        //成品流水记录
+        //商品流水记录
         $data = [];
         $data['sjId'] = $sjId;
         $data['shopId'] = $shopId;

biz-hd/refund/services/HdRefundService.php

@@ -69,7 +69,7 @@ class HdRefundService extends BaseService
 
         $postProduct = $post['product'] ?? '';
         if ($refundType == HdRefundClass::REFUND_TYPE_MONEY_GOOD) {
-            //商品花材结构 property 0成品 1花材
+            //商品花材结构 property 0商品 1花材
             //[{productId:0,num:1,unitType:0,unitPrice:12,unitName:'扎',property:1}]
             if (empty($postProduct)) {
                 util::fail('没有退款商品');

biz-hd/wastage/classes/WastageClass.php

@@ -10,7 +10,7 @@ class WastageClass extends BaseClass
 
     public static $baseFile = '\bizHd\wastage\models\Wastage';
 
-    //成品报损 ssh 20220424
+    //商品报损 ssh 20220424
     public static function goodsWastage($data)
     {
         $orderSn = orderSn::getGhsStockWastageSn();

biz/stock/classes/GoodsStockRecordClass.php

@@ -10,7 +10,7 @@ class GoodsStockRecordClass extends BaseClass
     public static $baseFile = '\biz\stock\models\GoodsStockRecord';
 
     //定义库存变更类型
-    const STOCK_RECORD_TYPE_PURCHASE = 1; //采购（制作成品）
+    const STOCK_RECORD_TYPE_PURCHASE = 1; //采购（制作商品）
     const STOCK_RECORD_TYPE_OUT_STOCK = 2; //出库
     const STOCK_RECORD_TYPE_IN_STOCK = 3; //入库
     const STOCK_RECORD_TYPE_CHECK_STOCK = 4; //盘点
@@ -20,7 +20,7 @@ class GoodsStockRecordClass extends BaseClass
     const STOCK_RECORD_TYPE_SELL_STOCK_CANCEL = 8;// 取消订单
     const STOCK_RECORD_TYPE_WASTAGE = 9;// 报损
     const STOCK_RECORD_TYPE_REFUND = 10;// 退款退货
-    const STOCK_RECORD_TYPE_PURCHASE_CANCEL = 11; //取消退回采购（制作成品）
+    const STOCK_RECORD_TYPE_PURCHASE_CANCEL = 11; //取消退回采购（制作商品）
     const STOCK_RECORD_TYPE_CG = 12;//采购
 
     public static $typeMap = [
@@ -79,7 +79,7 @@ class GoodsStockRecordClass extends BaseClass
         return self::addRecord($data);
     }
 
-    //销售成品
+    //销售商品
     public static function sellGoods($data)
     {
         $data['recordType'] = self::STOCK_RECORD_TYPE_SELL_STOCK;
@@ -104,7 +104,7 @@ class GoodsStockRecordClass extends BaseClass
         return $respond;
     }
 
-    //获取某个成品的库存变更记录
+    //获取某个商品的库存变更记录
     public static function getRecordList($where)
     {
         $data = self::getList('*', $where, 'addTime DESC');

biz/stock/classes/StockClass.php

@@ -80,13 +80,13 @@ class StockClass extends BaseClass
         ],
 
 
-        //制作成品 ---减库存
+        //制作商品 ---减库存
         StockRecordClass::STOCK_RECORD_TYPE_GOODS_CONSUME => [
             'stock' => self::DECREASE_STOCK,
             'recordType' => StockRecordClass::STOCK_RECORD_TYPE_GOODS_CONSUME,
         ],
 
-        //制作成品损耗--减库存
+        //制作商品损耗--减库存
         StockRecordClass::STOCK_RECORD_TYPE_GOODS_WASTAGE => [
             'stock' => self::DECREASE_STOCK,
             'recordType' => StockRecordClass::STOCK_RECORD_TYPE_GOODS_WASTAGE,
@@ -177,7 +177,7 @@ class StockClass extends BaseClass
         return $stockInfo;
     }
 
-    //制作成品用花材
+    //制作商品用花材
     public static function stockMakeGoodsConsumeItem($orderSn, $sjId, $shopId, $productId, $bigNum, $smallNum, $options = [])
     {
         $stockInfo = self::commonItemFun($orderSn, $sjId, $shopId, $productId, $bigNum, $smallNum, $options, StockRecordClass::STOCK_RECORD_TYPE_GOODS_CONSUME);
@@ -185,7 +185,7 @@ class StockClass extends BaseClass
     }
 
 
-    //花材--制作成品损耗
+    //花材--制作商品损耗
     public static function stockMakeGoodsWastageItem($orderSn, $sjId, $shopId, $productId, $bigNum, $smallNum, $options = [])
     {
         $stockInfo = self::commonItemFun($orderSn, $sjId, $shopId, $productId, $bigNum, $smallNum, $options, StockRecordClass::STOCK_RECORD_TYPE_GOODS_WASTAGE);
@@ -207,7 +207,7 @@ class StockClass extends BaseClass
     }
 
 
-    //成品相关---todo
+    //商品相关---todo
 
 
     public static function commonItemFun($orderSn, $sjId, $shopId, $productId, $bigNum, $smallNum, $options, $action)

common/components/dict.php

@@ -27,7 +27,7 @@ class dict
         ],
         //产品属性
         'property' => [
-            //成品
+            //商品
             'goods' => 0,
             //花材
             'item' => 1,

common/components/orderSn.php

@@ -312,7 +312,7 @@ class orderSn
         return $prefix . $id;
     }
 
-    //成品有效编号1-开头 ssh 20220405
+    //商品有效编号1-开头 ssh 20220405
     public static function getGoodsSn()
     {
         $prefix = '1-';

sql.sql

@@ -114,7 +114,7 @@ CREATE TABLE `xhGoodsItem` (
 `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商户id',
 `shopId` INT NOT NULL DEFAULT 0 COMMENT '门店id',
 `mainId` INT NOT NULL DEFAULT 0 COMMENT '中央id',
-`goodsId` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '成品ID',
+`goodsId` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '商品ID',
 `itemId` INT(11) NOT NULL DEFAULT '0' COMMENT '花材id',
 `ptItemId` INT(11) NOT NULL DEFAULT '0' COMMENT '平台花材id',
 `num` INT NOT NULL DEFAULT 0 COMMENT '数量',
@@ -127,7 +127,7 @@ CREATE TABLE `xhGoodsItem` (
 `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
 `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
 PRIMARY KEY (`id`)
-) COMMENT='成品的花材';
+) COMMENT='商品的花材';
 
 DROP TABLE IF EXISTS `xhHdRefund`;
 CREATE TABLE IF NOT EXISTS `xhHdRefund` (
@@ -330,11 +330,11 @@ ALTER TABLE xhGoods ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `
 ALTER TABLE xhGoodsCategory ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `id`;
 ALTER TABLE xhGoods ADD cover VARCHAR(800) NOT NULL DEFAULT '' COMMENT '封面' AFTER `goodsName`;
 
-ALTER TABLE xhGoods MODIFY `property` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '属性 0鲜花成品 1盆栽绿植花瓶 2花材';
-ALTER TABLE xhGhsItem ADD `property` TINYINT(4) NOT NULL DEFAULT '2' COMMENT '属性 0鲜花成品 1盆栽绿植花瓶 2花材' AFTER `cover`;
-ALTER TABLE xhGoods MODIFY `property` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '属性 0成品 1花材，前端开发区分使用';
-ALTER TABLE xhGhsItem MODIFY `property` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '属性 0成品 1花材，前端开发区分使用';
-ALTER TABLE xhGoods ADD flower TINYINT NOT NULL DEFAULT 0 COMMENT '0非鲜花成品，绿植盆栽花瓶 1鲜花成品' AFTER `property`;
+ALTER TABLE xhGoods MODIFY `property` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '属性 0鲜花商品 1盆栽绿植花瓶 2花材';
+ALTER TABLE xhGhsItem ADD `property` TINYINT(4) NOT NULL DEFAULT '2' COMMENT '属性 0鲜花商品 1盆栽绿植花瓶 2花材' AFTER `cover`;
+ALTER TABLE xhGoods MODIFY `property` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '属性 0商品 1花材，前端开发区分使用';
+ALTER TABLE xhGhsItem MODIFY `property` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '属性 0商品 1花材，前端开发区分使用';
+ALTER TABLE xhGoods ADD flower TINYINT NOT NULL DEFAULT 0 COMMENT '0非鲜花商品，绿植盆栽花瓶 1鲜花商品' AFTER `property`;
 
 ALTER TABLE xhStatCg ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`;
 ALTER TABLE xhStatCgGhs ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`;
@@ -377,15 +377,15 @@ CREATE TABLE `xhGoodsStockRecord` (
   `mainId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '中央ID',
   `recordType` tinyint(2) unsigned NOT NULL DEFAULT '0' COMMENT '记录类型 1制作入口（采购），2出库，3入库，4盘点 5销售（开单）',
   `orderSn` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '订单号',
-  `goodsId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '成品ID',
-  `goodsNum` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '成品数量',
+  `goodsId` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '商品ID',
+  `goodsNum` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '商品数量',
   `oldStock` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '原库存数量',
   `newStock` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '新库存数量',
   `addTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
   `extend` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '扩展字段',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='成品库存记录表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='商品库存记录表';
 
 
 
@@ -497,7 +497,7 @@ ALTER TABLE xhWastageItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' A
 -- 报损中央化 ssh 20220319
 
 ALTER TABLE xhCategory ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `parentId`;
-ALTER TABLE xhCategory CHANGE `property` `flower` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '0 绿植盆栽花瓶 1鲜花成品';
+ALTER TABLE xhCategory CHANGE `property` `flower` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '0 绿植盆栽花瓶 1鲜花商品';
 drop table if exists `xhWorkSn`;
 CREATE TABLE `xhWorkSn` (
   `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -721,7 +721,7 @@ ALTER TABLE xhWork ADD smallNum SMALLINT(6) NOT NULL DEFAULT '0' COMMENT '大单
 ALTER TABLE xhGoods ADD bigNum SMALLINT(6) NOT NULL DEFAULT '0' COMMENT '大单位数量' AFTER `flower`;
 ALTER TABLE xhGoods ADD smallNum SMALLINT(6) NOT NULL DEFAULT '0' COMMENT '大单位数量' AFTER `bigNum`;
 
-ALTER TABLE xhGoodsCategory ADD flower TINYINT NOT NULL DEFAULT 1 COMMENT '商品属性 0绿植盆栽资材 1鲜花成品' AFTER `sjId`;
+ALTER TABLE xhGoodsCategory ADD flower TINYINT NOT NULL DEFAULT 1 COMMENT '商品属性 0绿植盆栽资材 1鲜花商品' AFTER `sjId`;
 
 DROP TABLE IF EXISTS `xhGoodsCg`;
 CREATE TABLE `xhGoodsCg` (
@@ -885,7 +885,7 @@ CREATE TABLE IF NOT EXISTS `xhWastageGoods` (
   `unitCost` DECIMAL(15,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='损耗成品详情';
+) COMMENT='损耗商品详情';
 
 ALTER TABLE xhWastage ADD `type` TINYINT NOT NULL DEFAULT 0 COMMENT '报损类型 0普通报损 1工单报损' AFTER `orderSn`;
 ALTER TABLE xhWastage ADD `targetId` INT NOT NULL DEFAULT 0 COMMENT '报损发起id，如工单id' AFTER `type`;