diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java index 1dde2858f..c42adbcd6 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java @@ -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; diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketAuxiliaryCodeEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpAuxiliaryCodeEntity.java similarity index 92% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketAuxiliaryCodeEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpAuxiliaryCodeEntity.java index 7f64f7c33..8b9f1fbe3 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketAuxiliaryCodeEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpAuxiliaryCodeEntity.java @@ -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 { +public class SmErpAuxiliaryCodeEntity extends Model { /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketBrandEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpBrandEntity.java similarity index 94% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketBrandEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpBrandEntity.java index ad95a335d..fff4d26bb 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketBrandEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpBrandEntity.java @@ -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 { +public class SmErpBrandEntity extends Model { /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketCategoryEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCategoryEntity.java similarity index 94% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketCategoryEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCategoryEntity.java index 5a674ee93..1c76e1df3 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketCategoryEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpCategoryEntity.java @@ -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 { +public class SmErpCategoryEntity extends Model { /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketSpuEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSpuEntity.java similarity index 96% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketSpuEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSpuEntity.java index e283e7f17..e68a91553 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketSpuEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSpuEntity.java @@ -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 { +public class SmErpSpuEntity extends Model { /** @@ -325,10 +325,10 @@ public class SupermarketSpuEntity extends Model { @Schema(description = "辅助条码集合对象") @TableField(exist = false) - private List supermarketAuxiliaryCodeEntityList; + private List smErpAuxiliaryCodeEntityList; @Schema(description = "包装对象集合对象") @TableField(exist = false) - private List supermarketUnitEntityList; + private List smErpUnitEntityList; } \ No newline at end of file diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/entity/SmErpSupplierEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSupplierEntity.java similarity index 98% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/entity/SmErpSupplierEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSupplierEntity.java index 69ae10580..20db6a875 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/entity/SmErpSupplierEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSupplierEntity.java @@ -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; diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/entity/SmErpSupplierTypeEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSupplierTypeEntity.java similarity index 97% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/entity/SmErpSupplierTypeEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSupplierTypeEntity.java index 7e52a5496..9e9e4eaac 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/entity/SmErpSupplierTypeEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpSupplierTypeEntity.java @@ -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; diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketUnitEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpUnitEntity.java similarity index 96% rename from pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketUnitEntity.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpUnitEntity.java index 7ac0f37a3..5d345750a 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SupermarketUnitEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpUnitEntity.java @@ -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 { +public class SmErpUnitEntity extends Model { /** diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/vo/SmErpSupplierSimpleVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SmErpSupplierSimpleVo.java similarity index 91% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/vo/SmErpSupplierSimpleVo.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SmErpSupplierSimpleVo.java index 778017178..187ccb3c6 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/vo/SmErpSupplierSimpleVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SmErpSupplierSimpleVo.java @@ -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; diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/vo/SmErpSupplierTypeSimpleVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SmErpSupplierTypeSimpleVo.java similarity index 91% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/vo/SmErpSupplierTypeSimpleVo.java rename to pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SmErpSupplierTypeSimpleVo.java index bd68bf870..574d71645 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/vo/SmErpSupplierTypeSimpleVo.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SmErpSupplierTypeSimpleVo.java @@ -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; diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketAuxiliaryCodeController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpAuxiliaryCodeController.java similarity index 71% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketAuxiliaryCodeController.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpAuxiliaryCodeController.java index 9c6da36d7..420ac5a8d 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketAuxiliaryCodeController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpAuxiliaryCodeController.java @@ -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 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 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 export(SupermarketAuxiliaryCodeEntity supermarketAuxiliaryCode,Long[] ids) { - return supermarketAuxiliaryCodeService.list(Wrappers.lambdaQuery(supermarketAuxiliaryCode).in(ArrayUtil.isNotEmpty(ids), SupermarketAuxiliaryCodeEntity::getId, ids)); + public List export(SmErpAuxiliaryCodeEntity supermarketAuxiliaryCode, Long[] ids) { + return smErpAuxiliaryCodeService.list(Wrappers.lambdaQuery(supermarketAuxiliaryCode).in(ArrayUtil.isNotEmpty(ids), SmErpAuxiliaryCodeEntity::getId, ids)); } } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketBrandController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpBrandController.java similarity index 74% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketBrandController.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpBrandController.java index 6b4296664..54080513e 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketBrandController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpBrandController.java @@ -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 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 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 export(SupermarketBrandEntity supermarketBrand,Long[] ids) { - return supermarketBrandService.list(Wrappers.lambdaQuery(supermarketBrand).in(ArrayUtil.isNotEmpty(ids), SupermarketBrandEntity::getId, ids)); + public List 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 list = supermarketBrandService.list(); + List list = smErpBrandService.list(); List bean = BeanUtils.toBean(list, SupermarketBrandSimpleVo.class); return R.ok(bean); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketCategoryController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java similarity index 73% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketCategoryController.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java index 79ca40405..5bda02e99 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketCategoryController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCategoryController.java @@ -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 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 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 export(SupermarketCategoryEntity supermarketCategory,Long[] ids) { - return supermarketCategoryService.list(Wrappers.lambdaQuery(supermarketCategory).in(ArrayUtil.isNotEmpty(ids), SupermarketCategoryEntity::getId, ids)); + public List 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 list = supermarketCategoryService.listScope(); + List list = smErpCategoryService.listScope(); List 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 list = supermarketCategoryService. - list(new LambdaQueryWrapper().eq(SupermarketCategoryEntity::getMerchantId, merchantId)); + List list = smErpCategoryService. + list(new LambdaQueryWrapper().eq(SmErpCategoryEntity::getMerchantId, merchantId)); List bean = BeanUtils.toBean(list, SupermarketCategorySimpleVo.class); return R.ok(bean); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java similarity index 69% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java index 448c10e1c..1394c0d0a 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java @@ -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 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 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 list = supermarketUnitService.list(new LambdaQueryWrapper().eq(SupermarketUnitEntity::getSpuId, id)); - supermarketSpuEntity.setSupermarketUnitEntityList(list); - supermarketSpuEntity.setSupermarketAuxiliaryCodeEntityList( - supermarketAuxiliaryCodeService.list(new LambdaQueryWrapper().eq(SupermarketAuxiliaryCodeEntity::getSpuId, id)) + SmErpSpuEntity smErpSpuEntity = smErpSpuService.getById(id); + List list = smErpUnitService.list(new LambdaQueryWrapper().eq(SmErpUnitEntity::getSpuId, id)); + smErpSpuEntity.setSmErpUnitEntityList(list); + smErpSpuEntity.setSmErpAuxiliaryCodeEntityList( + smErpAuxiliaryCodeService.list(new LambdaQueryWrapper().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 export(SupermarketSpuEntity supermarketSpu,Long[] ids) { - return supermarketSpuService.list(Wrappers.lambdaQuery(supermarketSpu).in(ArrayUtil.isNotEmpty(ids), SupermarketSpuEntity::getId, ids)); + public List 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 wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(supermarketSpuQueryDTO.getMerchantId() != null, SupermarketSpuEntity::getMerchantId, supermarketSpuQueryDTO.getMerchantId()); - wrapper.eq(supermarketSpuQueryDTO.getCategoryId() != null, SupermarketSpuEntity::getCategoryId, supermarketSpuQueryDTO.getCategoryId()); + LambdaQueryWrapper 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 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("商品不存在"); } diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierController.java similarity index 94% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierController.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierController.java index 830a90f5f..cc9d76b11 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierController.java @@ -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; /** * 分页查询 diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierTypeController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java similarity index 93% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierTypeController.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java index 69fe4758b..aa796380e 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierTypeController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java @@ -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; /** * 分页查询 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketUnitController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpUnitController.java similarity index 72% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketUnitController.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpUnitController.java index 09525fec1..055f9926a 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketUnitController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpUnitController.java @@ -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 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 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 export(SupermarketUnitEntity supermarketUnit,Long[] ids) { - return supermarketUnitService.list(Wrappers.lambdaQuery(supermarketUnit).in(ArrayUtil.isNotEmpty(ids), SupermarketUnitEntity::getId, ids)); + public List 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 ids) { - return R.ok(supermarketUnitService.getSupermarketUnitsWithSpu(ids)); + return R.ok(smErpUnitService.getSupermarketUnitsWithSpu(ids)); } } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpAuxiliaryCodeMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpAuxiliaryCodeMapper.java new file mode 100644 index 000000000..7bc4ae31c --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpAuxiliaryCodeMapper.java @@ -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 { + + +} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketBrandMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpBrandMapper.java similarity index 50% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketBrandMapper.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpBrandMapper.java index adb9821c0..f879f2a4e 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketBrandMapper.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpBrandMapper.java @@ -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 { +public interface SmErpBrandMapper extends PjcloudBaseMapper { } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpCategoryMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpCategoryMapper.java new file mode 100644 index 000000000..27b47bfbf --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpCategoryMapper.java @@ -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 { + + +} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketSpuMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSpuMapper.java similarity index 71% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketSpuMapper.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSpuMapper.java index af537e8f6..4d27c3626 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketSpuMapper.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSpuMapper.java @@ -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 { +public interface SmErpSpuMapper extends PjcloudBaseMapper { /** @@ -32,12 +32,12 @@ public interface SupermarketSpuMapper extends PjcloudBaseMapper updateWrapper = new LambdaUpdateWrapper() + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper() .setSql(sql) - .eq(SupermarketSpuEntity::getId, id); + .eq(SmErpSpuEntity::getId, id); return update(null, updateWrapper); } - List selectListAllScope(@Param("supermarketSpuQueryDTO") SupermarketSpuQueryDTO supermarketSpuQueryDTO + List selectListAllScope(@Param("supermarketSpuQueryDTO") SupermarketSpuQueryDTO supermarketSpuQueryDTO , DataScope dataScope); } \ No newline at end of file diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/mapper/SmErpSupplierMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSupplierMapper.java similarity index 64% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/mapper/SmErpSupplierMapper.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSupplierMapper.java index b0bc42748..9a1d823ce 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/mapper/SmErpSupplierMapper.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSupplierMapper.java @@ -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 diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/mapper/SmErpSupplierTypeMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSupplierTypeMapper.java similarity index 64% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/mapper/SmErpSupplierTypeMapper.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSupplierTypeMapper.java index b90adfe78..6917c5c19 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/mapper/SmErpSupplierTypeMapper.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpSupplierTypeMapper.java @@ -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 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketUnitMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpUnitMapper.java similarity index 73% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketUnitMapper.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpUnitMapper.java index 485e90989..48fe2d8c7 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketUnitMapper.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SmErpUnitMapper.java @@ -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 { +public interface SmErpUnitMapper extends PjcloudBaseMapper { /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketAuxiliaryCodeMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketAuxiliaryCodeMapper.java deleted file mode 100644 index e3078e505..000000000 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketAuxiliaryCodeMapper.java +++ /dev/null @@ -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 { - - -} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketCategoryMapper.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketCategoryMapper.java deleted file mode 100644 index f1710df9e..000000000 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/mapper/SupermarketCategoryMapper.java +++ /dev/null @@ -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 { - - -} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpAuxiliaryCodeService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpAuxiliaryCodeService.java new file mode 100644 index 000000000..9e3f07e7d --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpAuxiliaryCodeService.java @@ -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 { + +} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketBrandService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpBrandService.java similarity index 59% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketBrandService.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpBrandService.java index 3058027dd..23f123ed8 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketBrandService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpBrandService.java @@ -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 { +public interface SmErpBrandService extends IService { /** @@ -14,5 +14,5 @@ public interface SupermarketBrandService extends IService wrapper); + Object pagescope(Page page, LambdaQueryWrapper wrapper); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketCategoryService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpCategoryService.java similarity index 58% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketCategoryService.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpCategoryService.java index 1afe0b3bc..c557ff49b 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketCategoryService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpCategoryService.java @@ -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 { +public interface SmErpCategoryService extends IService { /** * 下拉查询 * @return */ - List listScope(); + List listScope(); /** * 分页查询 @@ -22,5 +22,5 @@ public interface SupermarketCategoryService extends IService wrapper); + Object pageScope(Page page, LambdaQueryWrapper wrapper); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java similarity index 78% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketSpuService.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java index 9ab9898cd..231deb0db 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java @@ -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 { +public interface SmErpSpuService extends IService { - R saveSpu(SupermarketSpuEntity supermarketSpu); + R saveSpu(SmErpSpuEntity supermarketSpu); - R updateSpuById(SupermarketSpuEntity supermarketSpu); + R updateSpuById(SmErpSpuEntity supermarketSpu); Object removeSpuBatchByIds(ArrayList list); @@ -36,7 +36,7 @@ public interface SupermarketSpuService extends IService { * @param wrapper * @return */ - Object pageScope(Page page, LambdaQueryWrapper wrapper); + Object pageScope(Page page, LambdaQueryWrapper wrapper); /** * 根据条件查询所有数据，app/收银机接口 diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/SmErpSupplierService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierService.java similarity index 83% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/SmErpSupplierService.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierService.java index 30dd7a2b2..bf7ace929 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/SmErpSupplierService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierService.java @@ -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; diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/SmErpSupplierTypeService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierTypeService.java similarity index 80% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/SmErpSupplierTypeService.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierTypeService.java index b0c6e953c..f32212235 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/SmErpSupplierTypeService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierTypeService.java @@ -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 { diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketUnitService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpUnitService.java similarity index 73% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketUnitService.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpUnitService.java index 36b17bfa4..453df828c 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketUnitService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpUnitService.java @@ -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 { +public interface SmErpUnitService extends IService { /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketAuxiliaryCodeService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketAuxiliaryCodeService.java deleted file mode 100644 index 91f24fec9..000000000 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SupermarketAuxiliaryCodeService.java +++ /dev/null @@ -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 { - -} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpAuxiliaryCodeServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpAuxiliaryCodeServiceImpl.java new file mode 100644 index 000000000..573cad6d3 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpAuxiliaryCodeServiceImpl.java @@ -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 implements SmErpAuxiliaryCodeService { +} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketBrandServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpBrandServiceImpl.java similarity index 55% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketBrandServiceImpl.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpBrandServiceImpl.java index 593dd1f07..1830510b7 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketBrandServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpBrandServiceImpl.java @@ -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 implements SupermarketBrandService { +public class SmErpBrandServiceImpl extends ServiceImpl implements SmErpBrandService { @Override - public Object pagescope(Page page, LambdaQueryWrapper wrapper) { + public Object pagescope(Page page, LambdaQueryWrapper wrapper) { return baseMapper.selectPageByScope(page, wrapper, DataScope.of()); } } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketCategoryServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCategoryServiceImpl.java similarity index 53% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketCategoryServiceImpl.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCategoryServiceImpl.java index 229deb666..8ae3ac816 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketCategoryServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpCategoryServiceImpl.java @@ -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 implements SupermarketCategoryService { +public class SmErpCategoryServiceImpl extends ServiceImpl implements SmErpCategoryService { @Override - public List listScope() { - return baseMapper.selectListByScope(new LambdaQueryWrapper(), DataScope.of()); + public List listScope() { + return baseMapper.selectListByScope(new LambdaQueryWrapper(), DataScope.of()); } @Override - public Object pageScope(Page page, LambdaQueryWrapper wrapper) { + public Object pageScope(Page page, LambdaQueryWrapper wrapper) { return baseMapper.selectPageByScope(page, wrapper, DataScope.of()); } } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java new file mode 100644 index 000000000..f918fcc46 --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java @@ -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 implements SmErpSpuService { + + private final SmErpUnitService smErpUnitService; + + private final SmErpAuxiliaryCodeService smErpAuxiliaryCodeService; + + @Override + @Transactional + public R saveSpu(SmErpSpuEntity supermarketSpu) { + + baseMapper.insert(supermarketSpu); + + //新增包装类型 + List smErpUnitEntityList = supermarketSpu.getSmErpUnitEntityList(); + if (CollectionUtils.isNotEmpty(smErpUnitEntityList)) { + smErpUnitEntityList.forEach(supermarketUnitEntity -> supermarketUnitEntity.setSpuId(supermarketSpu.getId())); + smErpUnitService.saveBatch(smErpUnitEntityList); + } else { + return R.failed("包装类型不能为空"); + } + //辅助条码 + List 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 smErpUnitEntityList = supermarketSpu.getSmErpUnitEntityList(); + if (CollectionUtils.isNotEmpty(smErpUnitEntityList)) { + //id为null新增 + List insertCollect = smErpUnitEntityList.stream() + .filter(supermarketUnitEntity -> supermarketUnitEntity.getId() == null).collect(Collectors.toList()); + insertCollect.forEach(supermarketUnitEntity -> supermarketUnitEntity.setSpuId(supermarketSpu.getId())); + List updateCollect = smErpUnitEntityList.stream() + .filter(supermarketUnitEntity -> supermarketUnitEntity.getId() != null).collect(Collectors.toList()); + smErpUnitService.updateBatchById(updateCollect); + smErpUnitService.saveBatch(insertCollect); + } else { + return R.failed("包装类型不能为空"); + } + //辅助条码 + List smErpAuxiliaryCodeEntityList = supermarketSpu.getSmErpAuxiliaryCodeEntityList(); + if (CollectionUtils.isNotEmpty(smErpAuxiliaryCodeEntityList)) { + List insertCollect = smErpAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() == null).collect(Collectors.toList()); + List 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 list) { + + baseMapper.deleteByIds(list); + + //删除 + list.forEach(id -> { + LambdaQueryWrapper supermarketAuxiliaryCodeEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + supermarketAuxiliaryCodeEntityLambdaQueryWrapper.eq(SmErpAuxiliaryCodeEntity::getSpuId, id); + LambdaQueryWrapper 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 wrapper) { + return baseMapper.selectPageByScope(page, wrapper, DataScope.of()); + } + + @Override + public Object selectListAllScope(SupermarketSpuQueryDTO supermarketSpuQueryDTO) { + + List list = baseMapper.selectListAllScope(supermarketSpuQueryDTO, DataScope.of()); + List bean = BeanUtils.toBean(list, SupermarketSpuVo.class); + return bean; + + + } + + @Override + public Object getSupermarketSpuDetailById(Long id) { + SmErpSpuEntity smErpSpuEntity = baseMapper.selectById(id); + List smErpUnitEntityList = smErpUnitService.list(new LambdaQueryWrapper().eq(SmErpUnitEntity::getSpuId, id)); + List supermarketAuxiliaryCodeEntities = smErpAuxiliaryCodeService.list(new LambdaQueryWrapper().eq(SmErpAuxiliaryCodeEntity::getSpuId, id)); + SupermarketSpuVo supermarketSpuVo = BeanUtils.toBean(smErpSpuEntity, SupermarketSpuVo.class); + List supermarketUnitVoList = BeanUtils.toBean(smErpUnitEntityList, SupermarketUnitVo.class); + List 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 smErpUnitEntityList = smErpUnitService.list(new LambdaQueryWrapper().eq(SmErpUnitEntity::getSpuId, id)); + List unitEntities = smErpUnitEntityList.stream().filter(supermarketUnitEntity -> supermarketUnitEntity.getStatus() == 0).collect(Collectors.toList()); + SupermarketAppSpuDetailsVo supermarketAppSpuVo = BeanUtils.toBean(smErpSpuEntity, SupermarketAppSpuDetailsVo.class); + List supermarketAppUnitVos = BeanUtils.toBean(unitEntities, SupermarketAppUnitVo.class); + supermarketAppSpuVo.setSkuList(supermarketAppUnitVos); + return supermarketAppSpuVo; + } +} \ No newline at end of file diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/impl/SmErpSupplierServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierServiceImpl.java similarity index 79% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/impl/SmErpSupplierServiceImpl.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierServiceImpl.java index 8f0727ba8..0fc8be9fc 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/impl/SmErpSupplierServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierServiceImpl.java @@ -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; diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/impl/SmErpSupplierTypeServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierTypeServiceImpl.java similarity index 73% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/impl/SmErpSupplierTypeServiceImpl.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierTypeServiceImpl.java index 80077aa9f..6f4d2d81f 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/service/impl/SmErpSupplierTypeServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierTypeServiceImpl.java @@ -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; /** * 货商类别 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketUnitServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpUnitServiceImpl.java similarity index 60% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketUnitServiceImpl.java rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpUnitServiceImpl.java index d36b2c604..88f32b91c 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketUnitServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpUnitServiceImpl.java @@ -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 implements SupermarketUnitService { +public class SmErpUnitServiceImpl extends ServiceImpl implements SmErpUnitService { @Override public List getSupermarketUnitsWithSpu(List ids) { diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketAuxiliaryCodeServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketAuxiliaryCodeServiceImpl.java deleted file mode 100644 index 556153718..000000000 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketAuxiliaryCodeServiceImpl.java +++ /dev/null @@ -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 implements SupermarketAuxiliaryCodeService { -} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketSpuServiceImpl.java deleted file mode 100644 index 7e7eb84c3..000000000 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SupermarketSpuServiceImpl.java +++ /dev/null @@ -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 implements SupermarketSpuService { - - private final SupermarketUnitService supermarketUnitService; - - private final SupermarketAuxiliaryCodeService supermarketAuxiliaryCodeService; - - @Override - @Transactional - public R saveSpu(SupermarketSpuEntity supermarketSpu) { - - baseMapper.insert(supermarketSpu); - - //新增包装类型 - List supermarketUnitEntityList = supermarketSpu.getSupermarketUnitEntityList(); - if (CollectionUtils.isNotEmpty(supermarketUnitEntityList)) { - supermarketUnitEntityList.forEach(supermarketUnitEntity -> supermarketUnitEntity.setSpuId(supermarketSpu.getId())); - supermarketUnitService.saveBatch(supermarketUnitEntityList); - } else { - return R.failed("包装类型不能为空"); - } - //辅助条码 - List 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 supermarketUnitEntityList = supermarketSpu.getSupermarketUnitEntityList(); - if (CollectionUtils.isNotEmpty(supermarketUnitEntityList)) { - //id为null新增 - List insertCollect = supermarketUnitEntityList.stream() - .filter(supermarketUnitEntity -> supermarketUnitEntity.getId() == null).collect(Collectors.toList()); - insertCollect.forEach(supermarketUnitEntity -> supermarketUnitEntity.setSpuId(supermarketSpu.getId())); - List updateCollect = supermarketUnitEntityList.stream() - .filter(supermarketUnitEntity -> supermarketUnitEntity.getId() != null).collect(Collectors.toList()); - supermarketUnitService.updateBatchById(updateCollect); - supermarketUnitService.saveBatch(insertCollect); - } else { - return R.failed("包装类型不能为空"); - } - //辅助条码 - List supermarketAuxiliaryCodeEntityList = supermarketSpu.getSupermarketAuxiliaryCodeEntityList(); - if (CollectionUtils.isNotEmpty(supermarketAuxiliaryCodeEntityList)) { - List insertCollect = supermarketAuxiliaryCodeEntityList.stream().filter(supermarketAuxiliaryCodeEntity -> supermarketAuxiliaryCodeEntity.getId() == null).collect(Collectors.toList()); - List 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 list) { - - baseMapper.deleteByIds(list); - - //删除 - list.forEach(id -> { - LambdaQueryWrapper supermarketAuxiliaryCodeEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); - supermarketAuxiliaryCodeEntityLambdaQueryWrapper.eq(SupermarketAuxiliaryCodeEntity::getSpuId, id); - LambdaQueryWrapper 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 wrapper) { - return baseMapper.selectPageByScope(page, wrapper, DataScope.of()); - } - - @Override - public Object selectListAllScope(SupermarketSpuQueryDTO supermarketSpuQueryDTO) { - - List list = baseMapper.selectListAllScope(supermarketSpuQueryDTO, DataScope.of()); - List bean = BeanUtils.toBean(list, SupermarketSpuVo.class); - return bean; - - - } - - @Override - public Object getSupermarketSpuDetailById(Long id) { - SupermarketSpuEntity supermarketSpuEntity = baseMapper.selectById(id); - List supermarketUnitEntityList = supermarketUnitService.list(new LambdaQueryWrapper().eq(SupermarketUnitEntity::getSpuId, id)); - List supermarketAuxiliaryCodeEntities = supermarketAuxiliaryCodeService.list(new LambdaQueryWrapper().eq(SupermarketAuxiliaryCodeEntity::getSpuId, id)); - SupermarketSpuVo supermarketSpuVo = BeanUtils.toBean(supermarketSpuEntity, SupermarketSpuVo.class); - List supermarketUnitVoList = BeanUtils.toBean(supermarketUnitEntityList, SupermarketUnitVo.class); - List 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 supermarketUnitEntityList = supermarketUnitService.list(new LambdaQueryWrapper().eq(SupermarketUnitEntity::getSpuId, id)); - List unitEntities = supermarketUnitEntityList.stream().filter(supermarketUnitEntity -> supermarketUnitEntity.getStatus() == 0).collect(Collectors.toList()); - SupermarketAppSpuDetailsVo supermarketAppSpuVo = BeanUtils.toBean(supermarketSpuEntity, SupermarketAppSpuDetailsVo.class); - List supermarketAppUnitVos = BeanUtils.toBean(unitEntities, SupermarketAppUnitVo.class); - supermarketAppSpuVo.setSkuList(supermarketAppUnitVos); - return supermarketAppSpuVo; - } -} \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketAuxiliaryCodeMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpAuxiliaryCodeMapper.xml similarity index 82% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketAuxiliaryCodeMapper.xml rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpAuxiliaryCodeMapper.xml index 85a313f34..8c9577096 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketAuxiliaryCodeMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpAuxiliaryCodeMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketBrandMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpBrandMapper.xml similarity index 88% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketBrandMapper.xml rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpBrandMapper.xml index 9ff33edcd..942530cd5 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketBrandMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpBrandMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketCategoryMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpCategoryMapper.xml similarity index 87% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketCategoryMapper.xml rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpCategoryMapper.xml index 426494b0e..86dd5eb99 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketCategoryMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpCategoryMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketSpuMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml similarity index 97% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketSpuMapper.xml rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml index 370d6bbf9..1da1bd0fd 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketSpuMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/mapper/SmErpSupplierMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSupplierMapper.xml similarity index 92% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/mapper/SmErpSupplierMapper.xml rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSupplierMapper.xml index 102bfc156..b12fc441b 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/mapper/SmErpSupplierMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSupplierMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/mapper/SmErpSupplierTypeMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSupplierTypeMapper.xml similarity index 85% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/mapper/SmErpSupplierTypeMapper.xml rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSupplierTypeMapper.xml index 2d1e0d0e7..4be09220f 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/mapper/SmErpSupplierTypeMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSupplierTypeMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketUnitMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml similarity index 96% rename from pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketUnitMapper.xml rename to pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml index 209e7caf3..42baa2345 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SupermarketUnitMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpUnitMapper.xml @@ -1,9 +1,9 @@ - + - + diff --git a/pom.xml b/pom.xml index d5020e7f5..56ee41567 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ pjcloud-app-server pjcloud-thirdparty pjcloud-canteen - pjcloud-supermarket-erp + pjcloud-wallet pjcloud-supermarket pjcloud-hardware