huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

升级新架构

This commit is contained in:
启航老齐 2025-09-18 13:26:51 +08:00
parent b7f89f61c7
commit 888d04812d
74 changed files with 122 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddBo.java → core/model/src/main/java/cn/qihangerp/model/bo/GoodsAddBo.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain.bo; package cn.qihangerp.model.bo;
import lombok.Data; import lombok.Data;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddSkuBo.java → core/model/src/main/java/cn/qihangerp/model/bo/GoodsAddSkuBo.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain.bo; package cn.qihangerp.model.bo;
import java.math.BigDecimal; import java.math.BigDecimal;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsSkuAddBo.java → core/model/src/main/java/cn/qihangerp/model/bo/GoodsSkuAddBo.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain.bo; package cn.qihangerp.model.bo;
import lombok.Data; import lombok.Data;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoods.java → core/model/src/main/java/cn/qihangerp/model/entity/OGoods.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain; package cn.qihangerp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsBrand.java → core/model/src/main/java/cn/qihangerp/model/entity/OGoodsBrand.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain; package cn.qihangerp.model.entity;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategory.java → core/model/src/main/java/cn/qihangerp/model/entity/OGoodsCategory.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain; package cn.qihangerp.model.entity;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttribute.java → core/model/src/main/java/cn/qihangerp/model/entity/OGoodsCategoryAttribute.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain; package cn.qihangerp.model.entity;
import java.io.Serializable; import java.io.Serializable;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttributeValue.java → core/model/src/main/java/cn/qihangerp/model/entity/OGoodsCategoryAttributeValue.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain; package cn.qihangerp.model.entity;
import java.io.Serializable; import java.io.Serializable;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventory.java → core/model/src/main/java/cn/qihangerp/model/entity/OGoodsInventory.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain; package cn.qihangerp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventoryBatch.java → core/model/src/main/java/cn/qihangerp/model/entity/OGoodsInventoryBatch.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain; package cn.qihangerp.model.entity;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSku.java → core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSku.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain; package cn.qihangerp.model.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSkuAttr.java → core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSkuAttr.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain; package cn.qihangerp.model.entity;
import java.io.Serializable; import java.io.Serializable;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSupplier.java → core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSupplier.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain; package cn.qihangerp.model.entity;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/vo/GoodsSpecListVo.java → core/model/src/main/java/cn/qihangerp/model/vo/GoodsSpecListVo.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.domain.vo; package cn.qihangerp.model.vo;
import lombok.Data; import lombok.Data;

2
microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsBrandController.java
View File

@ -4,7 +4,7 @@ package cn.qihangerp.api.goods.controller;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.module.goods.domain.OGoodsBrand; import cn.qihangerp.model.entity.OGoodsBrand;
import cn.qihangerp.module.goods.service.OGoodsBrandService; import cn.qihangerp.module.goods.service.OGoodsBrandService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

6
microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsCategoryController.java
View File

@ -4,9 +4,9 @@ package cn.qihangerp.api.goods.controller;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.module.goods.domain.OGoodsCategory; import cn.qihangerp.model.entity.OGoodsCategory;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeService; import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeService;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeValueService; import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeValueService;
import cn.qihangerp.module.goods.service.OGoodsCategoryService; import cn.qihangerp.module.goods.service.OGoodsCategoryService;

18
microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsController.java
View File

@ -1,26 +1,18 @@
package cn.qihangerp.api.goods.controller; package cn.qihangerp.api.goods.controller;
import cn.qihangerp.common.*; import cn.qihangerp.common.*;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.domain.bo.GoodsAddBo; import cn.qihangerp.model.bo.GoodsAddBo;
import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo; import cn.qihangerp.model.vo.GoodsSpecListVo;
import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import com.fasterxml.jackson.databind.exc.InvalidFormatException;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 商品管理Controller * 商品管理Controller

4
microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsInventoryController.java
View File

@ -5,8 +5,8 @@ import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.module.goods.domain.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService; import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService;
import cn.qihangerp.module.goods.service.OGoodsInventoryService; import cn.qihangerp.module.goods.service.OGoodsInventoryService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;

2
microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsSupplierController.java
View File

