From dc1f81ed6ca7c563d6a88927e75cf7d69017ec19 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Thu, 10 Aug 2023 19:36:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E4=BB=93=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicdataStorageServicesEntity.java | 2 +- .../BasicdataStorageServicesController.java | 3 +- .../dto/BasicdataStorageServicesDTO.java | 4 ++ .../mapper/BasicdataStorageServicesMapper.xml | 1 + .../IBasicdataStorageServicesService.java | 3 +- .../BasicdataStorageServicesServiceImpl.java | 53 +++++++++++-------- 6 files changed, 41 insertions(+), 25 deletions(-) diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java index 75aa642dc..c3b1711e0 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java @@ -86,7 +86,7 @@ public class BasicdataStorageServicesEntity extends TenantEntity { * 发货仓库 发货仓库客户允许未null */ @ApiModelProperty(value = "发货仓库ID") - private Long sendWarehouseId; + private String sendWarehouseId; @ApiModelProperty(value = "发货仓库Name") private String sendWarehouseName; diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStorageServicesController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStorageServicesController.java index 45dafd446..32c7a1515 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStorageServicesController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataStorageServicesController.java @@ -16,6 +16,7 @@ */ package com.logpm.basicdata.controller; +import com.logpm.basicdata.dto.BasicdataStorageServicesDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -116,7 +117,7 @@ public class BasicdataStorageServicesController extends BladeController { @PostMapping("/submit") @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入basicdataStorageServices") - public R submit(@Valid @RequestBody BasicdataStorageServicesEntity basicdataStorageServices) { + public R submit(@Valid @RequestBody BasicdataStorageServicesDTO basicdataStorageServices) { return R.status(basicdataStorageServicesService.submitSave(basicdataStorageServices)); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataStorageServicesDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataStorageServicesDTO.java index ba3f04617..112618a77 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataStorageServicesDTO.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataStorageServicesDTO.java @@ -20,6 +20,8 @@ import com.logpm.basicdata.entity.BasicdataStorageServicesEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 门店服务仓库表 数据传输对象实体类 * @@ -31,4 +33,6 @@ import lombok.EqualsAndHashCode; public class BasicdataStorageServicesDTO extends BasicdataStorageServicesEntity { private static final long serialVersionUID = 1L; + private List sendWarehouseIds; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml index 89b9424fc..dbc087151 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml @@ -39,6 +39,7 @@ and lbss.send_warehouse_id = #{param.sendWarehouseId} and lbss.serve_warehouse_name like concat('%',#{param.serveWarehouseName} ,'%') + and lbss.send_warehouse_name like concat('%',#{param.sendWarehouseName} ,'%') and lbss.send_warehouse_name like concat('%',#{param.sendWarehouseName} ,'%') diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java index 2533d334a..b5808c9fc 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataStorageServicesService.java @@ -17,6 +17,7 @@ package com.logpm.basicdata.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.basicdata.dto.BasicdataStorageServicesDTO; import com.logpm.basicdata.entity.BasicdataStorageServicesEntity; import com.logpm.basicdata.vo.BasicdataStorageServicesVO; import com.logpm.basicdata.excel.BasicdataStorageServicesExcel; @@ -50,7 +51,7 @@ public interface IBasicdataStorageServicesService extends BaseService exportBasicdataStorageServices(Wrapper queryWrapper); - boolean submitSave(BasicdataStorageServicesEntity basicdataStorageServices); + boolean submitSave(BasicdataStorageServicesDTO basicdataStorageServices); List pageList(IPage page, Map basicdataStorageServices); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java index 917a66c3b..519b1725f 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java @@ -17,7 +17,9 @@ package com.logpm.basicdata.service.impl; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.logpm.basicdata.dto.BasicdataStorageServicesDTO; import com.logpm.basicdata.entity.BasicdataStorageServicesEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.service.IBasicdataWarehouseService; @@ -25,13 +27,14 @@ import com.logpm.basicdata.vo.BasicdataStorageServicesVO; import com.logpm.basicdata.excel.BasicdataStorageServicesExcel; import com.logpm.basicdata.mapper.BasicdataStorageServicesMapper; import com.logpm.basicdata.service.IBasicdataStorageServicesService; -import org.checkerframework.checker.units.qual.A; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; 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.ArrayList; import java.util.List; import java.util.Map; @@ -64,28 +67,34 @@ public class BasicdataStorageServicesServiceImpl extends BaseServiceImpl basicdataStorageServicesEntities = baseMapper.selectList(Wrappers.query().lambda(). - eq(BasicdataStorageServicesEntity::getClientId, basicdataStorageServices.getClientId()). - eq(BasicdataStorageServicesEntity::getSendWarehouseId, basicdataStorageServices.getSendWarehouseId()). - eq(BasicdataStorageServicesEntity::getSendWarehouseId, basicdataStorageServices.getSendWarehouseId()) - ); - if(basicdataStorageServicesEntities.size() > 0){ - throw new RuntimeException("存在重复数据！已拒绝！！"); + public boolean submitSave(BasicdataStorageServicesDTO basicdataStorageServices) { + + if(ObjectUtils.isNotNull(basicdataStorageServices.getId())){ + + // 获取仓库名称 + BasicdataWarehouseEntity sendBasicdataWarehouseEntity = basicdataWarehouseService.getById(basicdataStorageServices.getSendWarehouseId()); + basicdataStorageServices.setSendWarehouseName(sendBasicdataWarehouseEntity.getName()); + BasicdataWarehouseEntity serveBasicdataWarehouseEntity = basicdataWarehouseService.getById(basicdataStorageServices.getServeWarehouseId()); + basicdataStorageServices.setServeWarehouseName(serveBasicdataWarehouseEntity.getName()); + this.updateById(basicdataStorageServices); + return true; + }else{ + List servicesEntities = new ArrayList<>(); + basicdataStorageServices.getSendWarehouseIds().forEach( i ->{ + BasicdataStorageServicesEntity basicdataStorageServicesEntity = new BasicdataStorageServicesEntity(); + BeanUtils.copyProperties(basicdataStorageServices,basicdataStorageServicesEntity); + // 获取仓库名称 + BasicdataWarehouseEntity sendBasicdataWarehouseEntity = basicdataWarehouseService.getById(i); + basicdataStorageServicesEntity.setSendWarehouseName(sendBasicdataWarehouseEntity.getName()); + BasicdataWarehouseEntity serveBasicdataWarehouseEntity = basicdataWarehouseService.getById(basicdataStorageServices.getServeWarehouseId()); + basicdataStorageServicesEntity.setServeWarehouseName(serveBasicdataWarehouseEntity.getName()); + basicdataStorageServicesEntity.setSendWarehouseId(i); + servicesEntities.add(basicdataStorageServicesEntity); + }); + this.saveBatch(servicesEntities); + return true; } - - - // 获取仓库名称 - BasicdataWarehouseEntity sendBasicdataWarehouseEntity = basicdataWarehouseService.getById(basicdataStorageServices.getSendWarehouseId()); - basicdataStorageServices.setSendWarehouseName(sendBasicdataWarehouseEntity.getName()); - - BasicdataWarehouseEntity serveBasicdataWarehouseEntity = basicdataWarehouseService.getById(basicdataStorageServices.getServeWarehouseId()); - basicdataStorageServices.setServeWarehouseName(serveBasicdataWarehouseEntity.getName()); - - - - return this.saveOrUpdate(basicdataStorageServices); +// return this.saveOrUpdate(basicdataStorageServices); } @Override