Merge branch 'ttxh' of git.huaml.com:zhh/huahuibao into ttxh

app-ghs/controllers/BaseController.php

@@ -67,7 +67,7 @@ class BaseController extends PublicController
             $this->mainId = $mainId;
             $main = MainClass::getById($mainId, true);
             if (empty($main)) {
-                util::fail('没有资产信息'.$this->shopId);
+                util::fail('没有main信息，shopId:'.$this->shopId);
             }
             $this->main = $main;
             $shopExt = ShopExtClass::getByCondition(['shopId' => $currentShopId], true);

sql.txt → sql.sql

@@ -19,7 +19,7 @@ id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
   `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )COMMENT='中央，中控';
 
-============ ssh 20220311
+-- ssh 20220311
 
 ALTER TABLE xhStatSale ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`;
 ALTER TABLE xhStatSaleMonth ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`;
@@ -47,10 +47,7 @@ ALTER TABLE xhStatIncome ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AF
 ALTER TABLE xhStatIncomeMonth ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`;
 
 
-============ 资产相关表中央化 ssh 20220313
-
-
-执行供货商资产中央化 ./yii init/ghs-center 【库存也要中央化处理，要加入进来】!!!!
+-- 资产相关表中央化 ssh 20220313
 
 ALTER TABLE xhStaff COMMENT '员工';
 ALTER TABLE xhGhsItem DROP COLUMN `oneRatio`;
@@ -248,7 +245,7 @@ CREATE TABLE `xhGhsCgRefundSn` (
 ) COMMENT='供应商采购退款单号';
 
 
-============ ssh 20220314
+-- ssh 20220314
 
 
 DROP TABLE IF EXISTS `xhMyLs`;
@@ -349,10 +346,10 @@ ALTER TABLE xhStatKdMonth ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' A
 
 ALTER TABLE xhGoods CHANGE `goodsName` `name` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '商品名称';
 
-============ 批发零售绑定关系 ssh 20220314
+-- 批发零售绑定关系 ssh 20220314
 
 
-========================花材相关表结构变更start=======lqh 20220315=================
+-- 花材相关表结构变更start lqh 20220315
 ALTER TABLE `xhGhsItem`
 ADD COLUMN `mainId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`,
 ADD INDEX `idx_mainId` (`mainId`) ;
@@ -392,11 +389,11 @@ CREATE TABLE `xhGoodsStockRecord` (
 
 
 
-===============花材相关表结构变更end========
+-- 花材相关表结构变更end
 
 
 
-==========客户的花店 ssh 20220316
+-- 客户的花店 ssh 20220316
 
 DROP TABLE IF EXISTS `xhHd`;
 CREATE TABLE `xhHd` (
@@ -499,12 +496,12 @@ ALTER TABLE xhStatOrderCount ADD INDEX `mainId`(`mainId`,`time`);
 ALTER TABLE xhStatOrderMonth DROP INDEX `shop`;
 ALTER TABLE xhStatOrderMonth ADD INDEX `mainId`(`mainId`,`time`);
 
-====ssh 20220319
+-- ssh 20220319
 
 ALTER TABLE xhWastage ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `id`;
 ALTER TABLE xhWastageItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `id`;
 
-====报损中央化 ssh 20220319
+-- 报损中央化 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鲜花成品';
@@ -514,7 +511,7 @@ CREATE TABLE `xhWorkSn` (
   PRIMARY KEY (`id`)
 ) AUTO_INCREMENT=126520 COMMENT='工单号';
 
-====商品分类中央化 ssh 20220319
+-- 商品分类中央化 ssh 20220319
 
 ALTER TABLE xhWorkItem ADD INDEX `workSn`(`workSn`);
 ALTER TABLE xhGoodsSetting ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `id`;
@@ -698,7 +695,7 @@ ALTER TABLE xhCgRefundItem ADD `xhUnitType` TINYINT(4) NOT NULL DEFAULT '0' COMM
 ALTER TABLE xhCgRefundItem ADD `xhUnitPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '当前单位单价，售价' AFTER `xhUnitType`;
 ALTER TABLE xhCgRefundItem ADD `xhPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '当前单位的总价，售价总和' AFTER `xhUnitPrice`;
 
-====预订单 ssh 20220327
+-- 预订单 ssh 20220327
 
 ALTER TABLE xhStatItem DROP INDEX `shop`;
 ALTER TABLE xhStatItemMonth DROP INDEX `shop`;
@@ -851,7 +848,7 @@ ALTER TABLE xhPlantCg ADD `num` INT NOT NULL DEFAULT 0 COMMENT '本次采购的
 ALTER TABLE xhGoods MODIFY `content` TEXT COMMENT '正文内容';
 ALTER TABLE xhGoodsStockRecord ADD `relateName` VARCHAR(200) NOT NULL DEFAULT '' COMMENT '关联人' AFTER `goodsNum`;
 
-====预订单 ssh 20220402
+-- 预订单 ssh 20220402
 
 
 ALTER TABLE xhGhsItem MODIFY `price` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '普通价' AFTER `skPrice`;
@@ -866,7 +863,7 @@ ALTER TABLE xhStatPdSubMonth MODIFY `totalAmount` DECIMAL(15,2) NOT NULL DEFAULT
 
 ALTER TABLE xhGhsItem DROP INDEX `uni_index_product`;
 
-====花材表的mainId添加进去之后，唯一的索引id最好也要加进去 ssh 20220418
+-- 花材表的mainId添加进去之后，唯一的索引id最好也要加进去 ssh 20220418
 
 ALTER TABLE xhWorkItem ADD unitPrice DECIMAL(15,2) NOT NULL DEFAULT '0.00' COMMENT '当前单位售价' AFTER `unitName`;
 
@@ -888,7 +885,7 @@ ALTER TABLE xhOrder ADD `remainDebtPrice` DECIMAL(15,2) NOT NULL DEFAULT '0.00'
 
 ALTER TABLE xhXj ADD mainId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `shopId`;
 
-===零售订单优化 ssh 20220422
+-- 零售订单优化 ssh 20220422
 
 DROP TABLE IF EXISTS `xhWastageGoods`;
 CREATE TABLE IF NOT EXISTS `xhWastageGoods` (
@@ -964,4 +961,6 @@ ALTER TABLE xhGoodsCategory ADD flowerNum SMALLINT(6) NOT NULL DEFAULT '0' COMME
 
 alter table xhShop drop column openTime;
 
----ssh 20220424
+ALTER TABLE xhAd ADD mainId INT NOT NULL DEFAULT 0 COMMENT '' AFTER `sjId`;
+
+-- ssh 20220424