From 31e7dc53f487c870bf22d12f275835f7448ca5f4 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Sat, 24 Feb 2024 22:14:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=BA=93=E5=AD=98=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/CreateWarehouseReceiptDto.java | 4 ++-- .../dto/UpdateWarehouseReceiptDto.java | 4 ++-- .../warehouseReceipt/dto/WarehouseReceiptDto.java | 4 ++-- .../entity/WarehouseReceiptEntity.java | 6 +++--- .../repository/WarehouseReceiptRepository.java | 11 ++++++++++- .../service/WarehouseReceiptService.java | 11 +++++++++++ src/main/resources/config/dictionary.json | 4 ++++ 7 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/CreateWarehouseReceiptDto.java b/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/CreateWarehouseReceiptDto.java index aa9ee9b7..dd244746 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/CreateWarehouseReceiptDto.java +++ b/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/CreateWarehouseReceiptDto.java @@ -10,7 +10,7 @@ import lombok.Data; import org.hibernate.annotations.Comment; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; @Data @@ -34,7 +34,7 @@ public class CreateWarehouseReceiptDto extends OrgCommonDto { private String warehouse; @Comment("单据日期") - private LocalDate receiptDate; + private LocalDateTime receiptDate; @OneToMany diff --git a/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/UpdateWarehouseReceiptDto.java b/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/UpdateWarehouseReceiptDto.java index 26589bfc..7ef69269 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/UpdateWarehouseReceiptDto.java +++ b/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/UpdateWarehouseReceiptDto.java @@ -10,7 +10,7 @@ import lombok.Data; import org.hibernate.annotations.Comment; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; @Data @@ -34,7 +34,7 @@ public class UpdateWarehouseReceiptDto extends OrgCommonDto { private String warehouse; @Comment("单据日期") - private LocalDate receiptDate; + private LocalDateTime receiptDate; @OneToMany diff --git a/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/WarehouseReceiptDto.java b/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/WarehouseReceiptDto.java index 2cd3a8c1..b5cc57f8 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/WarehouseReceiptDto.java +++ b/src/main/java/cn/lihongjie/coal/warehouseReceipt/dto/WarehouseReceiptDto.java @@ -12,7 +12,7 @@ import lombok.Data; import org.hibernate.annotations.Comment; import org.hibernate.annotations.Formula; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; @Data @@ -44,7 +44,7 @@ public class WarehouseReceiptDto extends OrgCommonDto { private WarehouseDto warehouse; @Comment("单据日期") - private LocalDate receiptDate; + private LocalDateTime receiptDate; @OneToMany diff --git a/src/main/java/cn/lihongjie/coal/warehouseReceipt/entity/WarehouseReceiptEntity.java b/src/main/java/cn/lihongjie/coal/warehouseReceipt/entity/WarehouseReceiptEntity.java index 3f499292..52e30253 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseReceipt/entity/WarehouseReceiptEntity.java +++ b/src/main/java/cn/lihongjie/coal/warehouseReceipt/entity/WarehouseReceiptEntity.java @@ -13,7 +13,7 @@ import lombok.Data; import org.hibernate.annotations.Comment; import org.hibernate.annotations.Formula; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.List; @Data @@ -44,10 +44,10 @@ public class WarehouseReceiptEntity extends OrgCommonEntity { @ManyToOne private WarehouseEntity warehouse; @Comment("单据日期") - private LocalDate receiptDate; + private LocalDateTime receiptDate; - @OneToMany + @OneToMany(mappedBy = "receipt") private List detail; diff --git a/src/main/java/cn/lihongjie/coal/warehouseReceipt/repository/WarehouseReceiptRepository.java b/src/main/java/cn/lihongjie/coal/warehouseReceipt/repository/WarehouseReceiptRepository.java index 476ffc1e..590f4bfb 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseReceipt/repository/WarehouseReceiptRepository.java +++ b/src/main/java/cn/lihongjie/coal/warehouseReceipt/repository/WarehouseReceiptRepository.java @@ -3,7 +3,16 @@ package cn.lihongjie.coal.warehouseReceipt.repository; import cn.lihongjie.coal.base.dao.BaseRepository; import cn.lihongjie.coal.warehouseReceipt.entity.WarehouseReceiptEntity; +import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; +import java.util.List; +import java.util.Set; + @Repository -public interface WarehouseReceiptRepository extends BaseRepository {} +public interface WarehouseReceiptRepository extends BaseRepository { + + @Query("select w from WarehouseReceiptEntity w join w.detail d where w.warehouse.id in ?1 and d.shelve.id in ?2 and d.goods.id in ?3 order by w.receiptDate asc ") + List findAllByWarehouseIdInAndShelveIdInAndGoodsIdIn(Set warehouseIds, Set shelveIds, Set goodsIds); + +} diff --git a/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java b/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java index a0581586..0a182426 100644 --- a/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java +++ b/src/main/java/cn/lihongjie/coal/warehouseReceipt/service/WarehouseReceiptService.java @@ -3,6 +3,7 @@ package cn.lihongjie.coal.warehouseReceipt.service; import cn.lihongjie.coal.base.dto.CommonQuery; import cn.lihongjie.coal.base.dto.IdRequest; import cn.lihongjie.coal.base.service.BaseService; +import cn.lihongjie.coal.warehouseGoodsSummary.service.WarehouseGoodsSummaryService; import cn.lihongjie.coal.warehouseReceipt.dto.CreateWarehouseReceiptDto; import cn.lihongjie.coal.warehouseReceipt.dto.UpdateWarehouseReceiptDto; import cn.lihongjie.coal.warehouseReceipt.dto.WarehouseReceiptDto; @@ -20,6 +21,8 @@ import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + @Service @Slf4j @Transactional @@ -31,10 +34,13 @@ public class WarehouseReceiptService @Autowired private ConversionService conversionService; + @Autowired WarehouseGoodsSummaryService warehouseGoodsSummaryService; + public WarehouseReceiptDto create(CreateWarehouseReceiptDto request) { WarehouseReceiptEntity entity = mapper.toEntity(request); this.repository.save(entity); + warehouseGoodsSummaryService.refresh(List.of(entity)); return getById(entity.getId()); } @@ -44,11 +50,16 @@ public class WarehouseReceiptService this.repository.save(entity); + warehouseGoodsSummaryService.refresh(List.of(entity)); + return getById(entity.getId()); } public void delete(IdRequest request) { + List allById = this.repository.findAllById(request.getIds()); this.repository.deleteAllById(request.getIds()); + + warehouseGoodsSummaryService.refresh(allById); } public WarehouseReceiptDto getById(String id) { diff --git a/src/main/resources/config/dictionary.json b/src/main/resources/config/dictionary.json index 666daf8a..9c2fa0ab 100644 --- a/src/main/resources/config/dictionary.json +++ b/src/main/resources/config/dictionary.json @@ -1957,6 +1957,10 @@ { "code": "1", "name": "出库单" + }, + { + "code": "2", + "name": "盘库单" } ]