移除erp模块，合一起

2025-01-21 16:42:44 +08:00
1 parent 71ce1c0620
commit 6c35beee34
@@ -56,7 +56,6 @@ import com.bsd.pjcloud.wallet.api.vo.WalletSettingVo;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.seata.spring.annotation.GlobalTransactional;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -16,10 +16,10 @@ import java.time.LocalDateTime;
 */
@Data
@TenantTable
-@TableName("supermarket_auxiliary_code")
+@TableName("sm_erp_auxiliary_code")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "商品辅助条码")
-public class SupermarketAuxiliaryCodeEntity extends Model<SupermarketAuxiliaryCodeEntity> {
+public class SmErpAuxiliaryCodeEntity extends Model<SmErpAuxiliaryCodeEntity> {


 	/**
@@ -16,10 +16,10 @@ import java.time.LocalDateTime;
 */
@Data
@TenantTable
-@TableName("supermarket_brand")
+@TableName("sm_erp_brand")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "超市品牌")
-public class SupermarketBrandEntity extends Model<SupermarketBrandEntity> {
+public class SmErpBrandEntity extends Model<SmErpBrandEntity> {


 	/**
@@ -16,10 +16,10 @@ import java.time.LocalDateTime;
 */
@Data
@TenantTable
-@TableName("supermarket_category")
+@TableName("sm_erp_category")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "商品分类")
-public class SupermarketCategoryEntity extends Model<SupermarketCategoryEntity> {
+public class SmErpCategoryEntity extends Model<SmErpCategoryEntity> {


 	/**
@@ -22,10 +22,10 @@ import java.util.List;
 */
@Data
@TenantTable
-@TableName("supermarket_spu")
+@TableName("sm_erp_spu")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "商品spu")
-public class SupermarketSpuEntity extends Model<SupermarketSpuEntity> {
+public class SmErpSpuEntity extends Model<SmErpSpuEntity> {


 	/**
@@ -325,10 +325,10 @@ public class SupermarketSpuEntity extends Model<SupermarketSpuEntity> {

 	@Schema(description = "辅助条码集合对象")
 	@TableField(exist = false)
-	private List<SupermarketAuxiliaryCodeEntity> supermarketAuxiliaryCodeEntityList;
+	private List<SmErpAuxiliaryCodeEntity> smErpAuxiliaryCodeEntityList;

 	@Schema(description = "包装对象集合对象")
 	@TableField(exist = false)
-	private List<SupermarketUnitEntity> supermarketUnitEntityList;
+	private List<SmErpUnitEntity> smErpUnitEntityList;

 }
@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.supermarketerp.entity;
+package com.bsd.pjcloud.supermarket.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.supermarketerp.entity;
+package com.bsd.pjcloud.supermarket.entity;

 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -20,10 +20,10 @@ import java.time.LocalDateTime;
 */
@Data
@TenantTable
-@TableName("supermarket_unit")
+@TableName("sm_erp_unit")
@EqualsAndHashCode(callSuper = true)
@Schema(description = "商品包装单位(sku)")
-public class SupermarketUnitEntity extends Model<SupermarketUnitEntity> {
+public class SmErpUnitEntity extends Model<SmErpUnitEntity> {


 	/**
@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.erp.vo;
+package com.bsd.pjcloud.supermarket.vo;

 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.erp.vo;
+package com.bsd.pjcloud.supermarket.vo;

 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
-import com.bsd.pjcloud.supermarket.entity.SupermarketAuxiliaryCodeEntity;
-import com.bsd.pjcloud.supermarket.service.SupermarketAuxiliaryCodeService;
+import com.bsd.pjcloud.supermarket.entity.SmErpAuxiliaryCodeEntity;
+import com.bsd.pjcloud.supermarket.service.SmErpAuxiliaryCodeService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -34,9 +34,9 @@ import java.util.Objects;
@RequestMapping("/supermarketAuxiliaryCode" )
@Tag(description = "supermarketAuxiliaryCode" , name = "商品辅助条码管理" )
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
-public class SupermarketAuxiliaryCodeController {
+public class SmErpAuxiliaryCodeController {

-    private final  SupermarketAuxiliaryCodeService supermarketAuxiliaryCodeService;
+    private final SmErpAuxiliaryCodeService smErpAuxiliaryCodeService;

    /**
     * 分页查询
@@ -47,11 +47,11 @@ public class SupermarketAuxiliaryCodeController {
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketAuxiliaryCode_view')" )
-    public R getSupermarketAuxiliaryCodePage(@ParameterObject Page page, @ParameterObject SupermarketAuxiliaryCodeEntity supermarketAuxiliaryCode) {
-        LambdaQueryWrapper<SupermarketAuxiliaryCodeEntity> wrapper = Wrappers.lambdaQuery();
-		wrapper.eq(StrUtil.isNotBlank(supermarketAuxiliaryCode.getBarCode()),SupermarketAuxiliaryCodeEntity::getBarCode,supermarketAuxiliaryCode.getBarCode());
-		wrapper.eq(Objects.nonNull(supermarketAuxiliaryCode.getSpuId()),SupermarketAuxiliaryCodeEntity::getSpuId,supermarketAuxiliaryCode.getSpuId());
-        return R.ok(supermarketAuxiliaryCodeService.page(page, wrapper));
+    public R getSupermarketAuxiliaryCodePage(@ParameterObject Page page, @ParameterObject SmErpAuxiliaryCodeEntity supermarketAuxiliaryCode) {
+        LambdaQueryWrapper<SmErpAuxiliaryCodeEntity> wrapper = Wrappers.lambdaQuery();
+		wrapper.eq(StrUtil.isNotBlank(supermarketAuxiliaryCode.getBarCode()), SmErpAuxiliaryCodeEntity::getBarCode,supermarketAuxiliaryCode.getBarCode());
+		wrapper.eq(Objects.nonNull(supermarketAuxiliaryCode.getSpuId()), SmErpAuxiliaryCodeEntity::getSpuId,supermarketAuxiliaryCode.getSpuId());
+        return R.ok(smErpAuxiliaryCodeService.page(page, wrapper));
    }


@@ -64,7 +64,7 @@ public class SupermarketAuxiliaryCodeController {
    @GetMapping("/{id}" )
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketAuxiliaryCode_view')" )
    public R getById(@PathVariable("id" ) Long id) {
-        return R.ok(supermarketAuxiliaryCodeService.getById(id));
+        return R.ok(smErpAuxiliaryCodeService.getById(id));
    }

    /**
@@ -76,8 +76,8 @@ public class SupermarketAuxiliaryCodeController {
    @SysLog("新增商品辅助条码" )
    @PostMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketAuxiliaryCode_add')" )
-    public R save(@RequestBody SupermarketAuxiliaryCodeEntity supermarketAuxiliaryCode) {
-        return R.ok(supermarketAuxiliaryCodeService.save(supermarketAuxiliaryCode));
+    public R save(@RequestBody SmErpAuxiliaryCodeEntity supermarketAuxiliaryCode) {
+        return R.ok(smErpAuxiliaryCodeService.save(supermarketAuxiliaryCode));
    }

    /**
@@ -89,8 +89,8 @@ public class SupermarketAuxiliaryCodeController {
    @SysLog("修改商品辅助条码" )
    @PutMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketAuxiliaryCode_edit')" )
-    public R updateById(@RequestBody SupermarketAuxiliaryCodeEntity supermarketAuxiliaryCode) {
-        return R.ok(supermarketAuxiliaryCodeService.updateById(supermarketAuxiliaryCode));
+    public R updateById(@RequestBody SmErpAuxiliaryCodeEntity supermarketAuxiliaryCode) {
+        return R.ok(smErpAuxiliaryCodeService.updateById(supermarketAuxiliaryCode));
    }

    /**
@@ -103,7 +103,7 @@ public class SupermarketAuxiliaryCodeController {
    @DeleteMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketAuxiliaryCode_del')" )
    public R removeById(@RequestBody Long[] ids) {
-        return R.ok(supermarketAuxiliaryCodeService.removeBatchByIds(CollUtil.toList(ids)));
+        return R.ok(smErpAuxiliaryCodeService.removeBatchByIds(CollUtil.toList(ids)));
    }


@@ -116,7 +116,7 @@ public class SupermarketAuxiliaryCodeController {
    @ResponseExcel
    @GetMapping("/export")
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketAuxiliaryCode_export')" )
-    public List<SupermarketAuxiliaryCodeEntity> export(SupermarketAuxiliaryCodeEntity supermarketAuxiliaryCode,Long[] ids) {
-        return supermarketAuxiliaryCodeService.list(Wrappers.lambdaQuery(supermarketAuxiliaryCode).in(ArrayUtil.isNotEmpty(ids), SupermarketAuxiliaryCodeEntity::getId, ids));
+    public List<SmErpAuxiliaryCodeEntity> export(SmErpAuxiliaryCodeEntity supermarketAuxiliaryCode, Long[] ids) {
+        return smErpAuxiliaryCodeService.list(Wrappers.lambdaQuery(supermarketAuxiliaryCode).in(ArrayUtil.isNotEmpty(ids), SmErpAuxiliaryCodeEntity::getId, ids));
    }
 }
@@ -10,8 +10,8 @@ import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
-import com.bsd.pjcloud.supermarket.entity.SupermarketBrandEntity;
-import com.bsd.pjcloud.supermarket.service.SupermarketBrandService;
+import com.bsd.pjcloud.supermarket.entity.SmErpBrandEntity;
+import com.bsd.pjcloud.supermarket.service.SmErpBrandService;
 import com.bsd.pjcloud.supermarket.vo.SupermarketBrandSimpleVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
@@ -36,9 +36,9 @@ import java.util.List;
@RequestMapping("/supermarketBrand" )
@Tag(description = "supermarketBrand" , name = "超市品牌管理" )
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
-public class SupermarketBrandController {
+public class SmErpBrandController {

-    private final  SupermarketBrandService supermarketBrandService;
+    private final SmErpBrandService smErpBrandService;

    /**
     * 分页查询
@@ -49,10 +49,10 @@ public class SupermarketBrandController {
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketBrand_view')" )
-    public R getSupermarketBrandPage(@ParameterObject Page page, @ParameterObject SupermarketBrandEntity supermarketBrand) {
-        LambdaQueryWrapper<SupermarketBrandEntity> wrapper = Wrappers.lambdaQuery();
-		wrapper.like(StrUtil.isNotBlank(supermarketBrand.getName()),SupermarketBrandEntity::getName,supermarketBrand.getName());
-        return R.ok(supermarketBrandService.pagescope(page, wrapper));
+    public R getSupermarketBrandPage(@ParameterObject Page page, @ParameterObject SmErpBrandEntity supermarketBrand) {
+        LambdaQueryWrapper<SmErpBrandEntity> wrapper = Wrappers.lambdaQuery();
+		wrapper.like(StrUtil.isNotBlank(supermarketBrand.getName()), SmErpBrandEntity::getName,supermarketBrand.getName());
+        return R.ok(smErpBrandService.pagescope(page, wrapper));
    }


@@ -65,7 +65,7 @@ public class SupermarketBrandController {
    @GetMapping("/{id}" )
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketBrand_view')" )
    public R getById(@PathVariable("id" ) Long id) {
-        return R.ok(supermarketBrandService.getById(id));
+        return R.ok(smErpBrandService.getById(id));
    }

    /**
@@ -77,9 +77,9 @@ public class SupermarketBrandController {
    @SysLog("新增超市品牌" )
    @PostMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketBrand_add')" )
-    public R save(@RequestBody SupermarketBrandEntity supermarketBrand) {
+    public R save(@RequestBody SmErpBrandEntity supermarketBrand) {
        supermarketBrand.setDeptId(SecurityUtils.getUser().getDeptId());
-        return R.ok(supermarketBrandService.save(supermarketBrand));
+        return R.ok(smErpBrandService.save(supermarketBrand));
    }

    /**
@@ -91,8 +91,8 @@ public class SupermarketBrandController {
    @SysLog("修改超市品牌" )
    @PutMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketBrand_edit')" )
-    public R updateById(@RequestBody SupermarketBrandEntity supermarketBrand) {
-        return R.ok(supermarketBrandService.updateById(supermarketBrand));
+    public R updateById(@RequestBody SmErpBrandEntity supermarketBrand) {
+        return R.ok(smErpBrandService.updateById(supermarketBrand));
    }

    /**
@@ -105,7 +105,7 @@ public class SupermarketBrandController {
    @DeleteMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketBrand_del')" )
    public R removeById(@RequestBody Long[] ids) {
-        return R.ok(supermarketBrandService.removeBatchByIds(CollUtil.toList(ids)));
+        return R.ok(smErpBrandService.removeBatchByIds(CollUtil.toList(ids)));
    }


@@ -118,8 +118,8 @@ public class SupermarketBrandController {
    @ResponseExcel
    @GetMapping("/export")
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketBrand_export')" )
-    public List<SupermarketBrandEntity> export(SupermarketBrandEntity supermarketBrand,Long[] ids) {
-        return supermarketBrandService.list(Wrappers.lambdaQuery(supermarketBrand).in(ArrayUtil.isNotEmpty(ids), SupermarketBrandEntity::getId, ids));
+    public List<SmErpBrandEntity> export(SmErpBrandEntity supermarketBrand, Long[] ids) {
+        return smErpBrandService.list(Wrappers.lambdaQuery(supermarketBrand).in(ArrayUtil.isNotEmpty(ids), SmErpBrandEntity::getId, ids));
    }


@@ -130,7 +130,7 @@ public class SupermarketBrandController {
    @Operation(summary = "下拉查询")
    @GetMapping("/simpleAll")
    public R getSimpleAll() {
-        List<SupermarketBrandEntity> list = supermarketBrandService.list();
+        List<SmErpBrandEntity> list = smErpBrandService.list();
        List<SupermarketBrandSimpleVo> bean = BeanUtils.toBean(list, SupermarketBrandSimpleVo.class);
        return R.ok(bean);
    }
@@ -10,8 +10,8 @@ import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
-import com.bsd.pjcloud.supermarket.entity.SupermarketCategoryEntity;
-import com.bsd.pjcloud.supermarket.service.SupermarketCategoryService;
+import com.bsd.pjcloud.supermarket.entity.SmErpCategoryEntity;
+import com.bsd.pjcloud.supermarket.service.SmErpCategoryService;
 import com.bsd.pjcloud.supermarket.vo.SupermarketCategorySimpleVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
@@ -36,9 +36,9 @@ import java.util.List;
@RequestMapping("/supermarketCategory" )
@Tag(description = "supermarketCategory" , name = "商品分类管理" )
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
-public class SupermarketCategoryController {
+public class SmErpCategoryController {

-    private final  SupermarketCategoryService supermarketCategoryService;
+    private final SmErpCategoryService smErpCategoryService;

    /**
     * 分页查询
@@ -49,10 +49,10 @@ public class SupermarketCategoryController {
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketCategory_view')" )
-    public R getSupermarketCategoryPage(@ParameterObject Page page, @ParameterObject SupermarketCategoryEntity supermarketCategory) {
-        LambdaQueryWrapper<SupermarketCategoryEntity> wrapper = Wrappers.lambdaQuery();
-		wrapper.like(StrUtil.isNotBlank(supermarketCategory.getName()),SupermarketCategoryEntity::getName,supermarketCategory.getName());
-        return R.ok(supermarketCategoryService.pageScope(page, wrapper));
+    public R getSupermarketCategoryPage(@ParameterObject Page page, @ParameterObject SmErpCategoryEntity supermarketCategory) {
+        LambdaQueryWrapper<SmErpCategoryEntity> wrapper = Wrappers.lambdaQuery();
+		wrapper.like(StrUtil.isNotBlank(supermarketCategory.getName()), SmErpCategoryEntity::getName,supermarketCategory.getName());
+        return R.ok(smErpCategoryService.pageScope(page, wrapper));
    }


@@ -65,7 +65,7 @@ public class SupermarketCategoryController {
    @GetMapping("/{id}" )
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketCategory_view')" )
    public R getById(@PathVariable("id" ) Long id) {
-        return R.ok(supermarketCategoryService.getById(id));
+        return R.ok(smErpCategoryService.getById(id));
    }

    /**
@@ -77,9 +77,9 @@ public class SupermarketCategoryController {
    @SysLog("新增商品分类" )
    @PostMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketCategory_add')" )
-    public R save(@RequestBody SupermarketCategoryEntity supermarketCategory) {
+    public R save(@RequestBody SmErpCategoryEntity supermarketCategory) {
        supermarketCategory.setDeptId(SecurityUtils.getUser().getDeptId());
-        return R.ok(supermarketCategoryService.save(supermarketCategory));
+        return R.ok(smErpCategoryService.save(supermarketCategory));
    }

    /**
@@ -91,8 +91,8 @@ public class SupermarketCategoryController {
    @SysLog("修改商品分类" )
    @PutMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketCategory_edit')" )
-    public R updateById(@RequestBody SupermarketCategoryEntity supermarketCategory) {
-        return R.ok(supermarketCategoryService.updateById(supermarketCategory));
+    public R updateById(@RequestBody SmErpCategoryEntity supermarketCategory) {
+        return R.ok(smErpCategoryService.updateById(supermarketCategory));
    }

    /**
@@ -105,7 +105,7 @@ public class SupermarketCategoryController {
    @DeleteMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketCategory_del')" )
    public R removeById(@RequestBody Long[] ids) {
-        return R.ok(supermarketCategoryService.removeBatchByIds(CollUtil.toList(ids)));
+        return R.ok(smErpCategoryService.removeBatchByIds(CollUtil.toList(ids)));
    }


@@ -118,8 +118,8 @@ public class SupermarketCategoryController {
    @ResponseExcel
    @GetMapping("/export")
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketCategory_export')" )
-    public List<SupermarketCategoryEntity> export(SupermarketCategoryEntity supermarketCategory,Long[] ids) {
-        return supermarketCategoryService.list(Wrappers.lambdaQuery(supermarketCategory).in(ArrayUtil.isNotEmpty(ids), SupermarketCategoryEntity::getId, ids));
+    public List<SmErpCategoryEntity> export(SmErpCategoryEntity supermarketCategory, Long[] ids) {
+        return smErpCategoryService.list(Wrappers.lambdaQuery(supermarketCategory).in(ArrayUtil.isNotEmpty(ids), SmErpCategoryEntity::getId, ids));
    }


@@ -130,7 +130,7 @@ public class SupermarketCategoryController {
    @Operation(summary = "下拉查询")
    @GetMapping("/simpleAll")
    public R getSimpleAll() {
-        List<SupermarketCategoryEntity> list = supermarketCategoryService.listScope();
+        List<SmErpCategoryEntity> list = smErpCategoryService.listScope();
        List<SupermarketCategorySimpleVo> bean = BeanUtils.toBean(list, SupermarketCategorySimpleVo.class);
        return R.ok(bean);
    }
@@ -145,8 +145,8 @@ public class SupermarketCategoryController {
    @Operation(summary = "APP分类查询",description = "通过商户id获取该商户下的分类")
    @GetMapping("/app/simpleAll")
    public R getAppSimpleAll(@RequestParam("merchantId")Long merchantId) {
-        List<SupermarketCategoryEntity> list = supermarketCategoryService.
-                list(new LambdaQueryWrapper<SupermarketCategoryEntity>().eq(SupermarketCategoryEntity::getMerchantId, merchantId));
+        List<SmErpCategoryEntity> list = smErpCategoryService.
+                list(new LambdaQueryWrapper<SmErpCategoryEntity>().eq(SmErpCategoryEntity::getMerchantId, merchantId));
        List<SupermarketCategorySimpleVo> bean = BeanUtils.toBean(list, SupermarketCategorySimpleVo.class);
        return R.ok(bean);
    }
@@ -13,12 +13,12 @@ import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuAppQueryDTO;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO;
-import com.bsd.pjcloud.supermarket.entity.SupermarketAuxiliaryCodeEntity;
-import com.bsd.pjcloud.supermarket.entity.SupermarketSpuEntity;
-import com.bsd.pjcloud.supermarket.entity.SupermarketUnitEntity;
-import com.bsd.pjcloud.supermarket.service.SupermarketAuxiliaryCodeService;
-import com.bsd.pjcloud.supermarket.service.SupermarketSpuService;
-import com.bsd.pjcloud.supermarket.service.SupermarketUnitService;
+import com.bsd.pjcloud.supermarket.entity.SmErpAuxiliaryCodeEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity;
+import com.bsd.pjcloud.supermarket.service.SmErpAuxiliaryCodeService;
+import com.bsd.pjcloud.supermarket.service.SmErpSpuService;
+import com.bsd.pjcloud.supermarket.service.SmErpUnitService;
 import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -45,13 +45,13 @@ import java.util.List;
@RequestMapping("/supermarketSpu" )
@Tag(description = "supermarketSpu" , name = "商品spu管理" )
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
-public class SupermarketSpuController {
+public class SmErpSpuController {

-    private final  SupermarketSpuService supermarketSpuService;
+    private final SmErpSpuService smErpSpuService;

-    private final SupermarketUnitService supermarketUnitService;
+    private final SmErpUnitService smErpUnitService;

-    private final SupermarketAuxiliaryCodeService supermarketAuxiliaryCodeService;
+    private final SmErpAuxiliaryCodeService smErpAuxiliaryCodeService;

    /**
     * 分页查询
@@ -62,12 +62,12 @@ public class SupermarketSpuController {
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_view')" )
-    public R getSupermarketSpuPage(@ParameterObject Page page, @ParameterObject SupermarketSpuEntity supermarketSpu) {
-        LambdaQueryWrapper<SupermarketSpuEntity> wrapper = Wrappers.lambdaQuery();
-		wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getProductCode()),SupermarketSpuEntity::getProductCode,supermarketSpu.getProductCode());
-		wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getBarcode()),SupermarketSpuEntity::getBarcode,supermarketSpu.getBarcode());
-		wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getProductName()),SupermarketSpuEntity::getProductName,supermarketSpu.getProductName());
-        return R.ok(supermarketSpuService.pageScope(page, wrapper));
+    public R getSupermarketSpuPage(@ParameterObject Page page, @ParameterObject SmErpSpuEntity supermarketSpu) {
+        LambdaQueryWrapper<SmErpSpuEntity> wrapper = Wrappers.lambdaQuery();
+		wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getProductCode()), SmErpSpuEntity::getProductCode,supermarketSpu.getProductCode());
+		wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getBarcode()), SmErpSpuEntity::getBarcode,supermarketSpu.getBarcode());
+		wrapper.eq(StringUtils.isNotBlank(supermarketSpu.getProductName()), SmErpSpuEntity::getProductName,supermarketSpu.getProductName());
+        return R.ok(smErpSpuService.pageScope(page, wrapper));
    }


@@ -80,14 +80,14 @@ public class SupermarketSpuController {
    @GetMapping("/{id}" )
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_view')" )
    public R getById(@PathVariable("id" ) Long id) {
-        SupermarketSpuEntity supermarketSpuEntity = supermarketSpuService.getById(id);
-        List<SupermarketUnitEntity> list = supermarketUnitService.list(new LambdaQueryWrapper<SupermarketUnitEntity>().eq(SupermarketUnitEntity::getSpuId, id));
-        supermarketSpuEntity.setSupermarketUnitEntityList(list);
-        supermarketSpuEntity.setSupermarketAuxiliaryCodeEntityList(
-                supermarketAuxiliaryCodeService.list(new LambdaQueryWrapper<SupermarketAuxiliaryCodeEntity>().eq(SupermarketAuxiliaryCodeEntity::getSpuId, id))
+        SmErpSpuEntity smErpSpuEntity = smErpSpuService.getById(id);
+        List<SmErpUnitEntity> list = smErpUnitService.list(new LambdaQueryWrapper<SmErpUnitEntity>().eq(SmErpUnitEntity::getSpuId, id));
+        smErpSpuEntity.setSmErpUnitEntityList(list);
+        smErpSpuEntity.setSmErpAuxiliaryCodeEntityList(
+                smErpAuxiliaryCodeService.list(new LambdaQueryWrapper<SmErpAuxiliaryCodeEntity>().eq(SmErpAuxiliaryCodeEntity::getSpuId, id))
        );

-        return R.ok(supermarketSpuEntity);
+        return R.ok(smErpSpuEntity);
    }

    /**
@@ -99,9 +99,9 @@ public class SupermarketSpuController {
    @SysLog("新增商品spu" )
    @PostMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_add')" )
-    public R save(@RequestBody SupermarketSpuEntity supermarketSpu) {
+    public R save(@RequestBody SmErpSpuEntity supermarketSpu) {
        supermarketSpu.setDeptId(SecurityUtils.getUser().getDeptId());
-        return supermarketSpuService.saveSpu(supermarketSpu);
+        return smErpSpuService.saveSpu(supermarketSpu);
    }

    /**
@@ -113,8 +113,8 @@ public class SupermarketSpuController {
    @SysLog("修改商品spu" )
    @PutMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_edit')" )
-    public R updateById(@RequestBody SupermarketSpuEntity supermarketSpu) {
-        return supermarketSpuService.updateSpuById(supermarketSpu);
+    public R updateById(@RequestBody SmErpSpuEntity supermarketSpu) {
+        return smErpSpuService.updateSpuById(supermarketSpu);
    }

    /**
@@ -127,7 +127,7 @@ public class SupermarketSpuController {
    @DeleteMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_del')" )
    public R removeById(@RequestBody Long[] ids) {
-        return R.ok(supermarketSpuService.removeSpuBatchByIds(CollUtil.toList(ids)));
+        return R.ok(smErpSpuService.removeSpuBatchByIds(CollUtil.toList(ids)));
    }


@@ -140,8 +140,8 @@ public class SupermarketSpuController {
    @ResponseExcel
    @GetMapping("/export")
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_export')" )
-    public List<SupermarketSpuEntity> export(SupermarketSpuEntity supermarketSpu,Long[] ids) {
-        return supermarketSpuService.list(Wrappers.lambdaQuery(supermarketSpu).in(ArrayUtil.isNotEmpty(ids), SupermarketSpuEntity::getId, ids));
+    public List<SmErpSpuEntity> export(SmErpSpuEntity supermarketSpu, Long[] ids) {
+        return smErpSpuService.list(Wrappers.lambdaQuery(supermarketSpu).in(ArrayUtil.isNotEmpty(ids), SmErpSpuEntity::getId, ids));
    }


@@ -158,7 +158,7 @@ public class SupermarketSpuController {
    @PostMapping("/ad/selectListAll" )
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_view')" )
    public R getSupermarketSpuByScope(@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO) {
-        return R.ok(supermarketSpuService.selectListAllScope(supermarketSpuQueryDTO));
+        return R.ok(smErpSpuService.selectListAllScope(supermarketSpuQueryDTO));
    }


@@ -170,7 +170,7 @@ public class SupermarketSpuController {
    @Operation(summary = "条件查询所有" , description = "条件查询所有" )
    @GetMapping("/ad/SpuDetails" )
    public R getSupermarketSpuDetailById(@RequestParam("id")Long id) {
-        return R.ok(supermarketSpuService.getSupermarketSpuDetailById(id));
+        return R.ok(smErpSpuService.getSupermarketSpuDetailById(id));
    }


@@ -178,7 +178,7 @@ public class SupermarketSpuController {
    @Operation(summary = "更新库存" , description = "app和安卓公用" )
    @SysLog("更新商品库存")
    public R updateSkuStock(@RequestBody SupermarketSpuUpdateStockReqDTO updateStockReqDTO){
-        return supermarketSpuService.updateSpuStock(updateStockReqDTO);
+        return smErpSpuService.updateSpuStock(updateStockReqDTO);
    }


@@ -194,13 +194,13 @@ public class SupermarketSpuController {
    @PostMapping("/app/selectListAll" )
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_view')" )
    public R getSupermarketSpu(@RequestBody SupermarketSpuAppQueryDTO supermarketSpuQueryDTO,@ParameterObject Page page) {
-        LambdaQueryWrapper<SupermarketSpuEntity>  wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(supermarketSpuQueryDTO.getMerchantId() != null, SupermarketSpuEntity::getMerchantId, supermarketSpuQueryDTO.getMerchantId());
-        wrapper.eq(supermarketSpuQueryDTO.getCategoryId() != null, SupermarketSpuEntity::getCategoryId, supermarketSpuQueryDTO.getCategoryId());
+        LambdaQueryWrapper<SmErpSpuEntity>  wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(supermarketSpuQueryDTO.getMerchantId() != null, SmErpSpuEntity::getMerchantId, supermarketSpuQueryDTO.getMerchantId());
+        wrapper.eq(supermarketSpuQueryDTO.getCategoryId() != null, SmErpSpuEntity::getCategoryId, supermarketSpuQueryDTO.getCategoryId());
 //        wrapper.eq(StrUtil.isNotBlank(supermarketSpuQueryDTO.getProductCode()), SupermarketSpuEntity::getProductCode, supermarketSpuQueryDTO.getProductCode());
 //        wrapper.eq(StrUtil.isNotBlank(supermarketSpuQueryDTO.getBarcode()), SupermarketSpuEntity::getBarcode, supermarketSpuQueryDTO.getBarcode());
-        wrapper.like(StrUtil.isNotBlank(supermarketSpuQueryDTO.getProductName()), SupermarketSpuEntity::getProductName, supermarketSpuQueryDTO.getProductName());
-        Page pageDate = supermarketSpuService.page(page, wrapper);
+        wrapper.like(StrUtil.isNotBlank(supermarketSpuQueryDTO.getProductName()), SmErpSpuEntity::getProductName, supermarketSpuQueryDTO.getProductName());
+        Page pageDate = smErpSpuService.page(page, wrapper);
        List list = pageDate.getRecords();
        List<SupermarketAppSpuVo> bean = BeanUtils.toBean(list, SupermarketAppSpuVo.class);
        pageDate.setRecords(bean);
@@ -215,14 +215,14 @@ public class SupermarketSpuController {
    @Operation(summary = "app获取spu详情" , description = "根据spu的id" )
    @GetMapping("/app/SpuDetails" )
    public R getSupermarketSpuAppDetailById(@RequestParam("id")Long id) {
-        return R.ok(supermarketSpuService.getSupermarketSpuAppDetailById(id));
+        return R.ok(smErpSpuService.getSupermarketSpuAppDetailById(id));
    }

    @GetMapping("/app/checkSpuStock")
    @SysLog("购物车效验库存")
    @Transactional
    public R checkSpuStock(@RequestParam(value ="spuId")Long spuId,@RequestParam("incrCount")Integer incrCount) {
-        SupermarketSpuEntity spu= supermarketSpuService.getById(spuId);
+        SmErpSpuEntity spu= smErpSpuService.getById(spuId);
        if (spu == null) {
            R.failed("商品不存在");
        }
@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.supermarketerp.controller;
+package com.bsd.pjcloud.supermarket.controller;

 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ArrayUtil;
@@ -10,9 +10,9 @@ import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
-import com.bsd.pjcloud.erp.vo.SmErpSupplierSimpleVo;
-import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity;
-import com.bsd.pjcloud.supermarketerp.service.SmErpSupplierService;
+import com.bsd.pjcloud.supermarket.entity.SmErpSupplierEntity;
+import com.bsd.pjcloud.supermarket.service.SmErpSupplierService;
+import com.bsd.pjcloud.supermarket.vo.SmErpSupplierSimpleVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -39,7 +39,7 @@ import java.util.Objects;
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class SmErpSupplierController {

-    private final  SmErpSupplierService smErpSupplierService;
+    private final SmErpSupplierService smErpSupplierService;

    /**
     * 分页查询
@@ -1,4 +1,4 @@
-package com.bsd.pjcloud.supermarketerp.controller;
+package com.bsd.pjcloud.supermarket.controller;

 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ArrayUtil;
@@ -10,9 +10,9 @@ import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
-import com.bsd.pjcloud.erp.vo.SmErpSupplierTypeSimpleVo;
-import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierTypeEntity;
-import com.bsd.pjcloud.supermarketerp.service.SmErpSupplierTypeService;
+import com.bsd.pjcloud.supermarket.entity.SmErpSupplierTypeEntity;
+import com.bsd.pjcloud.supermarket.service.SmErpSupplierTypeService;
+import com.bsd.pjcloud.supermarket.vo.SmErpSupplierTypeSimpleVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -39,7 +39,7 @@ import java.util.Objects;
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
 public class SmErpSupplierTypeController {

-    private final  SmErpSupplierTypeService smErpSupplierTypeService;
+    private final SmErpSupplierTypeService smErpSupplierTypeService;

    /**
     * 分页查询
@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
-import com.bsd.pjcloud.supermarket.entity.SupermarketUnitEntity;
-import com.bsd.pjcloud.supermarket.service.SupermarketUnitService;
+import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity;
+import com.bsd.pjcloud.supermarket.service.SmErpUnitService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -34,9 +34,9 @@ import java.util.Objects;
@RequestMapping("/supermarketUnit" )
@Tag(description = "supermarketUnit" , name = "商品包装单位(sku)管理" )
@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
-public class SupermarketUnitController {
+public class SmErpUnitController {

-    private final  SupermarketUnitService supermarketUnitService;
+    private final SmErpUnitService smErpUnitService;

    /**
     * 分页查询
@@ -47,11 +47,11 @@ public class SupermarketUnitController {
    @Operation(summary = "分页查询" , description = "分页查询" )
    @GetMapping("/page" )
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketUnit_view')" )
-    public R getSupermarketUnitPage(@ParameterObject Page page, @ParameterObject SupermarketUnitEntity supermarketUnit) {
-        LambdaQueryWrapper<SupermarketUnitEntity> wrapper = Wrappers.lambdaQuery();
-		wrapper.eq(StrUtil.isNotBlank(supermarketUnit.getBarCode()),SupermarketUnitEntity::getBarCode,supermarketUnit.getBarCode());
-		wrapper.eq(Objects.nonNull(supermarketUnit.getSpuId()),SupermarketUnitEntity::getSpuId,supermarketUnit.getSpuId());
-        return R.ok(supermarketUnitService.page(page, wrapper));
+    public R getSupermarketUnitPage(@ParameterObject Page page, @ParameterObject SmErpUnitEntity supermarketUnit) {
+        LambdaQueryWrapper<SmErpUnitEntity> wrapper = Wrappers.lambdaQuery();
+		wrapper.eq(StrUtil.isNotBlank(supermarketUnit.getBarCode()), SmErpUnitEntity::getBarCode,supermarketUnit.getBarCode());
+		wrapper.eq(Objects.nonNull(supermarketUnit.getSpuId()), SmErpUnitEntity::getSpuId,supermarketUnit.getSpuId());
+        return R.ok(smErpUnitService.page(page, wrapper));
    }


@@ -64,7 +64,7 @@ public class SupermarketUnitController {
    @GetMapping("/{id}" )
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketUnit_view')" )
    public R getById(@PathVariable("id" ) Long id) {
-        return R.ok(supermarketUnitService.getById(id));
+        return R.ok(smErpUnitService.getById(id));
    }

    /**
@@ -76,8 +76,8 @@ public class SupermarketUnitController {
    @SysLog("新增商品包装单位(sku)" )
    @PostMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketUnit_add')" )
-    public R save(@RequestBody SupermarketUnitEntity supermarketUnit) {
-        return R.ok(supermarketUnitService.save(supermarketUnit));
+    public R save(@RequestBody SmErpUnitEntity supermarketUnit) {
+        return R.ok(smErpUnitService.save(supermarketUnit));
    }

    /**
@@ -89,8 +89,8 @@ public class SupermarketUnitController {
    @SysLog("修改商品包装单位(sku)" )
    @PutMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketUnit_edit')" )
-    public R updateById(@RequestBody SupermarketUnitEntity supermarketUnit) {
-        return R.ok(supermarketUnitService.updateById(supermarketUnit));
+    public R updateById(@RequestBody SmErpUnitEntity supermarketUnit) {
+        return R.ok(smErpUnitService.updateById(supermarketUnit));
    }

    /**
@@ -103,7 +103,7 @@ public class SupermarketUnitController {
    @DeleteMapping
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketUnit_del')" )
    public R removeById(@RequestBody Long[] ids) {
-        return R.ok(supermarketUnitService.removeBatchByIds(CollUtil.toList(ids)));
+        return R.ok(smErpUnitService.removeBatchByIds(CollUtil.toList(ids)));
    }


@@ -116,8 +116,8 @@ public class SupermarketUnitController {
    @ResponseExcel
    @GetMapping("/export")
    @PreAuthorize("@pms.hasPermission('supermarket_supermarketUnit_export')" )
-    public List<SupermarketUnitEntity> export(SupermarketUnitEntity supermarketUnit,Long[] ids) {
-        return supermarketUnitService.list(Wrappers.lambdaQuery(supermarketUnit).in(ArrayUtil.isNotEmpty(ids), SupermarketUnitEntity::getId, ids));
+    public List<SmErpUnitEntity> export(SmErpUnitEntity supermarketUnit, Long[] ids) {
+        return smErpUnitService.list(Wrappers.lambdaQuery(supermarketUnit).in(ArrayUtil.isNotEmpty(ids), SmErpUnitEntity::getId, ids));
    }


@@ -131,7 +131,7 @@ public class SupermarketUnitController {
    @Operation(summary = "通过ids查询" , description = "通过ids查询" )
    @PostMapping("/ad/getSupermarketUnits" )
    public R getSupermarketUnits(@RequestBody List<Long> ids) {
-        return R.ok(supermarketUnitService.getSupermarketUnitsWithSpu(ids));
+        return R.ok(smErpUnitService.getSupermarketUnitsWithSpu(ids));
    }

 }
@@ -0,0 +1,11 @@
+package com.bsd.pjcloud.supermarket.mapper;
+
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import com.bsd.pjcloud.supermarket.entity.SmErpAuxiliaryCodeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SmErpAuxiliaryCodeMapper extends PjcloudBaseMapper<SmErpAuxiliaryCodeEntity> {
+
+
+}
@@ -1,11 +1,11 @@
 package com.bsd.pjcloud.supermarket.mapper;

 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
-import com.bsd.pjcloud.supermarket.entity.SupermarketBrandEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpBrandEntity;
 import org.apache.ibatis.annotations.Mapper;

@Mapper
-public interface SupermarketBrandMapper extends PjcloudBaseMapper<SupermarketBrandEntity> {
+public interface SmErpBrandMapper extends PjcloudBaseMapper<SmErpBrandEntity> {


 }
@@ -0,0 +1,11 @@
+package com.bsd.pjcloud.supermarket.mapper;
+
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import com.bsd.pjcloud.supermarket.entity.SmErpCategoryEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SmErpCategoryMapper extends PjcloudBaseMapper<SmErpCategoryEntity> {
+
+
+}
@@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO;
-import com.bsd.pjcloud.supermarket.entity.SupermarketSpuEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

 import java.util.List;

@Mapper
-public interface SupermarketSpuMapper extends PjcloudBaseMapper<SupermarketSpuEntity> {
+public interface SmErpSpuMapper extends PjcloudBaseMapper<SmErpSpuEntity> {


    /**
@@ -32,12 +32,12 @@ public interface SupermarketSpuMapper extends PjcloudBaseMapper<SupermarketSpuEn
            sql = " stock = stock - " + Math.abs(incrCount) + ", sales_count = sales_count + " + Math.abs(incrCount);
        }
        // 执行更新
-        LambdaUpdateWrapper<SupermarketSpuEntity> updateWrapper = new LambdaUpdateWrapper<SupermarketSpuEntity>()
+        LambdaUpdateWrapper<SmErpSpuEntity> updateWrapper = new LambdaUpdateWrapper<SmErpSpuEntity>()
                .setSql(sql)
-                .eq(SupermarketSpuEntity::getId, id);
+                .eq(SmErpSpuEntity::getId, id);
        return update(null, updateWrapper);
    }

-    List<SupermarketSpuEntity> selectListAllScope(@Param("supermarketSpuQueryDTO") SupermarketSpuQueryDTO supermarketSpuQueryDTO
+    List<SmErpSpuEntity> selectListAllScope(@Param("supermarketSpuQueryDTO") SupermarketSpuQueryDTO supermarketSpuQueryDTO
    , DataScope dataScope);
 }
@@ -1,7 +1,7 @@
-package com.bsd.pjcloud.supermarketerp.mapper;
+package com.bsd.pjcloud.supermarket.mapper;

 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
-import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpSupplierEntity;
 import org.apache.ibatis.annotations.Mapper;

@Mapper
@@ -1,7 +1,8 @@
-package com.bsd.pjcloud.supermarketerp.mapper;
+package com.bsd.pjcloud.supermarket.mapper;

 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
-import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierTypeEntity;
+
+import com.bsd.pjcloud.supermarket.entity.SmErpSupplierTypeEntity;
 import org.apache.ibatis.annotations.Mapper;

@Mapper
@@ -1,14 +1,14 @@
 package com.bsd.pjcloud.supermarket.mapper;

 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
-import com.bsd.pjcloud.supermarket.entity.SupermarketUnitEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity;
 import com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo;
 import org.apache.ibatis.annotations.Mapper;

 import java.util.List;

@Mapper
-public interface SupermarketUnitMapper extends PjcloudBaseMapper<SupermarketUnitEntity> {
+public interface SmErpUnitMapper extends PjcloudBaseMapper<SmErpUnitEntity> {


    /**
@@ -1,11 +0,0 @@
-package com.bsd.pjcloud.supermarket.mapper;
-
-import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
-import com.bsd.pjcloud.supermarket.entity.SupermarketAuxiliaryCodeEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface SupermarketAuxiliaryCodeMapper extends PjcloudBaseMapper<SupermarketAuxiliaryCodeEntity> {
-
-
-}
@@ -1,11 +0,0 @@
-package com.bsd.pjcloud.supermarket.mapper;
-
-import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
-import com.bsd.pjcloud.supermarket.entity.SupermarketCategoryEntity;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface SupermarketCategoryMapper extends PjcloudBaseMapper<SupermarketCategoryEntity> {
-
-
-}
@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.supermarket.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.supermarket.entity.SmErpAuxiliaryCodeEntity;
+
+public interface SmErpAuxiliaryCodeService extends IService<SmErpAuxiliaryCodeEntity> {
+
+}
@@ -3,9 +3,9 @@ package com.bsd.pjcloud.supermarket.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.bsd.pjcloud.supermarket.entity.SupermarketBrandEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpBrandEntity;

-public interface SupermarketBrandService extends IService<SupermarketBrandEntity> {
+public interface SmErpBrandService extends IService<SmErpBrandEntity> {


    /**
@@ -14,5 +14,5 @@ public interface SupermarketBrandService extends IService<SupermarketBrandEntity
     * @param wrapper
     * @return
     */
-    Object pagescope(Page page, LambdaQueryWrapper<SupermarketBrandEntity> wrapper);
+    Object pagescope(Page page, LambdaQueryWrapper<SmErpBrandEntity> wrapper);
 }
@@ -3,18 +3,18 @@ package com.bsd.pjcloud.supermarket.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.bsd.pjcloud.supermarket.entity.SupermarketCategoryEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpCategoryEntity;

 import java.util.List;

-public interface SupermarketCategoryService extends IService<SupermarketCategoryEntity> {
+public interface SmErpCategoryService extends IService<SmErpCategoryEntity> {


    /**
     * 下拉查询
     * @return
     */
-    List<SupermarketCategoryEntity> listScope();
+    List<SmErpCategoryEntity> listScope();

    /**
     * 分页查询
@@ -22,5 +22,5 @@ public interface SupermarketCategoryService extends IService<SupermarketCategory
     * @param wrapper
     * @return
     */
-    Object pageScope(Page page, LambdaQueryWrapper<SupermarketCategoryEntity> wrapper);
+    Object pageScope(Page page, LambdaQueryWrapper<SmErpCategoryEntity> wrapper);
 }
@@ -6,17 +6,17 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO;
 import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO;
-import com.bsd.pjcloud.supermarket.entity.SupermarketSpuEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity;

 import java.util.ArrayList;

-public interface SupermarketSpuService extends IService<SupermarketSpuEntity> {
+public interface SmErpSpuService extends IService<SmErpSpuEntity> {



-    R saveSpu(SupermarketSpuEntity supermarketSpu);
+    R saveSpu(SmErpSpuEntity supermarketSpu);

-    R updateSpuById(SupermarketSpuEntity supermarketSpu);
+    R updateSpuById(SmErpSpuEntity supermarketSpu);


    Object removeSpuBatchByIds(ArrayList<Long> list);
@@ -36,7 +36,7 @@ public interface SupermarketSpuService extends IService<SupermarketSpuEntity> {
     * @param wrapper
     * @return
     */
-    Object pageScope(Page page, LambdaQueryWrapper<SupermarketSpuEntity> wrapper);
+    Object pageScope(Page page, LambdaQueryWrapper<SmErpSpuEntity> wrapper);

    /**
     * 根据条件查询所有数据，app/收银机接口
@@ -1,9 +1,9 @@
-package com.bsd.pjcloud.supermarketerp.service;
+package com.bsd.pjcloud.supermarket.service;

 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpSupplierEntity;

 import java.util.List;

@@ -1,9 +1,9 @@
-package com.bsd.pjcloud.supermarketerp.service;
+package com.bsd.pjcloud.supermarket.service;

 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierTypeEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpSupplierTypeEntity;

 public interface SmErpSupplierTypeService extends IService<SmErpSupplierTypeEntity> {

@@ -1,12 +1,12 @@
 package com.bsd.pjcloud.supermarket.service;

 import com.baomidou.mybatisplus.extension.service.IService;
-import com.bsd.pjcloud.supermarket.entity.SupermarketUnitEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity;
 import com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo;

 import java.util.List;

-public interface SupermarketUnitService extends IService<SupermarketUnitEntity> {
+public interface SmErpUnitService extends IService<SmErpUnitEntity> {


    /**
@@ -1,8 +0,0 @@
-package com.bsd.pjcloud.supermarket.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.bsd.pjcloud.supermarket.entity.SupermarketAuxiliaryCodeEntity;
-
-public interface SupermarketAuxiliaryCodeService extends IService<SupermarketAuxiliaryCodeEntity> {
-
-}
@@ -0,0 +1,16 @@
+package com.bsd.pjcloud.supermarket.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.supermarket.entity.SmErpAuxiliaryCodeEntity;
+import com.bsd.pjcloud.supermarket.mapper.SmErpAuxiliaryCodeMapper;
+import com.bsd.pjcloud.supermarket.service.SmErpAuxiliaryCodeService;
+import org.springframework.stereotype.Service;
+/**
+ * 商品辅助条码
+ *
+ * @author zjf
+ * @date 2024-12-23 10:15:43
+ */
+@Service
+public class SmErpAuxiliaryCodeServiceImpl extends ServiceImpl<SmErpAuxiliaryCodeMapper, SmErpAuxiliaryCodeEntity> implements SmErpAuxiliaryCodeService {
+}
@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
-import com.bsd.pjcloud.supermarket.entity.SupermarketBrandEntity;
-import com.bsd.pjcloud.supermarket.mapper.SupermarketBrandMapper;
-import com.bsd.pjcloud.supermarket.service.SupermarketBrandService;
+import com.bsd.pjcloud.supermarket.entity.SmErpBrandEntity;
+import com.bsd.pjcloud.supermarket.mapper.SmErpBrandMapper;
+import com.bsd.pjcloud.supermarket.service.SmErpBrandService;
 import org.springframework.stereotype.Service;
 /**
 * 超市品牌
@@ -15,9 +15,9 @@ import org.springframework.stereotype.Service;
 * @date 2024-12-23 10:10:22
 */
@Service
-public class SupermarketBrandServiceImpl extends ServiceImpl<SupermarketBrandMapper, SupermarketBrandEntity> implements SupermarketBrandService {
+public class SmErpBrandServiceImpl extends ServiceImpl<SmErpBrandMapper, SmErpBrandEntity> implements SmErpBrandService {
    @Override
-    public Object pagescope(Page page, LambdaQueryWrapper<SupermarketBrandEntity> wrapper) {
+    public Object pagescope(Page page, LambdaQueryWrapper<SmErpBrandEntity> wrapper) {
        return baseMapper.selectPageByScope(page, wrapper, DataScope.of());
    }
 }
@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
-import com.bsd.pjcloud.supermarket.entity.SupermarketCategoryEntity;
-import com.bsd.pjcloud.supermarket.mapper.SupermarketCategoryMapper;
-import com.bsd.pjcloud.supermarket.service.SupermarketCategoryService;
+import com.bsd.pjcloud.supermarket.entity.SmErpCategoryEntity;
+import com.bsd.pjcloud.supermarket.mapper.SmErpCategoryMapper;
+import com.bsd.pjcloud.supermarket.service.SmErpCategoryService;
 import org.springframework.stereotype.Service;

 import java.util.List;
@@ -18,14 +18,14 @@ import java.util.List;
 * @date 2024-12-24 15:07:07
 */
@Service
-public class SupermarketCategoryServiceImpl extends ServiceImpl<SupermarketCategoryMapper, SupermarketCategoryEntity> implements SupermarketCategoryService {
+public class SmErpCategoryServiceImpl extends ServiceImpl<SmErpCategoryMapper, SmErpCategoryEntity> implements SmErpCategoryService {
    @Override
-    public List<SupermarketCategoryEntity> listScope() {
-        return baseMapper.selectListByScope(new LambdaQueryWrapper<SupermarketCategoryEntity>(), DataScope.of());
+    public List<SmErpCategoryEntity> listScope() {
+        return baseMapper.selectListByScope(new LambdaQueryWrapper<SmErpCategoryEntity>(), DataScope.of());
    }

    @Override
-    public Object pageScope(Page page, LambdaQueryWrapper<SupermarketCategoryEntity> wrapper) {
+    public Object pageScope(Page page, LambdaQueryWrapper<SmErpCategoryEntity> wrapper) {
        return baseMapper.selectPageByScope(page, wrapper, DataScope.of());
    }
 }
@@ -0,0 +1,177 @@
+package com.bsd.pjcloud.supermarket.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.common.core.util.BeanUtils;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO;
+import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO;
+import com.bsd.pjcloud.supermarket.entity.SmErpAuxiliaryCodeEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity;
+import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity;
+import com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper;
+import com.bsd.pjcloud.supermarket.service.SmErpAuxiliaryCodeService;
+import com.bsd.pjcloud.supermarket.service.SmErpSpuService;
+import com.bsd.pjcloud.supermarket.service.SmErpUnitService;
+import com.bsd.pjcloud.supermarket.vo.*;
+import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuDetailsVo;
+import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppUnitVo;
+import lombok.AllArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 商品spu
+ *
+ * @author zjf
+ * @date 2024-12-23 10:42:43
+ */
+@Service
+@AllArgsConstructor
+public class SmErpSpuServiceImpl extends ServiceImpl<SmErpSpuMapper, SmErpSpuEntity> implements SmErpSpuService {
+
+    private final SmErpUnitService smErpUnitService;
+
+    private final SmErpAuxiliaryCodeService smErpAuxiliaryCodeService;
+
+    @Override
+    @Transactional
+    public R saveSpu(SmErpSpuEntity supermarketSpu) {
+
+        baseMapper.insert(supermarketSpu);
+
+        //新增包装类型
+        List<SmErpUnitEntity> smErpUnitEntityList = supermarketSpu.getSmErpUnitEntityList();
+        if (CollectionUtils.isNotEmpty(smErpUnitEntityList)) {
+            smErpUnitEntityList.forEach(supermarketUnitEntity -> supermarketUnitEntity.setSpuId(supermarketSpu.getId()));
+            smErpUnitService.saveBatch(smErpUnitEntityList);
+        } else {
+            return R.failed("包装类型不能为空");
+        }
+        //辅助条码
+        List<SmErpAuxiliaryCodeEntity> smErpAuxiliaryCodeEntityList = supermarketSpu.getSmErpAuxiliaryCodeEntityList();
+        if (CollectionUtils.isNotEmpty(smErpAuxiliaryCodeEntityList)) {
+            smErpAuxiliaryCodeEntityList.forEach(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId()));
+            smErpAuxiliaryCodeService.saveBatch(smErpAuxiliaryCodeEntityList);
+        } else {
+            return R.failed("辅助条码不能为空");
+        }
+
+        return R.ok();
+    }
+
+    @Override
+    @Transactional
+    public R updateSpuById(SmErpSpuEntity supermarketSpu) {
+        baseMapper.updateById(supermarketSpu);
+
+        //新增包装类型
+        List<SmErpUnitEntity> smErpUnitEntityList = supermarketSpu.getSmErpUnitEntityList();
+        if (CollectionUtils.isNotEmpty(smErpUnitEntityList)) {
+            //id为null新增
+            List<SmErpUnitEntity> insertCollect = smErpUnitEntityList.stream()
+                    .filter(supermarketUnitEntity -> supermarketUnitEntity.getId() == null).collect(Collectors.toList());
+            insertCollect.forEach(supermarketUnitEntity -> supermarketUnitEntity.setSpuId(supermarketSpu.getId()));
+            List<SmErpUnitEntity> updateCollect = smErpUnitEntityList.stream()
+                    .filter(supermarketUnitEntity -> supermarketUnitEntity.getId() != null).collect(Collectors.toList());
+            smErpUnitService.updateBatchById(updateCollect);
+            smErpUnitService.saveBatch(insertCollect);
+        } else {
+            return R.failed("包装类型不能为空");
+        }
+        //辅助条码
+        List<SmErpAuxiliaryCodeEntity> smErpAuxiliaryCodeEntityList = supermarketSpu.getSmErpAuxiliaryCodeEntityList();
+        if (CollectionUtils.isNotEmpty(smErpAuxiliaryCodeEntityList)) {
+            List<SmErpAuxiliaryCodeEntity> insertCollect = smErpAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() == null).collect(Collectors.toList());
+            List<SmErpAuxiliaryCodeEntity> updateCollect = smErpAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() != null).collect(Collectors.toList());
+            insertCollect.stream().forEach(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId()));
+            smErpAuxiliaryCodeService.saveBatch(insertCollect);
+            smErpAuxiliaryCodeService.updateBatchById(updateCollect);
+        } else {
+            return R.failed("辅助条码不能为空");
+        }
+        return R.ok();
+    }
+
+    @Override
+    public Object removeSpuBatchByIds(ArrayList<Long> list) {
+
+        baseMapper.deleteByIds(list);
+
+        //删除
+        list.forEach(id -> {
+            LambdaQueryWrapper<SmErpAuxiliaryCodeEntity> supermarketAuxiliaryCodeEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            supermarketAuxiliaryCodeEntityLambdaQueryWrapper.eq(SmErpAuxiliaryCodeEntity::getSpuId, id);
+            LambdaQueryWrapper<SmErpUnitEntity> supermarketUnitEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            supermarketUnitEntityLambdaQueryWrapper.eq(SmErpUnitEntity::getSpuId, id);
+            smErpUnitService.remove(supermarketUnitEntityLambdaQueryWrapper);
+            smErpAuxiliaryCodeService.remove(supermarketAuxiliaryCodeEntityLambdaQueryWrapper);
+        });
+
+        return R.ok();
+    }
+
+    @Override
+    @Transactional
+    public R updateSpuStock(SupermarketSpuUpdateStockReqDTO updateStockReqDTO) {
+        for (SupermarketSpuUpdateStockReqDTO.Item v : updateStockReqDTO.getItems()) {
+            // 查询当前库存
+            SmErpSpuEntity spu = baseMapper.selectById(v.getId());
+            if (spu == null) {
+                return R.failed(spu.getProductName() + "商品不存在");
+            }
+            // 检查库存是否足够
+            if (v.getIncrCount() < 0 && Math.abs(v.getIncrCount()) > spu.getStock()) {
+                return R.failed(spu.getProductName() + "库存不足，无法完成操作");
+            }
+            int i = baseMapper.updateStock(v.getId(), v.getIncrCount());
+        }
+        return R.ok();
+    }
+
+    @Override
+    public Object pageScope(Page page, LambdaQueryWrapper<SmErpSpuEntity> wrapper) {
+        return baseMapper.selectPageByScope(page, wrapper, DataScope.of());
+    }
+
+    @Override
+    public Object selectListAllScope(SupermarketSpuQueryDTO supermarketSpuQueryDTO) {
+
+        List<SmErpSpuEntity> list = baseMapper.selectListAllScope(supermarketSpuQueryDTO, DataScope.of());
+        List<SupermarketSpuVo> bean = BeanUtils.toBean(list, SupermarketSpuVo.class);
+        return bean;
+
+
+    }
+
+    @Override
+    public Object getSupermarketSpuDetailById(Long id) {
+        SmErpSpuEntity smErpSpuEntity = baseMapper.selectById(id);
+        List<SmErpUnitEntity> smErpUnitEntityList = smErpUnitService.list(new LambdaQueryWrapper<SmErpUnitEntity>().eq(SmErpUnitEntity::getSpuId, id));
+        List<SmErpAuxiliaryCodeEntity> supermarketAuxiliaryCodeEntities = smErpAuxiliaryCodeService.list(new LambdaQueryWrapper<SmErpAuxiliaryCodeEntity>().eq(SmErpAuxiliaryCodeEntity::getSpuId, id));
+        SupermarketSpuVo supermarketSpuVo = BeanUtils.toBean(smErpSpuEntity, SupermarketSpuVo.class);
+        List<SupermarketUnitVo> supermarketUnitVoList = BeanUtils.toBean(smErpUnitEntityList, SupermarketUnitVo.class);
+        List<SupermarketAuxiliaryCodeVo> supermarketAuxiliaryCodeVos = BeanUtils.toBean(supermarketAuxiliaryCodeEntities, SupermarketAuxiliaryCodeVo.class);
+        supermarketSpuVo.setSupermarketUnitEntityList(supermarketUnitVoList);
+        supermarketSpuVo.setSupermarketAuxiliaryCodeEntityList(supermarketAuxiliaryCodeVos);
+        return supermarketSpuVo;
+    }
+
+    @Override
+    public Object getSupermarketSpuAppDetailById(Long id) {
+        SmErpSpuEntity smErpSpuEntity = baseMapper.selectById(id);
+        List<SmErpUnitEntity> smErpUnitEntityList = smErpUnitService.list(new LambdaQueryWrapper<SmErpUnitEntity>().eq(SmErpUnitEntity::getSpuId, id));
+        List<SmErpUnitEntity> unitEntities = smErpUnitEntityList.stream().filter(supermarketUnitEntity -> supermarketUnitEntity.getStatus() == 0).collect(Collectors.toList());
+        SupermarketAppSpuDetailsVo supermarketAppSpuVo = BeanUtils.toBean(smErpSpuEntity, SupermarketAppSpuDetailsVo.class);
+        List<SupermarketAppUnitVo> supermarketAppUnitVos = BeanUtils.toBean(unitEntities, SupermarketAppUnitVo.class);
+        supermarketAppSpuVo.setSkuList(supermarketAppUnitVos);
+        return supermarketAppSpuVo;
+    }
+}
@@ -1,12 +1,12 @@
-package com.bsd.pjcloud.supermarketerp.service.impl;
+package com.bsd.pjcloud.supermarket.service.impl;

 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
-import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity;
-import com.bsd.pjcloud.supermarketerp.mapper.SmErpSupplierMapper;
-import com.bsd.pjcloud.supermarketerp.service.SmErpSupplierService;
+import com.bsd.pjcloud.supermarket.entity.SmErpSupplierEntity;
+import com.bsd.pjcloud.supermarket.mapper.SmErpSupplierMapper;
+import com.bsd.pjcloud.supermarket.service.SmErpSupplierService;
 import org.springframework.stereotype.Service;

 import java.util.List;
@@ -1,12 +1,12 @@
-package com.bsd.pjcloud.supermarketerp.service.impl;
+package com.bsd.pjcloud.supermarket.service.impl;

 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
-import com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierTypeEntity;
-import com.bsd.pjcloud.supermarketerp.mapper.SmErpSupplierTypeMapper;
-import com.bsd.pjcloud.supermarketerp.service.SmErpSupplierTypeService;
+import com.bsd.pjcloud.supermarket.entity.SmErpSupplierTypeEntity;
+import com.bsd.pjcloud.supermarket.mapper.SmErpSupplierTypeMapper;
+import com.bsd.pjcloud.supermarket.service.SmErpSupplierTypeService;
 import org.springframework.stereotype.Service;
 /**
 * 货商类别
@@ -1,9 +1,9 @@
 package com.bsd.pjcloud.supermarket.service.impl;

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.bsd.pjcloud.supermarket.entity.SupermarketUnitEntity;
-import com.bsd.pjcloud.supermarket.mapper.SupermarketUnitMapper;
-import com.bsd.pjcloud.supermarket.service.SupermarketUnitService;
+import com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity;
+import com.bsd.pjcloud.supermarket.mapper.SmErpUnitMapper;
+import com.bsd.pjcloud.supermarket.service.SmErpUnitService;
 import com.bsd.pjcloud.supermarket.vo.SupermarketUnitWithSpuVo;
 import org.springframework.stereotype.Service;

@@ -16,7 +16,7 @@ import java.util.List;
 * @date 2024-12-26 11:06:54
 */
@Service
-public class SupermarketUnitServiceImpl extends ServiceImpl<SupermarketUnitMapper, SupermarketUnitEntity> implements SupermarketUnitService {
+public class SmErpUnitServiceImpl extends ServiceImpl<SmErpUnitMapper, SmErpUnitEntity> implements SmErpUnitService {
    @Override
    public List<SupermarketUnitWithSpuVo> getSupermarketUnitsWithSpu(List<Long> ids) {

@@ -1,16 +0,0 @@
-package com.bsd.pjcloud.supermarket.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.bsd.pjcloud.supermarket.entity.SupermarketAuxiliaryCodeEntity;
-import com.bsd.pjcloud.supermarket.mapper.SupermarketAuxiliaryCodeMapper;
-import com.bsd.pjcloud.supermarket.service.SupermarketAuxiliaryCodeService;
-import org.springframework.stereotype.Service;
-/**
- * 商品辅助条码
- *
- * @author zjf
- * @date 2024-12-23 10:15:43
- */
-@Service
-public class SupermarketAuxiliaryCodeServiceImpl extends ServiceImpl<SupermarketAuxiliaryCodeMapper, SupermarketAuxiliaryCodeEntity> implements SupermarketAuxiliaryCodeService {
-}
@@ -1,178 +0,0 @@
-package com.bsd.pjcloud.supermarket.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.bsd.pjcloud.common.core.util.BeanUtils;
-import com.bsd.pjcloud.common.core.util.R;
-import com.bsd.pjcloud.common.data.datascope.DataScope;
-import com.bsd.pjcloud.supermarket.dto.SupermarketSpuQueryDTO;
-import com.bsd.pjcloud.supermarket.dto.SupermarketSpuUpdateStockReqDTO;
-import com.bsd.pjcloud.supermarket.entity.SupermarketAuxiliaryCodeEntity;
-import com.bsd.pjcloud.supermarket.entity.SupermarketSpuEntity;
-import com.bsd.pjcloud.supermarket.entity.SupermarketUnitEntity;
-import com.bsd.pjcloud.supermarket.mapper.SupermarketSpuMapper;
-import com.bsd.pjcloud.supermarket.service.SupermarketAuxiliaryCodeService;
-import com.bsd.pjcloud.supermarket.service.SupermarketSpuService;
-import com.bsd.pjcloud.supermarket.service.SupermarketUnitService;
-import com.bsd.pjcloud.supermarket.vo.*;
-import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuDetailsVo;
-import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo;
-import com.bsd.pjcloud.supermarket.vo.app.SupermarketAppUnitVo;
-import lombok.AllArgsConstructor;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 商品spu
- *
- * @author zjf
- * @date 2024-12-23 10:42:43
- */
-@Service
-@AllArgsConstructor
-public class SupermarketSpuServiceImpl extends ServiceImpl<SupermarketSpuMapper, SupermarketSpuEntity> implements SupermarketSpuService {
-
-    private final SupermarketUnitService supermarketUnitService;
-
-    private final SupermarketAuxiliaryCodeService supermarketAuxiliaryCodeService;
-
-    @Override
-    @Transactional
-    public R saveSpu(SupermarketSpuEntity supermarketSpu) {
-
-        baseMapper.insert(supermarketSpu);
-
-        //新增包装类型
-        List<SupermarketUnitEntity> supermarketUnitEntityList = supermarketSpu.getSupermarketUnitEntityList();
-        if (CollectionUtils.isNotEmpty(supermarketUnitEntityList)) {
-            supermarketUnitEntityList.forEach(supermarketUnitEntity -> supermarketUnitEntity.setSpuId(supermarketSpu.getId()));
-            supermarketUnitService.saveBatch(supermarketUnitEntityList);
-        } else {
-            return R.failed("包装类型不能为空");
-        }
-        //辅助条码
-        List<SupermarketAuxiliaryCodeEntity> supermarketAuxiliaryCodeEntityList = supermarketSpu.getSupermarketAuxiliaryCodeEntityList();
-        if (CollectionUtils.isNotEmpty(supermarketAuxiliaryCodeEntityList)) {
-            supermarketAuxiliaryCodeEntityList.forEach(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId()));
-            supermarketAuxiliaryCodeService.saveBatch(supermarketAuxiliaryCodeEntityList);
-        } else {
-            return R.failed("辅助条码不能为空");
-        }
-
-        return R.ok();
-    }
-
-    @Override
-    @Transactional
-    public R updateSpuById(SupermarketSpuEntity supermarketSpu) {
-        baseMapper.updateById(supermarketSpu);
-
-        //新增包装类型
-        List<SupermarketUnitEntity> supermarketUnitEntityList = supermarketSpu.getSupermarketUnitEntityList();
-        if (CollectionUtils.isNotEmpty(supermarketUnitEntityList)) {
-            //id为null新增
-            List<SupermarketUnitEntity> insertCollect = supermarketUnitEntityList.stream()
-                    .filter(supermarketUnitEntity -> supermarketUnitEntity.getId() == null).collect(Collectors.toList());
-            insertCollect.forEach(supermarketUnitEntity -> supermarketUnitEntity.setSpuId(supermarketSpu.getId()));
-            List<SupermarketUnitEntity> updateCollect = supermarketUnitEntityList.stream()
-                    .filter(supermarketUnitEntity -> supermarketUnitEntity.getId() != null).collect(Collectors.toList());
-            supermarketUnitService.updateBatchById(updateCollect);
-            supermarketUnitService.saveBatch(insertCollect);
-        } else {
-            return R.failed("包装类型不能为空");
-        }
-        //辅助条码
-        List<SupermarketAuxiliaryCodeEntity> supermarketAuxiliaryCodeEntityList = supermarketSpu.getSupermarketAuxiliaryCodeEntityList();
-        if (CollectionUtils.isNotEmpty(supermarketAuxiliaryCodeEntityList)) {
-            List<SupermarketAuxiliaryCodeEntity> insertCollect = supermarketAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() == null).collect(Collectors.toList());
-            List<SupermarketAuxiliaryCodeEntity> updateCollect = supermarketAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() != null).collect(Collectors.toList());
-            insertCollect.stream().forEach(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.setSpuId(supermarketSpu.getId()));
-            supermarketAuxiliaryCodeService.saveBatch(insertCollect);
-            supermarketAuxiliaryCodeService.updateBatchById(updateCollect);
-        } else {
-            return R.failed("辅助条码不能为空");
-        }
-        return R.ok();
-    }
-
-    @Override
-    public Object removeSpuBatchByIds(ArrayList<Long> list) {
-
-        baseMapper.deleteByIds(list);
-
-        //删除
-        list.forEach(id -> {
-            LambdaQueryWrapper<SupermarketAuxiliaryCodeEntity> supermarketAuxiliaryCodeEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            supermarketAuxiliaryCodeEntityLambdaQueryWrapper.eq(SupermarketAuxiliaryCodeEntity::getSpuId, id);
-            LambdaQueryWrapper<SupermarketUnitEntity> supermarketUnitEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            supermarketUnitEntityLambdaQueryWrapper.eq(SupermarketUnitEntity::getSpuId, id);
-            supermarketUnitService.remove(supermarketUnitEntityLambdaQueryWrapper);
-            supermarketAuxiliaryCodeService.remove(supermarketAuxiliaryCodeEntityLambdaQueryWrapper);
-        });
-
-        return R.ok();
-    }
-
-    @Override
-    @Transactional
-    public R updateSpuStock(SupermarketSpuUpdateStockReqDTO updateStockReqDTO) {
-        for (SupermarketSpuUpdateStockReqDTO.Item v : updateStockReqDTO.getItems()) {
-            // 查询当前库存
-            SupermarketSpuEntity spu = baseMapper.selectById(v.getId());
-            if (spu == null) {
-                return R.failed(spu.getProductName() + "商品不存在");
-            }
-            // 检查库存是否足够
-            if (v.getIncrCount() < 0 && Math.abs(v.getIncrCount()) > spu.getStock()) {
-                return R.failed(spu.getProductName() + "库存不足，无法完成操作");
-            }
-            int i = baseMapper.updateStock(v.getId(), v.getIncrCount());
-        }
-        return R.ok();
-    }
-
-    @Override
-    public Object pageScope(Page page, LambdaQueryWrapper<SupermarketSpuEntity> wrapper) {
-        return baseMapper.selectPageByScope(page, wrapper, DataScope.of());
-    }
-
-    @Override
-    public Object selectListAllScope(SupermarketSpuQueryDTO supermarketSpuQueryDTO) {
-
-        List<SupermarketSpuEntity> list = baseMapper.selectListAllScope(supermarketSpuQueryDTO, DataScope.of());
-        List<SupermarketSpuVo> bean = BeanUtils.toBean(list, SupermarketSpuVo.class);
-        return bean;
-
-
-    }
-
-    @Override
-    public Object getSupermarketSpuDetailById(Long id) {
-        SupermarketSpuEntity supermarketSpuEntity = baseMapper.selectById(id);
-        List<SupermarketUnitEntity> supermarketUnitEntityList = supermarketUnitService.list(new LambdaQueryWrapper<SupermarketUnitEntity>().eq(SupermarketUnitEntity::getSpuId, id));
-        List<SupermarketAuxiliaryCodeEntity> supermarketAuxiliaryCodeEntities = supermarketAuxiliaryCodeService.list(new LambdaQueryWrapper<SupermarketAuxiliaryCodeEntity>().eq(SupermarketAuxiliaryCodeEntity::getSpuId, id));
-        SupermarketSpuVo supermarketSpuVo = BeanUtils.toBean(supermarketSpuEntity, SupermarketSpuVo.class);
-        List<SupermarketUnitVo> supermarketUnitVoList = BeanUtils.toBean(supermarketUnitEntityList, SupermarketUnitVo.class);
-        List<SupermarketAuxiliaryCodeVo> supermarketAuxiliaryCodeVos = BeanUtils.toBean(supermarketAuxiliaryCodeEntities, SupermarketAuxiliaryCodeVo.class);
-        supermarketSpuVo.setSupermarketUnitEntityList(supermarketUnitVoList);
-        supermarketSpuVo.setSupermarketAuxiliaryCodeEntityList(supermarketAuxiliaryCodeVos);
-        return supermarketSpuVo;
-    }
-
-    @Override
-    public Object getSupermarketSpuAppDetailById(Long id) {
-        SupermarketSpuEntity supermarketSpuEntity = baseMapper.selectById(id);
-        List<SupermarketUnitEntity> supermarketUnitEntityList = supermarketUnitService.list(new LambdaQueryWrapper<SupermarketUnitEntity>().eq(SupermarketUnitEntity::getSpuId, id));
-        List<SupermarketUnitEntity> unitEntities = supermarketUnitEntityList.stream().filter(supermarketUnitEntity -> supermarketUnitEntity.getStatus() == 0).collect(Collectors.toList());
-        SupermarketAppSpuDetailsVo supermarketAppSpuVo = BeanUtils.toBean(supermarketSpuEntity, SupermarketAppSpuDetailsVo.class);
-        List<SupermarketAppUnitVo> supermarketAppUnitVos = BeanUtils.toBean(unitEntities, SupermarketAppUnitVo.class);
-        supermarketAppSpuVo.setSkuList(supermarketAppUnitVos);
-        return supermarketAppSpuVo;
-    }
-}
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

-<mapper namespace="com.bsd.pjcloud.supermarket.mapper.SupermarketAuxiliaryCodeMapper">
+<mapper namespace="com.bsd.pjcloud.supermarket.mapper.SmErpAuxiliaryCodeMapper">

-  <resultMap id="supermarketAuxiliaryCodeMap" type="com.bsd.pjcloud.supermarket.entity.SupermarketAuxiliaryCodeEntity">
+  <resultMap id="supermarketAuxiliaryCodeMap" type="com.bsd.pjcloud.supermarket.entity.SmErpAuxiliaryCodeEntity">
        <id property="id" column="id"/>
        <result property="barCode" column="bar_code"/>
        <result property="spuId" column="spu_id"/>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

-<mapper namespace="com.bsd.pjcloud.supermarket.mapper.SupermarketBrandMapper">
+<mapper namespace="com.bsd.pjcloud.supermarket.mapper.SmErpBrandMapper">

-  <resultMap id="supermarketBrandMap" type="com.bsd.pjcloud.supermarket.entity.SupermarketBrandEntity">
+  <resultMap id="supermarketBrandMap" type="com.bsd.pjcloud.supermarket.entity.SmErpBrandEntity">
        <id property="id" column="id"/>
        <result property="name" column="name"/>
        <result property="picUrl" column="pic_url"/>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

-<mapper namespace="com.bsd.pjcloud.supermarket.mapper.SupermarketCategoryMapper">
+<mapper namespace="com.bsd.pjcloud.supermarket.mapper.SmErpCategoryMapper">

-  <resultMap id="supermarketCategoryMap" type="com.bsd.pjcloud.supermarket.entity.SupermarketCategoryEntity">
+  <resultMap id="supermarketCategoryMap" type="com.bsd.pjcloud.supermarket.entity.SmErpCategoryEntity">
        <id property="id" column="id"/>
        <result property="parentId" column="parent_id"/>
        <result property="name" column="name"/>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

-<mapper namespace="com.bsd.pjcloud.supermarket.mapper.SupermarketSpuMapper">
+<mapper namespace="com.bsd.pjcloud.supermarket.mapper.SmErpSpuMapper">

-  <resultMap id="supermarketSpuMap" type="com.bsd.pjcloud.supermarket.entity.SupermarketSpuEntity">
+  <resultMap id="supermarketSpuMap" type="com.bsd.pjcloud.supermarket.entity.SmErpSpuEntity">
        <id property="id" column="id"/>
        <result property="productCode" column="product_code"/>
        <result property="barcode" column="barcode"/>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

-<mapper namespace="com.bsd.pjcloud.supermarketerp.mapper.SmErpSupplierMapper">
+<mapper namespace="com.bsd.pjcloud.supermarket.mapper.SmErpSupplierMapper">

-  <resultMap id="smErpSupplierMap" type="com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierEntity">
+  <resultMap id="smErpSupplierMap" type="com.bsd.pjcloud.supermarket.entity.SmErpSupplierEntity">
        <id property="supplierId" column="supplier_id"/>
        <result property="supplierName" column="supplier_name"/>
        <result property="address" column="address"/>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

-<mapper namespace="com.bsd.pjcloud.supermarketerp.mapper.SmErpSupplierTypeMapper">
+<mapper namespace="com.bsd.pjcloud.supermarket.mapper.SmErpSupplierTypeMapper">

-  <resultMap id="smErpSupplierTypeMap" type="com.bsd.pjcloud.supermarketerp.entity.SmErpSupplierTypeEntity">
+  <resultMap id="smErpSupplierTypeMap" type="com.bsd.pjcloud.supermarket.entity.SmErpSupplierTypeEntity">
        <id property="id" column="id"/>
        <result property="typeName" column="type_name"/>
        <result property="typePic" column="type_pic"/>
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

-<mapper namespace="com.bsd.pjcloud.supermarket.mapper.SupermarketUnitMapper">
+<mapper namespace="com.bsd.pjcloud.supermarket.mapper.SmErpUnitMapper">

-  <resultMap id="supermarketUnitMap" type="com.bsd.pjcloud.supermarket.entity.SupermarketUnitEntity">
+  <resultMap id="supermarketUnitMap" type="com.bsd.pjcloud.supermarket.entity.SmErpUnitEntity">
        <id property="id" column="id"/>
        <result property="barCode" column="bar_code"/>
        <result property="spec" column="spec"/>
@@ -119,7 +119,7 @@
        <module>pjcloud-app-server</module>
        <module>pjcloud-thirdparty</module>
        <module>pjcloud-canteen</module>
-        <module>pjcloud-supermarket-erp</module>
+<!--        <module>pjcloud-supermarket-erp</module>-->
        <module>pjcloud-wallet</module>
        <module>pjcloud-supermarket</module>
        <module>pjcloud-hardware</module>