From 9f6f4f13a5a703f5a4a03e0245a28f7927f901a7 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Tue, 11 Jul 2023 17:02:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseWarehousingDetailEntity.java | 2 +- .../WarehouseWarehousingEntryEntity.java | 4 ++- .../WarehouseWarehousingEntryController.java | 5 +-- .../dto/WarehouseWarehousingEntryDTO.java | 5 +++ .../IWarehouseWarehousingEntryService.java | 7 +++++ .../WarehouseWarehousingEntryServiceImpl.java | 31 +++++++++++++++++++ 6 files changed, 50 insertions(+), 4 deletions(-) diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWarehousingDetailEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWarehousingDetailEntity.java index a9071179b..cfcb88391 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWarehousingDetailEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWarehousingDetailEntity.java @@ -85,7 +85,7 @@ public class WarehouseWarehousingDetailEntity extends TenantEntity { * 包装数量 */ @ApiModelProperty(value = "包装数量") - private Integer packagingNumber; + private String packagingNumber; /** * 包装规格 */ diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWarehousingEntryEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWarehousingEntryEntity.java index 927593127..e502d5a00 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWarehousingEntryEntity.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWarehousingEntryEntity.java @@ -17,6 +17,7 @@ package com.logpm.warehouse.entity; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -70,6 +71,7 @@ public class WarehouseWarehousingEntryEntity extends TenantEntity { * 入库时间 */ @ApiModelProperty(value = "入库时间") + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") private Date receiptDate; /** * 客户名称 @@ -120,7 +122,7 @@ public class WarehouseWarehousingEntryEntity extends TenantEntity { * 入库状态 */ @ApiModelProperty(value = "入库状态") - private String condition; + private String conditions; /** * 入库总件数 */ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java index 8af2f2725..9b9d8cbf6 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java @@ -16,6 +16,7 @@ */ package com.logpm.warehouse.controller; +import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -116,8 +117,8 @@ public class WarehouseWarehousingEntryController extends BladeController { @PostMapping("/submit") @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入warehouseWarehousingEntry") - public R submit(@Valid @RequestBody WarehouseWarehousingEntryEntity warehouseWarehousingEntry) { - return R.status(warehouseWarehousingEntryService.saveOrUpdate(warehouseWarehousingEntry)); + public R submit(@Valid @RequestBody WarehouseWarehousingEntryDTO warehouseWarehousingEntryDTO) { + return R.status(warehouseWarehousingEntryService.saveOrUpdateOwn(warehouseWarehousingEntryDTO)); } /** diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWarehousingEntryDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWarehousingEntryDTO.java index af497da2e..6eab74a43 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWarehousingEntryDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWarehousingEntryDTO.java @@ -16,10 +16,13 @@ */ package com.logpm.warehouse.dto; +import com.logpm.warehouse.entity.WarehouseWarehousingDetailEntity; import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 仓库入库单 数据传输对象实体类 * @@ -31,4 +34,6 @@ import lombok.EqualsAndHashCode; public class WarehouseWarehousingEntryDTO extends WarehouseWarehousingEntryEntity { private static final long serialVersionUID = 1L; + private List list; + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWarehousingEntryService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWarehousingEntryService.java index 1a576ca40..c4e308c44 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWarehousingEntryService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWarehousingEntryService.java @@ -17,6 +17,7 @@ package com.logpm.warehouse.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO; import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity; import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO; import com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel; @@ -49,4 +50,10 @@ public interface IWarehouseWarehousingEntryService extends BaseService exportWarehouseWarehousingEntry(Wrapper queryWrapper); + /** + * 自定添加修改 + * @param warehouseWarehousingEntryDTO + * @return + */ + Boolean saveOrUpdateOwn(WarehouseWarehousingEntryDTO warehouseWarehousingEntryDTO); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java index 221ebf373..3d3a10f97 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java @@ -16,11 +16,18 @@ */ package com.logpm.warehouse.service.impl; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.google.common.eventbus.AllowConcurrentEvents; +import com.logpm.warehouse.dto.WarehouseWarehousingEntryDTO; +import com.logpm.warehouse.entity.WarehouseWarehousingDetailEntity; import com.logpm.warehouse.entity.WarehouseWarehousingEntryEntity; +import com.logpm.warehouse.service.IWarehouseWarehousingDetailService; import com.logpm.warehouse.vo.WarehouseWarehousingEntryVO; import com.logpm.warehouse.excel.WarehouseWarehousingEntryExcel; import com.logpm.warehouse.mapper.WarehouseWarehousingEntryMapper; import com.logpm.warehouse.service.IWarehouseWarehousingEntryService; +import lombok.AllArgsConstructor; +import org.springblade.core.tool.utils.BeanUtil; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -33,8 +40,10 @@ import java.util.List; * @author BladeX * @since 2023-07-10 */ +@AllArgsConstructor @Service public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl implements IWarehouseWarehousingEntryService { + private final IWarehouseWarehousingDetailService warehouseWarehousingDetailService; @Override public IPage selectWarehouseWarehousingEntryPage(IPage page, WarehouseWarehousingEntryVO warehouseWarehousingEntry) { @@ -51,4 +60,26 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl list = warehouseWarehousingEntryDTO.getList(); + WarehouseWarehousingEntryEntity warehouseWarehousingEntry = new WarehouseWarehousingEntryEntity(); + BeanUtil.copyProperties(warehouseWarehousingEntryDTO,warehouseWarehousingEntry); + if(ObjectUtils.isNotNull(warehouseWarehousingEntryDTO.getId())){ + //修改 + this.updateById(warehouseWarehousingEntry); + }else{ + //添加 + warehouseWarehousingEntry.setSource("添加"); + warehouseWarehousingEntry.setConditions("1"); + this.save(warehouseWarehousingEntry); + } + //添加入库明细 + list.forEach(i -> + i.setWarehousingEntryId(warehouseWarehousingEntry.getId()) + ); + warehouseWarehousingDetailService.saveBatch(list); + return true; + } + }