@ -4,7 +4,7 @@ package cn.qihangerp.api.goods.controller;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.module.goods.domain.OGoodsSupplier; import cn.qihangerp.model.entity.OGoodsSupplier;
import cn.qihangerp.module.goods.service.OGoodsSupplierService; import cn.qihangerp.module.goods.service.OGoodsSupplierService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

6
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java
View File

@ -5,9 +5,9 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;

4
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java
View File

@ -4,8 +4,8 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.model.entity.DouGoods; import cn.qihangerp.model.entity.DouGoods;

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsBrandMapper.java
View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper; package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsBrand; import cn.qihangerp.model.entity.OGoodsBrand;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @author qilip * @author qilip
* @description 针对表【o_goods_brand】的数据库操作Mapper * @description 针对表【o_goods_brand】的数据库操作Mapper
* @createDate 2024-09-07 16:11:56 * @createDate 2024-09-07 16:11:56
* @Entity cn.qihangerp.module.goods.domain.OGoodsBrand * @Entity cn.qihangerp.model.entity.OGoodsBrand
*/ */
public interface OGoodsBrandMapper extends BaseMapper<OGoodsBrand> { public interface OGoodsBrandMapper extends BaseMapper<OGoodsBrand> {

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeMapper.java
View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper; package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @author qilip * @author qilip
* @description 针对表【o_goods_category_attribute】的数据库操作Mapper * @description 针对表【o_goods_category_attribute】的数据库操作Mapper
* @createDate 2024-09-07 16:11:56 * @createDate 2024-09-07 16:11:56
* @Entity cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute * @Entity cn.qihangerp.model.entity.OGoodsCategoryAttribute
*/ */
public interface OGoodsCategoryAttributeMapper extends BaseMapper<OGoodsCategoryAttribute> { public interface OGoodsCategoryAttributeMapper extends BaseMapper<OGoodsCategoryAttribute> {

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeValueMapper.java
View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper; package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @author qilip * @author qilip
* @description 针对表【o_goods_category_attribute_value】的数据库操作Mapper * @description 针对表【o_goods_category_attribute_value】的数据库操作Mapper
* @createDate 2024-09-07 16:11:56 * @createDate 2024-09-07 16:11:56
* @Entity cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue * @Entity cn.qihangerp.model.entity.OGoodsCategoryAttributeValue
*/ */
public interface OGoodsCategoryAttributeValueMapper extends BaseMapper<OGoodsCategoryAttributeValue> { public interface OGoodsCategoryAttributeValueMapper extends BaseMapper<OGoodsCategoryAttributeValue> {

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryMapper.java
View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper; package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsCategory; import cn.qihangerp.model.entity.OGoodsCategory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @author qilip * @author qilip
* @description 针对表【o_goods_category】的数据库操作Mapper * @description 针对表【o_goods_category】的数据库操作Mapper
* @createDate 2024-09-07 16:11:56 * @createDate 2024-09-07 16:11:56
* @Entity cn.qihangerp.module.goods.domain.OGoodsCategory * @Entity cn.qihangerp.model.entity.OGoodsCategory
*/ */
public interface OGoodsCategoryMapper extends BaseMapper<OGoodsCategory> { public interface OGoodsCategoryMapper extends BaseMapper<OGoodsCategory> {

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryBatchMapper.java
View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper; package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @author qilip * @author qilip
* @description 针对表【o_goods_inventory_batch(商品库存批次)】的数据库操作Mapper * @description 针对表【o_goods_inventory_batch(商品库存批次)】的数据库操作Mapper
* @createDate 2024-09-23 22:39:50 * @createDate 2024-09-23 22:39:50
* @Entity cn.qihangerp.module.goods.domain.OGoodsInventoryBatch * @Entity cn.qihangerp.model.entity.OGoodsInventoryBatch
*/ */
public interface OGoodsInventoryBatchMapper extends BaseMapper<OGoodsInventoryBatch> { public interface OGoodsInventoryBatchMapper extends BaseMapper<OGoodsInventoryBatch> {

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryMapper.java
View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper; package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @author qilip * @author qilip
* @description 针对表【o_goods_inventory(商品库存表)】的数据库操作Mapper * @description 针对表【o_goods_inventory(商品库存表)】的数据库操作Mapper
* @createDate 2025-05-19 12:04:26 * @createDate 2025-05-19 12:04:26
* @Entity cn.qihangerp.module.goods.domain.OGoodsInventory * @Entity cn.qihangerp.model.entity.OGoodsInventory
*/ */
public interface OGoodsInventoryMapper extends BaseMapper<OGoodsInventory> { public interface OGoodsInventoryMapper extends BaseMapper<OGoodsInventory> {

6
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsMapper.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.goods.mapper; package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo; import cn.qihangerp.model.vo.GoodsSpecListVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -11,7 +11,7 @@ import java.util.List;
* @author TW * @author TW
* @description 针对表【o_goods(商品库存管理)】的数据库操作Mapper * @description 针对表【o_goods(商品库存管理)】的数据库操作Mapper
* @createDate 2024-03-11 14:24:49 * @createDate 2024-03-11 14:24:49
* @Entity cn.qihangerp.module.goods.domain.OGoods * @Entity cn.qihangerp.model.entity.OGoods
*/ */
public interface OGoodsMapper extends BaseMapper<OGoods> { public interface OGoodsMapper extends BaseMapper<OGoods> {
List<GoodsSpecListVo> searchGoodsSpec(String keyword); List<GoodsSpecListVo> searchGoodsSpec(String keyword);

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuAttrMapper.java
View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper; package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsSkuAttr; import cn.qihangerp.model.entity.OGoodsSkuAttr;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @author qilip * @author qilip
* @description 针对表【o_goods_sku_attr】的数据库操作Mapper * @description 针对表【o_goods_sku_attr】的数据库操作Mapper
* @createDate 2024-09-07 20:31:18 * @createDate 2024-09-07 20:31:18
* @Entity cn.qihangerp.module.goods.domain.OGoodsSkuAttr * @Entity cn.qihangerp.model.entity.OGoodsSkuAttr
*/ */
public interface OGoodsSkuAttrMapper extends BaseMapper<OGoodsSkuAttr> { public interface OGoodsSkuAttrMapper extends BaseMapper<OGoodsSkuAttr> {

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuMapper.java
View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper; package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @author qilip * @author qilip
* @description 针对表【o_goods_sku(OMS商品SKU表)】的数据库操作Mapper * @description 针对表【o_goods_sku(OMS商品SKU表)】的数据库操作Mapper
* @createDate 2025-05-19 12:00:55 * @createDate 2025-05-19 12:00:55
* @Entity cn.qihangerp.module.goods.domain.OGoodsSku * @Entity cn.qihangerp.model.entity.OGoodsSku
*/ */
public interface OGoodsSkuMapper extends BaseMapper<OGoodsSku> { public interface OGoodsSkuMapper extends BaseMapper<OGoodsSku> {

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSupplierMapper.java
View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.goods.mapper; package cn.qihangerp.module.goods.mapper;
import cn.qihangerp.module.goods.domain.OGoodsSupplier; import cn.qihangerp.model.entity.OGoodsSupplier;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @author qilip * @author qilip
* @description 针对表【o_goods_supplier】的数据库操作Mapper * @description 针对表【o_goods_supplier】的数据库操作Mapper
* @createDate 2024-09-07 16:35:43 * @createDate 2024-09-07 16:35:43
* @Entity cn.qihangerp.module.goods.domain.OGoodsSupplier * @Entity cn.qihangerp.model.entity.OGoodsSupplier
*/ */
public interface OGoodsSupplierMapper extends BaseMapper<OGoodsSupplier> { public interface OGoodsSupplierMapper extends BaseMapper<OGoodsSupplier> {

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsBrandService.java
View File

@ -2,7 +2,7 @@ package cn.qihangerp.module.goods.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.module.goods.domain.OGoodsBrand; import cn.qihangerp.model.entity.OGoodsBrand;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeService.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.goods.service;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeValueService.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.goods.service;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryService.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.goods.service;
import cn.qihangerp.module.goods.domain.OGoodsCategory; import cn.qihangerp.model.entity.OGoodsCategory;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.goods.service;
import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryService.java
View File

@ -2,7 +2,7 @@ package cn.qihangerp.module.goods.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.module.goods.domain.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

9
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsService.java
View File

@ -4,11 +4,10 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.domain.bo.GoodsAddBo; import cn.qihangerp.model.bo.GoodsAddBo;
import cn.qihangerp.module.goods.domain.bo.GoodsSkuAddBo; import cn.qihangerp.model.vo.GoodsSpecListVo;
import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuAttrService.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.goods.service;
import cn.qihangerp.module.goods.domain.OGoodsSkuAttr; import cn.qihangerp.model.entity.OGoodsSkuAttr;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.goods.service;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSupplierService.java
View File

@ -2,7 +2,7 @@ package cn.qihangerp.module.goods.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.module.goods.domain.OGoodsSupplier; import cn.qihangerp.model.entity.OGoodsSupplier;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsBrandServiceImpl.java
View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.module.goods.domain.OGoodsBrand; import cn.qihangerp.model.entity.OGoodsBrand;
import cn.qihangerp.module.goods.service.OGoodsBrandService; import cn.qihangerp.module.goods.service.OGoodsBrandService;
import cn.qihangerp.module.goods.mapper.OGoodsBrandMapper; import cn.qihangerp.module.goods.mapper.OGoodsBrandMapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeServiceImpl.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.goods.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeService; import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeService;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper; import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeValueServiceImpl.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.goods.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeValueService; import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeValueService;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper; import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

6
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryServiceImpl.java
View File

@ -1,11 +1,11 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.goods.service.impl;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper; import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper; import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.module.goods.domain.OGoodsCategory; import cn.qihangerp.model.entity.OGoodsCategory;
import cn.qihangerp.module.goods.service.OGoodsCategoryService; import cn.qihangerp.module.goods.service.OGoodsCategoryService;
import cn.qihangerp.module.goods.mapper.OGoodsCategoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsCategoryMapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.goods.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService; import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryBatchMapper; import cn.qihangerp.module.goods.mapper.OGoodsInventoryBatchMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryServiceImpl.java
View File

@ -5,7 +5,7 @@ import cn.qihangerp.common.PageResult;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.module.goods.domain.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.module.goods.service.OGoodsInventoryService; import cn.qihangerp.module.goods.service.OGoodsInventoryService;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

15
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java
View File

@ -1,9 +1,8 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.goods.service.impl;
import cn.qihangerp.module.goods.domain.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.domain.bo.GoodsSkuAddBo; import cn.qihangerp.model.vo.GoodsSpecListVo;
import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper;
@ -17,11 +16,11 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSkuAttr; import cn.qihangerp.model.entity.OGoodsSkuAttr;
import cn.qihangerp.module.goods.domain.bo.GoodsAddBo; import cn.qihangerp.model.bo.GoodsAddBo;
import cn.qihangerp.module.goods.domain.bo.GoodsAddSkuBo; import cn.qihangerp.model.bo.GoodsAddSkuBo;
import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuAttrServiceImpl.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.goods.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.module.goods.domain.OGoodsSkuAttr; import cn.qihangerp.model.entity.OGoodsSkuAttr;
import cn.qihangerp.module.goods.service.OGoodsSkuAttrService; import cn.qihangerp.module.goods.service.OGoodsSkuAttrService;
import cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.goods.service.impl;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.goods.service.OGoodsSkuService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSupplierServiceImpl.java
View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.module.goods.domain.OGoodsSupplier; import cn.qihangerp.model.entity.OGoodsSupplier;
import cn.qihangerp.module.goods.service.OGoodsSupplierService; import cn.qihangerp.module.goods.service.OGoodsSupplierService;
import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper; import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
serviceImpl/goods/src/main/resources/mapper/OGoodsBrandMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsBrandMapper"> <mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsBrandMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsBrand"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsBrand">
<id property="id" column="id" jdbcType="INTEGER"/> <id property="id" column="id" jdbcType="INTEGER"/>
<result property="name" column="name" jdbcType="VARCHAR"/> <result property="name" column="name" jdbcType="VARCHAR"/>
<result property="status" column="status" jdbcType="INTEGER"/> <result property="status" column="status" jdbcType="INTEGER"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper"> <mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsCategoryAttribute">
<id property="id" column="id" jdbcType="INTEGER"/> <id property="id" column="id" jdbcType="INTEGER"/>
<result property="categoryId" column="category_id" jdbcType="INTEGER"/> <result property="categoryId" column="category_id" jdbcType="INTEGER"/>
<result property="type" column="type" jdbcType="INTEGER"/> <result property="type" column="type" jdbcType="INTEGER"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper"> <mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsCategoryAttributeValue">
<id property="id" column="id" jdbcType="INTEGER"/> <id property="id" column="id" jdbcType="INTEGER"/>
<result property="categoryAttributeId" column="category_attribute_id" jdbcType="INTEGER"/> <result property="categoryAttributeId" column="category_attribute_id" jdbcType="INTEGER"/>
<result property="value" column="value" jdbcType="VARCHAR"/> <result property="value" column="value" jdbcType="VARCHAR"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsCategoryMapper"> <mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsCategoryMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsCategory"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsCategory">
<id property="id" column="id" jdbcType="INTEGER"/> <id property="id" column="id" jdbcType="INTEGER"/>
<result property="number" column="number" jdbcType="VARCHAR"/> <result property="number" column="number" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/> <result property="name" column="name" jdbcType="VARCHAR"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsInventoryBatchMapper"> <mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsInventoryBatchMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsInventoryBatch"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsInventoryBatch">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>
<id property="inventoryId" column="inventory_id" jdbcType="BIGINT"/> <id property="inventoryId" column="inventory_id" jdbcType="BIGINT"/>
<result property="batchNum" column="batch_num" jdbcType="VARCHAR"/> <result property="batchNum" column="batch_num" jdbcType="VARCHAR"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper"> <mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsInventory"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsInventory">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>
<result property="goodsId" column="goods_id" jdbcType="BIGINT"/> <result property="goodsId" column="goods_id" jdbcType="BIGINT"/>
<result property="goodsNum" column="goods_num" jdbcType="VARCHAR"/> <result property="goodsNum" column="goods_num" jdbcType="VARCHAR"/>

4
serviceImpl/goods/src/main/resources/mapper/OGoodsMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsMapper"> <mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoods"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoods">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>
<result property="name" column="name" jdbcType="VARCHAR"/> <result property="name" column="name" jdbcType="VARCHAR"/>
<result property="image" column="image" jdbcType="VARCHAR"/> <result property="image" column="image" jdbcType="VARCHAR"/>
@ -46,7 +46,7 @@
<result property="updateBy" column="update_by" jdbcType="VARCHAR"/> <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/> <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap> </resultMap>
<resultMap type="cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo" id="GoodsSpecListVoResult"> <resultMap type="cn.qihangerp.model.vo.GoodsSpecListVo" id="GoodsSpecListVoResult">
<result property="skuId" column="sku_id" /> <result property="skuId" column="sku_id" />
<result property="goodsName" column="goods_name" /> <result property="goodsName" column="goods_name" />
<result property="skuName" column="sku_name" /> <result property="skuName" column="sku_name" />

2
serviceImpl/goods/src/main/resources/mapper/OGoodsSkuAttrMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper"> <mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsSkuAttr"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsSkuAttr">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>
<result property="goodsId" column="goods_id" jdbcType="INTEGER"/> <result property="goodsId" column="goods_id" jdbcType="INTEGER"/>
<result property="type" column="type" jdbcType="CHAR"/> <result property="type" column="type" jdbcType="CHAR"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsSkuMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsSkuMapper"> <mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsSkuMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsSku"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsSku">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>
<result property="goodsId" column="goods_id" jdbcType="BIGINT"/> <result property="goodsId" column="goods_id" jdbcType="BIGINT"/>
<result property="outerErpGoodsId" column="outer_erp_goods_id" jdbcType="VARCHAR"/> <result property="outerErpGoodsId" column="outer_erp_goods_id" jdbcType="VARCHAR"/>

2
serviceImpl/goods/src/main/resources/mapper/OGoodsSupplierMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper"> <mapper namespace="cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.goods.domain.OGoodsSupplier"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OGoodsSupplier">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>
<result property="name" column="name" jdbcType="VARCHAR"/> <result property="name" column="name" jdbcType="VARCHAR"/>
<result property="number" column="number" jdbcType="VARCHAR"/> <result property="number" column="number" jdbcType="VARCHAR"/>

9
serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java
View File

@ -2,9 +2,9 @@ package cn.qihangerp.module.open.jd.service.impl;
import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
@ -29,9 +29,6 @@ import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;

4
serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java
View File

@ -2,8 +2,8 @@ package cn.qihangerp.module.open.jd.service.impl;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.jd.domain.JdGoods; import cn.qihangerp.module.open.jd.domain.JdGoods;

6
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java
View File

@ -2,9 +2,9 @@ package cn.qihangerp.module.order.service.impl;
import cn.qihangerp.model.entity.OLogisticsCompany; import cn.qihangerp.model.entity.OLogisticsCompany;
import cn.qihangerp.model.request.OrderSearchRequest; import cn.qihangerp.model.request.OrderSearchRequest;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.domain.OGoodsSupplier; import cn.qihangerp.model.entity.OGoodsSupplier;
import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper; import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java
View File

@ -7,7 +7,7 @@ package cn.qihangerp.module.order.service.impl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.module.order.domain.OAfterSale; import cn.qihangerp.module.order.domain.OAfterSale;
import cn.qihangerp.module.order.domain.OOrder; import cn.qihangerp.module.order.domain.OOrder;

2
serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineGoodsSkuServiceImpl.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.module.order.service.impl;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.module.order.domain.OfflineGoodsSku; import cn.qihangerp.module.order.domain.OfflineGoodsSku;
import cn.qihangerp.module.order.mapper.OfflineGoodsSkuMapper; import cn.qihangerp.module.order.mapper.OfflineGoodsSkuMapper;

8
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java
View File

@ -6,9 +6,9 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
@ -18,8 +18,6 @@ import cn.qihangerp.module.open.pdd.domain.bo.PddGoodsBo;
import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper; import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper;
import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper;
import cn.qihangerp.module.open.pdd.service.PddGoodsService; import cn.qihangerp.module.open.pdd.service.PddGoodsService;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

4
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java
View File

@ -4,8 +4,8 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.pdd.domain.PddGoods; import cn.qihangerp.module.open.pdd.domain.PddGoods;

4
serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInServiceImpl.java
View File

@ -6,8 +6,8 @@ import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.common.utils.DateUtils;
import cn.qihangerp.module.goods.domain.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService; import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService;
import cn.qihangerp.module.goods.service.OGoodsInventoryService; import cn.qihangerp.module.goods.service.OGoodsInventoryService;
import cn.qihangerp.module.stock.domain.ErpStockIn; import cn.qihangerp.module.stock.domain.ErpStockIn;

4
serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java
View File

@ -5,8 +5,8 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.common.utils.DateUtils;
import cn.qihangerp.module.goods.domain.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService; import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService;
import cn.qihangerp.module.goods.service.OGoodsInventoryService; import cn.qihangerp.module.goods.service.OGoodsInventoryService;
import cn.qihangerp.module.stock.domain.ErpStockOut; import cn.qihangerp.module.stock.domain.ErpStockOut;

8
serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java
View File

@ -6,9 +6,9 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
@ -18,8 +18,6 @@ import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo;
import cn.qihangerp.module.open.tao.mapper.TaoGoodsMapper; import cn.qihangerp.module.open.tao.mapper.TaoGoodsMapper;
import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper; import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper;
import cn.qihangerp.module.open.tao.service.TaoGoodsService; import cn.qihangerp.module.open.tao.service.TaoGoodsService;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

2
serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java
View File

@ -4,7 +4,7 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.tao.domain.TaoGoods; import cn.qihangerp.module.open.tao.domain.TaoGoods;
import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; import cn.qihangerp.module.open.tao.domain.TaoGoodsSku;

7
serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsServiceImpl.java
View File

@ -5,9 +5,9 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.common.utils.StringUtils;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
@ -17,7 +17,6 @@ import cn.qihangerp.module.open.wei.mapper.WeiGoodsMapper;
import cn.qihangerp.module.open.wei.mapper.WeiGoodsSkuMapper; import cn.qihangerp.module.open.wei.mapper.WeiGoodsSkuMapper;
import cn.qihangerp.module.open.wei.service.WeiGoodsService; import cn.qihangerp.module.open.wei.service.WeiGoodsService;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

4
serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java
View File

@ -4,8 +4,8 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.module.goods.domain.OGoods; import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.wei.domain.WeiGoods; import cn.qihangerp.module.open.wei.domain.WeiGoods;