From ee93fbfe444873d88cccc3224f3df42634331ef9 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Wed, 2 Aug 2023 09:07:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/feign/IBasicMaterialClient.java | 7 +++ .../entity/BasicdataClientEntity.java | 7 +++ .../entity/DistributionParcelListEntity.java | 7 +++ .../DistributionStockArticleEntity.java | 8 +++ .../basic/feign/BasicMaterialClient.java | 16 ++++++ .../controller/BasicdataClientController.java | 20 ++++++++ .../service/IBasicdataClientService.java | 7 +++ .../impl/BasicdataClientServiceImpl.java | 12 +++++ .../DistributionStockArticleController.java | 9 +++- .../DistributionStockArticleServiceImpl.java | 51 ++++++++++++++++--- 10 files changed, 135 insertions(+), 9 deletions(-) diff --git a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java index 44f0774f9..06d95bceb 100644 --- a/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java +++ b/blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java @@ -37,6 +37,7 @@ public interface IBasicMaterialClient { String API_PREFIX = "material/client"; String TOP = API_PREFIX + "/top"; String GETMATERIAL = API_PREFIX + "/getMaterial"; + String GETMATERIALID = API_PREFIX + "/getMaterialId"; /** * 获取物料基础信息列表 @@ -57,5 +58,11 @@ public interface IBasicMaterialClient { */ @GetMapping(GETMATERIAL) BasicMaterialEntity getMaterialOwn(@RequestParam("productCode") String productCode, @RequestParam("name") String name, @RequestParam("sku") String sku); + /** + * 查询某个物理信息 + * @return + */ + @GetMapping(GETMATERIALID) + BasicMaterialEntity getMaterialOwnId(@RequestParam("materialId") Long materialId); } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java index 7a2994284..608d5b273 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataClientEntity.java @@ -86,6 +86,13 @@ public class BasicdataClientEntity extends TenantEntity { @ApiModelProperty(value = "详细地址 ") private String detailedly; + /** + * 创建用户名称 + */ + @ApiModelProperty(value = "创建用户名称 ") + @TableField(exist = false) + private String createUserName; + /** * 费用类型 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java index 6197859e7..6711d35dd 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java @@ -16,6 +16,7 @@ */ package com.logpm.distribution.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -114,6 +115,12 @@ public class DistributionParcelListEntity extends TenantEntity { */ @ApiModelProperty(value = "三级品") private String thirdProduct; + /** + * 客户id + */ + @ApiModelProperty(value = "客户id") + @TableField(exist = false) + private String marketId; /** * 物料Id */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index 1ce431e36..c53d78259 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -66,6 +66,14 @@ public class DistributionStockArticleEntity extends TenantEntity { */ @ApiModelProperty(value = "预留5") private String reserve5; + + /** + * 创建用户名称 + */ + @ApiModelProperty(value = "创建用户名称 ") + @TableField(exist = false) + private String createUserName; + /** * 服务号 */ diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicMaterialClient.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicMaterialClient.java index 24da3947b..927d00cfc 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicMaterialClient.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicMaterialClient.java @@ -25,6 +25,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import com.logpm.basic.entity.BasicMaterialEntity; import com.logpm.basic.service.IBasicMaterialService; +import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; @@ -62,6 +63,7 @@ public class BasicMaterialClient implements IBasicMaterialClient { * @return */ @Override + @GetMapping(GETMATERIAL) public BasicMaterialEntity getMaterialOwn(String productCode, String name, String sku) { BasicMaterialEntity one = basicMaterialService.getOne(Wrappers.query().lambda() .eq(StringUtils.isNotEmpty(productCode), BasicMaterialEntity::getProductCode, productCode) @@ -71,4 +73,18 @@ public class BasicMaterialClient implements IBasicMaterialClient { return one; } + /** + * 查询某个物料 + * @param id + * @return + */ + @Override + @GetMapping(GETMATERIALID) + public BasicMaterialEntity getMaterialOwnId(Long id) { + BasicMaterialEntity one = basicMaterialService.getOne(Wrappers.query().lambda() + .eq(ObjectUtil.isNotEmpty(id), BasicMaterialEntity::getId, id) + ); + return one; + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java index 4efa2bbe9..01005286a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java @@ -37,6 +37,8 @@ import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.system.entity.User; +import org.springblade.system.feign.IUserClient; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -60,6 +62,8 @@ public class BasicdataClientController extends BladeController { private final IBasicdataClientService basicdataClientService; + private final IUserClient userClient; + /** * 基础客户表 详情 */ @@ -93,6 +97,12 @@ public class BasicdataClientController extends BladeController { queryWrapper.eq("pid","0"); } IPage pages = basicdataClientService.page(Condition.getPage(query),queryWrapper); +// pages.getRecords().forEach( i ->{ +// if(!i.getCreateUser().equals(null)){ +// R userR = userClient.userInfoById(i.getCreateUser()); +// i.setCreateUserName(userR.getData().getName()); +// } +// }); return R.data(pages); } @@ -117,6 +127,16 @@ public class BasicdataClientController extends BladeController { List pages = basicdataClientService.listName(name); return R.data(pages); } + /** + * 基础客户表查询 + */ + @GetMapping("/listCode") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "分页", notes = "传入basicdataClient") + public R> listCode(String code) { + List pages = basicdataClientService.listCode(code); + return R.data(pages); + } /** * 基础客户表 新增 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java index b8c24cbca..8868201cf 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java @@ -79,4 +79,11 @@ public interface IBasicdataClientService extends BaseService listCode(String code); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java index 3800cf339..2a837f7e6 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java @@ -282,4 +282,16 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl listCode(String code) { + return baseMapper.selectList(Wrappers.query().lambda() + .eq(BasicdataClientEntity::getReserve1,code) + ); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java index 24d0f19cb..155d45733 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java @@ -40,7 +40,9 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.entity.DictBiz; +import org.springblade.system.entity.User; import org.springblade.system.feign.IDictBizClient; +import org.springblade.system.feign.IUserClient; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import wrapper.DistributionStockArticleWrapper; @@ -65,6 +67,8 @@ public class DistributionStockArticleController extends BladeController { private final IDictBizClient dictBizClient; + private final IUserClient userClient; + /** * 配送在库订单 详情 */ @@ -95,7 +99,10 @@ public class DistributionStockArticleController extends BladeController { queryWrapper.in("id",String.valueOf(d).split(",")); } IPage pages = distributionStockArticleService.page(Condition.getPage(query), queryWrapper); - + pages.getRecords().forEach( i ->{ + R userR = userClient.userInfoById(i.getCreateUser()); + i.setCreateUserName(userR.getData().getName()); + }); return R.data(DistributionStockArticleWrapper.build().pageVO(pages)); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index d8a57f57d..0cca06c5e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -16,12 +16,16 @@ */ package com.logpm.distribution.service.impl; +import com.aliyuncs.unmarshaller.JsonUnmashaller; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.BeanUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; +import com.logpm.basic.entity.BasicMaterialEntity; +import com.logpm.basic.feign.IBasicMaterialClient; import com.logpm.distribution.dto.DistributionStockArticleDTO; import com.logpm.distribution.entity.*; import com.logpm.distribution.excel.DistributionStockArticleExcel; @@ -34,12 +38,15 @@ import com.logpm.distribution.vo.DistributionStockArticleVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.DictBizConstant; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.cache.DictBizCache; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -75,6 +82,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl selectDistributionStockArticlePage(IPage page, DistributionStockArticleVO distributionStockArticle) { @@ -99,7 +109,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl list1 = distributionParcelListService.list(Wrappers.query().lambda() @@ -112,8 +122,25 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl list = distributionParcelDetailsService.list(Wrappers.query().lambda() + .eq(DistributionParcelDetailsEntity::getParcelListId, i.getId()) + ); + if(list.size() > 0){ + list.forEach( a ->{ + DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); + BeanUtil.copyProperties(i,parcelListEntity); + parcelListEntity.setMaterialName(a.getName()); + parcelListEntity.setMaterialCode(a.getEncoded()); + parcelListEntity.setMaterialUnit(a.getUnit()); + // 添加库存品信息 + addStockList(parcelListEntity, 1); + } ); + }else{ + // 添加库存品信息 + addStockList(i, 1); + } + }); String[] split = ids.split(","); for (int i = 0; i < split.length; i++) { @@ -127,10 +154,10 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl