diff --git a/pjcloud-supermarket-erp/.editorconfig b/pjcloud-integrated/.editorconfig similarity index 100% rename from pjcloud-supermarket-erp/.editorconfig rename to pjcloud-integrated/.editorconfig diff --git a/pjcloud-supermarket-erp/README.md b/pjcloud-integrated/README.md similarity index 93% rename from pjcloud-supermarket-erp/README.md rename to pjcloud-integrated/README.md index 77b54353a..7862406b0 100644 --- a/pjcloud-supermarket-erp/README.md +++ b/pjcloud-integrated/README.md @@ -1,8 +1,4 @@ - -项目描述 .... - - - +# 综合服务模块 | 姓名 | 角色 | 时间 | | ---- | ---- |---------| diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/pom.xml b/pjcloud-integrated/pjcloud-integrated-api/pom.xml similarity index 91% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/pom.xml rename to pjcloud-integrated/pjcloud-integrated-api/pom.xml index 7d0df7918..13d4b5ce3 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/pom.xml +++ b/pjcloud-integrated/pjcloud-integrated-api/pom.xml @@ -6,11 +6,11 @@ 4.0.0 com.bsd - pjcloud-supermarket-erp + pjcloud-integrated 5.7.0 - pjcloud-supermarket-erp-api + pjcloud-integrated-api diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/pom.xml b/pjcloud-integrated/pjcloud-integrated-biz/pom.xml similarity index 97% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/pom.xml rename to pjcloud-integrated/pjcloud-integrated-biz/pom.xml index 3211d2275..4330f3a39 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/pom.xml +++ b/pjcloud-integrated/pjcloud-integrated-biz/pom.xml @@ -6,11 +6,11 @@ 4.0.0 com.bsd - pjcloud-supermarket-erp + pjcloud-integrated 5.7.0 - pjcloud-supermarket-erp-biz + pjcloud-integrated-biz diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/SuperMarketErpApp.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/IntegratedApp.java similarity index 100% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/SuperMarketErpApp.java rename to pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/IntegratedApp.java diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports new file mode 100644 index 000000000..fe7a6a9d5 --- /dev/null +++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports @@ -0,0 +1,3 @@ +#com.bsd.pjcloud.supermarketerp.api.feign.RemoteSupermarketCategoryService +#com.bsd.pjcloud.supermarketerp.api.feign.RemoteSupermarketSpuService +#com.bsd.pjcloud.supermarketerp.api.feign.RemoteSupermarketUnitSkuService \ No newline at end of file diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/application.yml similarity index 100% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml rename to pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/application.yml diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/logback-spring.xml b/pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/logback-spring.xml similarity index 100% rename from pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/logback-spring.xml rename to pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/logback-spring.xml diff --git a/pjcloud-supermarket-erp/pom.xml b/pjcloud-integrated/pom.xml similarity index 77% rename from pjcloud-supermarket-erp/pom.xml rename to pjcloud-integrated/pom.xml index 4a05ca348..07a365a2d 100644 --- a/pjcloud-supermarket-erp/pom.xml +++ b/pjcloud-integrated/pom.xml @@ -10,12 +10,12 @@ 5.7.0 - pjcloud-supermarket-erp + pjcloud-integrated pom - pjcloud-supermarket-erp-api - pjcloud-supermarket-erp-biz + pjcloud-integrated-api + pjcloud-integrated-biz diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/api/feign/packge-info.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/api/feign/packge-info.java deleted file mode 100644 index 19bcac496..000000000 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/api/feign/packge-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - @author pigx archetype - *

- * feign client 存放目录，注意 @EnablePigxFeignClients 的扫描范围 - */ -package com.bsd.pjcloud.erp.api.feign; \ No newline at end of file diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/constant/packge-info.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/constant/packge-info.java deleted file mode 100644 index 3d3a3c964..000000000 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/constant/packge-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - * @author pigx archetype - *

- * 常量和枚举定义 - */ -package com.bsd.pjcloud.erp.constant; \ No newline at end of file diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/entity/packge-info.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/entity/packge-info.java deleted file mode 100644 index dce807af6..000000000 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/erp/entity/packge-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - * @author pigx archetype - *

- * 实体 存放目录 - */ -package com.bsd.pjcloud.erp.entity; \ No newline at end of file diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketCategoryService.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketCategoryService.java deleted file mode 100644 index 4f1b90aa0..000000000 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketCategoryService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.bsd.pjcloud.supermarketerp.api.feign; - - -import com.bsd.pjcloud.common.core.constant.ServiceNameConstants; -import com.bsd.pjcloud.common.core.util.R; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; - -/** - * @author zjf - * @date 2018/6/22 - */ -@FeignClient(contextId = "remoteSupermarketCategoryServic", value = ServiceNameConstants.SUPERMARKET_SERVICE) -public interface RemoteSupermarketCategoryService { - - - - - /** - * 查询所有的分类 - * @return R - */ - @GetMapping("/supermarketCategory/simpleAll") - R getSimpleAll(); - -} diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketSpuService.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketSpuService.java deleted file mode 100644 index 2b75b0f35..000000000 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketSpuService.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, pjcloud All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: pjcloud - * - */ - -package com.bsd.pjcloud.supermarketerp.api.feign; - - -import com.bsd.pjcloud.common.core.constant.ServiceNameConstants; -import com.bsd.pjcloud.common.core.util.R; -import com.bsd.pjcloud.supermarketerp.dto.SupermarketSpuQueryDTO; -import com.bsd.pjcloud.supermarketerp.dto.SupermarketSpuUpdateStockReqDTO; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; - -/** - * @author zjf - * @date 2018/6/22 - */ -@FeignClient(contextId = "remoteSupermarketSpuService", value = ServiceNameConstants.SUPERMARKET_SERVICE) -public interface RemoteSupermarketSpuService { - - - - /** - * 查询所有的超市spu列表信息，根据条件 - * @return R - */ - @PostMapping("/supermarketSpu/ad/selectListAll") - R getSupermarketSpuScope(@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO); - - - - /** - * 根据spu id 查询spu详情，详情包括辅助条码和包装单位基本信息 - * @param id - * @return - */ - @GetMapping("/supermarketSpu/ad/SpuDetails") - R getSupermarketSpuDetailById(@RequestParam("id")Long id); - - - /** - * 更新库存 - * @param updateStockReqDTO - * @return - */ - @PostMapping("/supermarketSpu/ad/updateSpuStock") - R updateSpuStock(@RequestBody SupermarketSpuUpdateStockReqDTO updateStockReqDTO); - - - - - - /** - * 查询所有的超市spu列表信息，根据条件 - * @return R - */ - @PostMapping("/supermarketSpu/app/selectListAll") - R getSupermarketSpu(@RequestBody SupermarketSpuQueryDTO supermarketSpuQueryDTO); - - - /** - * 购物车效验库存 - * @param spuId - * @param incrCount 扣减数量，正数负数都行 - * @return - */ - @GetMapping("/supermarketSpu/app/checkSpuStock") - R checkSpuStock(@RequestParam(value ="spuId")Long spuId,@RequestParam("incrCount")Integer incrCount); - -} diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketUnitSkuService.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketUnitSkuService.java deleted file mode 100644 index 7cb7606b6..000000000 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-api/src/main/java/com/bsd/pjcloud/supermarketerp/api/feign/RemoteSupermarketUnitSkuService.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * - * Copyright (c) 2018-2025, pjcloud All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: pjcloud - * - */ - -package com.bsd.pjcloud.supermarketerp.api.feign; - - -import com.bsd.pjcloud.common.core.constant.ServiceNameConstants; -import com.bsd.pjcloud.common.core.util.R; -import com.bsd.pjcloud.supermarketerp.vo.SupermarketUnitWithSpuVo; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; - -/** - * @author zjf - * @date 2018/6/22 - */ -@FeignClient(contextId = "remoteSupermarketUnitSkuService", value = ServiceNameConstants.SUPERMARKET_SERVICE) -public interface RemoteSupermarketUnitSkuService { - - - - - - /** - * sku 包装单位 - * 根据包装ids查询 - * @param ids - * @return - */ - @PostMapping("/supermarketUnit/ad/getSupermarketUnits") - R> getSupermarketUnits(@RequestBody List ids); -} diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports deleted file mode 100644 index 6cc54168a..000000000 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports +++ /dev/null @@ -1,3 +0,0 @@ -com.bsd.pjcloud.supermarketerp.api.feign.RemoteSupermarketCategoryService -com.bsd.pjcloud.supermarketerp.api.feign.RemoteSupermarketSpuService -com.bsd.pjcloud.supermarketerp.api.feign.RemoteSupermarketUnitSkuService \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/InventoryTypeEnum.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/InventoryTypeEnum.java index 089c2020e..df80105e8 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/InventoryTypeEnum.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/constant/InventoryTypeEnum.java @@ -15,7 +15,8 @@ public enum InventoryTypeEnum { CKRK("3", "CGRK"), CKTH("4", "CGTH"), LSCK("5", "LSCK"), - LSTH("6", "LSTH") + LSTH("6", "LSTH"), + KCPD("7", "KCPD") ; private final String type; private final String value; diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java index 01e9c9825..c34b004d3 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/SmErpInventoryRecordsEntity.java @@ -175,4 +175,8 @@ public class SmErpInventoryRecordsEntity extends Model userIds = records.stream() .map(SmErpInventoryRecordsEntity::getHandlerUserId) .collect(Collectors.toSet()); + //收集supplierIds + Set supplierIds = records.stream() + .map(SmErpInventoryRecordsEntity::getSupplierId) + .collect(Collectors.toSet()); //请求得到所有的userIds Map userMap = remoteUserService.getUserMap(userIds).getData(); @@ -133,6 +146,9 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl spuMap = smErpSpuEntities.stream().collect(Collectors.toMap(SmErpSpuEntity::getId, spu -> spu)); + List smErpSupplierEntities = smErpSupplierMapper.selectList(new LambdaQueryWrapper().in(SmErpSupplierEntity::getSupplierId, supplierIds)); + Map supplierMap = smErpSupplierEntities.stream().collect(Collectors.toMap(SmErpSupplierEntity::getSupplierId, supplier -> supplier)); + // 按采购计划分组商品名称 Map> planGoodsMap = cgPlanItemEntities.stream() .collect(Collectors.groupingBy( @@ -142,15 +158,18 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl { //移动端自动扣款入库，无需经办人 if (null!=plan.getHandlerUserId()){ SysUser sysUser = userMap.getOrDefault(plan.getHandlerUserId(), new SysUser()); plan.setHandlerUserName(sysUser.getUsername()); - List names = planGoodsMap.getOrDefault(plan.getId(), Collections.emptyList()); - plan.setProductName(String.join(", ", names)); } + List names = planGoodsMap.getOrDefault(plan.getId(), Collections.emptyList()); + plan.setProductName(String.join(", ", names)); + String supplierName = supplierMap.getOrDefault(plan.getSupplierId(), new SmErpSupplierEntity()).getSupplierName(); + plan.setSupplierName(supplierName); }); return pageData; @@ -331,9 +350,9 @@ public class SmErpInventoryRecordsServiceImpl extends ServiceImpl items = inventoryRecordEditDTO.getItems(); List smErpInventoryRecordsItemEntityList = BeanUtils.toBean(items, SmErpInventoryRecordsItemEntity.class); - List updateItems = smErpInventoryRecordsItemEntityList.stream(). - filter(smErpInventoryRecordsItemEntity -> smErpInventoryRecordsItemEntity.getId() == null).collect(Collectors.toList()); List insertItems = smErpInventoryRecordsItemEntityList.stream(). + filter(smErpInventoryRecordsItemEntity -> smErpInventoryRecordsItemEntity.getId() == null).collect(Collectors.toList()); + List updateItems = smErpInventoryRecordsItemEntityList.stream(). filter(smErpInventoryRecordsItemEntity -> smErpInventoryRecordsItemEntity.getId() != null).collect(Collectors.toList()); smErpInventoryRecordsItemMapper.updateById(updateItems); smErpInventoryRecordsItemMapper.insert(insertItems); diff --git a/pom.xml b/pom.xml index 56ee41567..ee9dadc19 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ pjcloud-app-server pjcloud-thirdparty pjcloud-canteen - + pjcloud-integrated pjcloud-wallet pjcloud-supermarket pjcloud-hardware