From f1b2fac504f9d2cb98b0d0c0dcdef8acbd9385eb Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Mon, 28 Aug 2023 11:44:21 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/vo/WarehouseScanRecordVO.java | 18 +++++++ .../warehouse/mapper/WarehouseStockMapper.xml | 37 +++++++++++++- .../impl/WarehouseStockServiceImpl.java | 10 +++- .../wrapper/WarehouseStockRecordWrapper.java | 49 +++++++++++++++++++ 4 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseStockRecordWrapper.java diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java index 168a42d67..e9e3d1a7e 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseScanRecordVO.java @@ -26,6 +26,12 @@ public class WarehouseScanRecordVO extends WarehouseScanRecordEntity { * 操作人 */ @ApiModelProperty(value = "操作人") + private Long operatorId; + + /** + * 操作人(Name) + */ + @ApiModelProperty(value = "操作人(Name)") private String operatorName; /** @@ -33,4 +39,16 @@ public class WarehouseScanRecordVO extends WarehouseScanRecordEntity { */ @ApiModelProperty(value = "扫描相亲") private String scanNodeMsg; + + /** + * 二级扫描类型(扫描详情) + */ + @ApiModelProperty(value = "扫描详情") + private String scanNodeType; + +// /** +// * 二级扫描类型（name） +// */ +// @ApiModelProperty(value = "二级扫描类型(name)") +// private String scanNodeTypeName; } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml index 9a911d971..afc214504 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseStockMapper.xml @@ -46,9 +46,42 @@ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java index cc74532a7..09bf20876 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseStockServiceImpl.java @@ -22,11 +22,13 @@ import com.logpm.warehouse.vo.WarehouseStockVO; import com.logpm.warehouse.excel.WarehouseStockExcel; import com.logpm.warehouse.mapper.WarehouseStockMapper; import com.logpm.warehouse.service.IWarehouseStockService; +import org.springblade.core.tool.utils.SpringUtil; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import java.util.List; +import org.springblade.system.feign.IUserClient; /** * 备货扫描记录 服务实现类 @@ -39,7 +41,13 @@ public class WarehouseStockServiceImpl extends BaseServiceImpl selectWarehouseStockPage(IPage page, WarehouseStockVO WarehouseStock) { - return page.setRecords(baseMapper.selectWarehouseStockPage(page, WarehouseStock)); + List warehouseScanRecordVOS = baseMapper.selectWarehouseStockPage(page, WarehouseStock); + IUserClient userCliient = SpringUtil.getBean(IUserClient.class); + for (WarehouseScanRecordVO warehouseScanRecordVO : warehouseScanRecordVOS) { + warehouseScanRecordVO.setOperatorName(userCliient.userInfoById(warehouseScanRecordVO.getOperatorId()).getData().getName()); + warehouseScanRecordVO.getNodeName().equals("上下架"); + } + return page.setRecords(warehouseScanRecordVOS); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseStockRecordWrapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseStockRecordWrapper.java new file mode 100644 index 000000000..faf3fba5f --- /dev/null +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/wrapper/WarehouseStockRecordWrapper.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * ReWarehouse and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * ReWarehouses of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * ReWarehouses 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 Warehouse. + * Neither the name of the dreamlu.net 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: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.warehouse.wrapper; + +import com.logpm.warehouse.entity.WarehouseStockEntity; +import com.logpm.warehouse.vo.WarehouseScanRecordVO; +import com.logpm.warehouse.vo.WarehouseStockVO; +import lombok.extern.log4j.Log4j2; +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; + +import java.util.Objects; + +/** + * 备货扫描记录 包装类,返回视图层所需的字段 + * + * @author lmy + * @since 2023-08-24 + */ +@Log4j2 +public class WarehouseStockRecordWrapper extends BaseEntityWrapper { + + public static WarehouseStockRecordWrapper build() { + return new WarehouseStockRecordWrapper(); + } + + @Override + public WarehouseScanRecordVO entityVO(WarehouseScanRecordVO WarehouseStock) { + log.info("WarehouseStock>>>>>>>>>>>{}",WarehouseStock); + + return WarehouseStock; + } + + +} From 51c123325992a76198d62cbb90b4216c7adaf6f1 Mon Sep 17 00:00:00 2001 From: kilo Date: Mon, 28 Aug 2023 12:11:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BasicdataGoodsAreaServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java index 30d008e18..34aff4ef4 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java @@ -167,11 +167,13 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl myWarehouseList = basicdataWarehouseService.getMyWarehouseList(); - myWarehouseList.forEach(w->{ - LambdaQueryWrapper qw = Wrappers.query().lambda().eq(BasicdataGoodsAreaEntity::getWarehouseId, w.getId()); - List basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(qw); - w.setChildren(basicdataGoodsAreaEntities); - }); + if (Func.isNotEmpty(myWarehouseList)){ + myWarehouseList.forEach(w->{ + LambdaQueryWrapper qw = Wrappers.query().lambda().eq(BasicdataGoodsAreaEntity::getWarehouseId, w.getId()); + List basicdataGoodsAreaEntities = basicdataGoodsAreaMapper.selectList(qw); + w.setChildren(basicdataGoodsAreaEntities); + }); + } // //查询一级仓库节点信息 // List basicdataWarehouseVOList = baseMapper.selectFirstNode(); // //获取二节点的货区 From 241816d0bb5b22a8de7c4a4fcded3cedd700f479 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Mon, 28 Aug 2023 13:34:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BasicdataClientServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 808ae76e4..2b221fa25 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 @@ -27,13 +27,16 @@ import com.logpm.basicdata.excel.BasicdataClientExcel; import com.logpm.basicdata.mapper.BasicdataClientMapper; import com.logpm.basicdata.service.*; import com.logpm.basicdata.vo.BasicdataClientVO; +import com.sun.xml.internal.ws.developer.ServerSideException; 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.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.cache.DictBizCache; import org.springblade.system.entity.User; import org.springblade.system.feign.IUserClient; @@ -246,7 +249,7 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl r = userClient.userByAccount(AuthUtil.getTenantId(), phone); // 标识这个账户不存在 需要新建 User u = r.getData(); - if (!ObjectUtils.isEmpty(u)) { + if (ObjectUtil.isEmpty(u)) { // 标识这个账户不存在 需要新建 u = new User(); u.setAccount(phone); @@ -276,9 +279,6 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl