From 5d0506d450de863b282de9504c0a1e5b0697bf46 Mon Sep 17 00:00:00 2001 From: starrysky <838252223@qq.com> Date: Sun, 22 Sep 2019 11:34:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=8A=A0=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CustomerOrderServiceImpl.java | 8 ++ .../domain/OutSourceProcessSheet.java | 3 +- ...utSourceProcessSheetProductRepository.java | 8 ++ .../UpdateOutSourceProcessSheetRequest.java | 7 +- .../rest/OutSourceProcessSheetController.java | 6 + ...tSourceProcessSheetProductServiceImpl.java | 50 ++++++- .../OutSourceProcessSheetServiceImpl.java | 126 +++++++++++++++++- 7 files changed, 198 insertions(+), 10 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java index 51ef97c3..859097e8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java @@ -139,6 +139,7 @@ public class CustomerOrderServiceImpl implements CustomerOrderService { @Override @Transactional(rollbackFor = Exception.class) public CustomerOrderDTO create(CreateCustomerOrderRequest createCustomerOrderRequest) { + Long totalMoney = 0L; //插入客户订单对应的产品信息 List customerOrderProductRequestList = createCustomerOrderRequest.getCustomerOrderProductList(); if(CollectionUtils.isEmpty(customerOrderProductRequestList)){ @@ -175,9 +176,16 @@ public class CustomerOrderServiceImpl implements CustomerOrderService { customerOrderProduct.setStatus(true); ProductInfo productInfo = productInfoRepository.findByProductCode(customerOrderProductRequest.getProductCode()); customerOrderProduct.setProductId(productInfo.getId()); + Long productNumber = customerOrderProduct.getProductNumber(); + Long unitPrice = customerOrderProduct.getUnitPrice(); + Long totalPrice = productNumber * unitPrice; + customerOrderProduct.setTotalPrice(totalPrice); + totalMoney = totalMoney + totalPrice; customerOrderProductList.add(customerOrderProduct); } + customerOrder.setTotalMoney(totalMoney); + customerOrderRepository.save(customerOrder); customerOrderProductRepository.saveAll(customerOrderProductList); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/domain/OutSourceProcessSheet.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/domain/OutSourceProcessSheet.java index ecd3b85b..25a52a55 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/domain/OutSourceProcessSheet.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/domain/OutSourceProcessSheet.java @@ -16,7 +16,8 @@ import java.io.Serializable; @Entity @Data @Table(name="s_out_source_process_sheet") -public class OutSourceProcessSheet implements Serializable { +public class +OutSourceProcessSheet implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/repository/OutSourceProcessSheetProductRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/repository/OutSourceProcessSheetProductRepository.java index d557b601..f7392fd9 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/repository/OutSourceProcessSheetProductRepository.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/repository/OutSourceProcessSheetProductRepository.java @@ -1,8 +1,10 @@ package me.zhengjie.modules.wms.outSourceProductSheet.repository; +import me.zhengjie.modules.wms.invoice.domain.InvoiceProduct; import me.zhengjie.modules.wms.outSourceProductSheet.domain.OutSourceProcessSheetProduct; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import java.util.List; @@ -20,4 +22,10 @@ public interface OutSourceProcessSheetProductRepository extends JpaRepository queryByOutSourceProcessSheetIdAndStatusTrue(Long outSourceProcessSheetId); + + List findByOutSourceProcessSheetIdAndStatusTrue(Long invoiceId); + + @Modifying + @Query(value = "delete s_out_source_process_sheet_product where product_code = ?1 and out_source_process_sheet_id = ?2", nativeQuery = true) + void deleteByProductCodeAndOutSourceProcessSheetId(String productCode, Long outSourceProcessSheetId); } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/request/UpdateOutSourceProcessSheetRequest.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/request/UpdateOutSourceProcessSheetRequest.java index 281f0036..23b1d73b 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/request/UpdateOutSourceProcessSheetRequest.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/request/UpdateOutSourceProcessSheetRequest.java @@ -1,6 +1,7 @@ package me.zhengjie.modules.wms.outSourceProductSheet.request; import lombok.Data; +import me.zhengjie.modules.wms.outSourceProductSheet.service.dto.OutSourceProcessSheetProductDTO; import java.io.Serializable; import java.util.List; @@ -11,6 +12,10 @@ import java.util.List; */ @Data public class UpdateOutSourceProcessSheetRequest implements Serializable { + + // 委外加工单主键 + private Long id; + // 委外加工公司名称 private String outSourceCompanyName; @@ -30,5 +35,5 @@ public class UpdateOutSourceProcessSheetRequest implements Serializable { private String outSourceProcessSheetCode; // 委外加工产品 - private List outSourceProcessSheetProductList; + private List outSourceProcessSheetProductList; } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/rest/OutSourceProcessSheetController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/rest/OutSourceProcessSheetController.java index 5743b1b4..316f5f93 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/rest/OutSourceProcessSheetController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/rest/OutSourceProcessSheetController.java @@ -72,4 +72,10 @@ public class OutSourceProcessSheetController { String supplierCode = "OS"+ LocalDateTime.now().format(fmt); return new ResponseEntity(supplierCode,HttpStatus.OK); } + + @Log("查看委外加工单") + @GetMapping(value = "/outSourceProcessSheet/{id}") + public ResponseEntity getOutSourceProcessSheet(@PathVariable Long id){ + return new ResponseEntity(outSourceProcessSheetService.findById(id), HttpStatus.OK); + } } \ No newline at end of file diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetProductServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetProductServiceImpl.java index e7b6db6a..1803e91a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetProductServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetProductServiceImpl.java @@ -1,5 +1,6 @@ package me.zhengjie.modules.wms.outSourceProductSheet.service.impl; +import me.zhengjie.modules.wms.bd.domain.CustomerInfo; import me.zhengjie.modules.wms.outSourceProductSheet.domain.OutSourceProcessSheetProduct; import me.zhengjie.utils.ValidationUtil; import me.zhengjie.modules.wms.outSourceProductSheet.repository.OutSourceProcessSheetProductRepository; @@ -8,14 +9,24 @@ import me.zhengjie.modules.wms.outSourceProductSheet.service.dto.OutSourceProces import me.zhengjie.modules.wms.outSourceProductSheet.service.dto.OutSourceProcessSheetProductQueryCriteria; import me.zhengjie.modules.wms.outSourceProductSheet.service.mapper.OutSourceProcessSheetProductMapper; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; import java.util.Optional; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import me.zhengjie.utils.PageUtil; import me.zhengjie.utils.QueryHelp; +import org.springframework.util.CollectionUtils; + +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Predicate; +import javax.persistence.criteria.Root; /** * @author jie @@ -33,13 +44,46 @@ public class OutSourceProcessSheetProductServiceImpl implements OutSourceProcess @Override public Object queryAll(OutSourceProcessSheetProductQueryCriteria criteria, Pageable pageable){ - Page page = outSourceProcessSheetProductRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(outSourceProcessSheetProductMapper::toDto)); + Specification specification = new Specification() { + @Override + public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder) { + + List targetPredicateList = new ArrayList<>(); + + Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); + targetPredicateList.add(statusPredicate); + + if(CollectionUtils.isEmpty(targetPredicateList)){ + return null; + }else{ + return criteriaBuilder.and(targetPredicateList.toArray(new Predicate[targetPredicateList.size()])); + } + } + }; + Page page = outSourceProcessSheetProductRepository.findAll(specification,pageable); + Page outSourceProcessSheetProductDTOPage = page.map(outSourceProcessSheetProductMapper::toDto); + return PageUtil.toPage(outSourceProcessSheetProductDTOPage); } @Override public Object queryAll(OutSourceProcessSheetProductQueryCriteria criteria){ - return outSourceProcessSheetProductMapper.toDto(outSourceProcessSheetProductRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + Specification specification = new Specification() { + @Override + public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder) { + + List targetPredicateList = new ArrayList<>(); + + Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); + targetPredicateList.add(statusPredicate); + + if(CollectionUtils.isEmpty(targetPredicateList)){ + return null; + }else{ + return criteriaBuilder.and(targetPredicateList.toArray(new Predicate[targetPredicateList.size()])); + } + } + }; + return outSourceProcessSheetProductMapper.toDto(outSourceProcessSheetProductRepository.findAll(specification)); } @Override diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java index 20da8b4c..dadda0a5 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java @@ -1,6 +1,11 @@ package me.zhengjie.modules.wms.outSourceProductSheet.service.impl; import me.zhengjie.exception.BadRequestException; +import me.zhengjie.modules.wms.invoice.domain.Invoice; +import me.zhengjie.modules.wms.invoice.domain.InvoiceProduct; +import me.zhengjie.modules.wms.invoice.service.dto.InvoiceDTO; +import me.zhengjie.modules.wms.invoice.service.dto.InvoiceDetailDTO; +import me.zhengjie.modules.wms.invoice.service.dto.InvoiceProductDTO; import me.zhengjie.modules.wms.outSourceProductSheet.domain.OutSourceProcessSheet; import me.zhengjie.modules.wms.outSourceProductSheet.domain.OutSourceProcessSheetProduct; import me.zhengjie.modules.wms.outSourceProductSheet.repository.OutSourceProcessSheetProductRepository; @@ -8,6 +13,7 @@ import me.zhengjie.modules.wms.outSourceProductSheet.request.CreateOutSourceProc import me.zhengjie.modules.wms.outSourceProductSheet.request.OutSourceProcessSheetProductRequest; import me.zhengjie.modules.wms.outSourceProductSheet.request.UpdateOutSourceProcessSheetRequest; import me.zhengjie.modules.wms.outSourceProductSheet.service.dto.OutSourceProcessSheetProductDTO; +import me.zhengjie.modules.wms.outSourceProductSheet.service.mapper.OutSourceProcessSheetProductMapper; import me.zhengjie.utils.ValidationUtil; import me.zhengjie.modules.wms.outSourceProductSheet.repository.OutSourceProcessSheetRepository; import me.zhengjie.modules.wms.outSourceProductSheet.service.OutSourceProcessSheetService; @@ -16,13 +22,18 @@ import me.zhengjie.modules.wms.outSourceProductSheet.service.dto.OutSourceProces import me.zhengjie.modules.wms.outSourceProductSheet.service.mapper.OutSourceProcessSheetMapper; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.Optional; +import java.util.function.Function; +import java.util.stream.Collectors; + import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import me.zhengjie.utils.PageUtil; @@ -30,6 +41,11 @@ import me.zhengjie.utils.QueryHelp; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Predicate; +import javax.persistence.criteria.Root; + /** * @author jie * @date 2019-08-17 @@ -47,22 +63,70 @@ public class OutSourceProcessSheetServiceImpl implements OutSourceProcessSheetSe @Autowired private OutSourceProcessSheetMapper outSourceProcessSheetMapper; + @Autowired + private OutSourceProcessSheetProductMapper outSourceProcessSheetProductMapper; + @Override public Object queryAll(OutSourceProcessSheetQueryCriteria criteria, Pageable pageable){ - Page page = outSourceProcessSheetRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); + Specification specification = new Specification() { + @Override + public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder) { + + List targetPredicateList = new ArrayList<>(); + + Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); + targetPredicateList.add(statusPredicate); + + if(CollectionUtils.isEmpty(targetPredicateList)){ + return null; + }else{ + return criteriaBuilder.and(targetPredicateList.toArray(new Predicate[targetPredicateList.size()])); + } + } + }; + Page page = outSourceProcessSheetRepository.findAll(specification,pageable); return PageUtil.toPage(page.map(outSourceProcessSheetMapper::toDto)); } @Override public Object queryAll(OutSourceProcessSheetQueryCriteria criteria){ - return outSourceProcessSheetMapper.toDto(outSourceProcessSheetRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + Specification specification = new Specification() { + @Override + public Predicate toPredicate(Root root, CriteriaQuery criteriaQuery, CriteriaBuilder criteriaBuilder) { + + List targetPredicateList = new ArrayList<>(); + + Predicate statusPredicate = criteriaBuilder.equal(root.get("status"), 1); + targetPredicateList.add(statusPredicate); + + if(CollectionUtils.isEmpty(targetPredicateList)){ + return null; + }else{ + return criteriaBuilder.and(targetPredicateList.toArray(new Predicate[targetPredicateList.size()])); + } + } + }; + return outSourceProcessSheetMapper.toDto(outSourceProcessSheetRepository.findAll(specification)); } @Override public OutSourceProcessSheetDTO findById(Long id) { - Optional sOutSourceProcessSheet = outSourceProcessSheetRepository.findById(id); - ValidationUtil.isNull(sOutSourceProcessSheet,"SOutSourceProcessSheet","id",id); - return outSourceProcessSheetMapper.toDto(sOutSourceProcessSheet.get()); +// Optional sOutSourceProcessSheet = outSourceProcessSheetRepository.findById(id); +// ValidationUtil.isNull(sOutSourceProcessSheet,"SOutSourceProcessSheet","id",id); +// return outSourceProcessSheetMapper.toDto(sOutSourceProcessSheet.get()); + + + Optional invoiceOptional = outSourceProcessSheetRepository.findById(id); + OutSourceProcessSheet outSourceProcessSheet = invoiceOptional.get(); + OutSourceProcessSheetDTO outSourceProcessSheetDTO = outSourceProcessSheetMapper.toDto(outSourceProcessSheet); + + + List outSourceProcessSheetProductList = outSourceProcessSheetProductRepository.findByOutSourceProcessSheetIdAndStatusTrue(id); + if(!CollectionUtils.isEmpty(outSourceProcessSheetProductList)){ + List outSourceProcessSheetProductDTOList = outSourceProcessSheetProductMapper.toDto(outSourceProcessSheetProductList); + outSourceProcessSheetDTO.setOutSourceProcessSheetProductList(outSourceProcessSheetProductDTOList); + } + return outSourceProcessSheetDTO; } @Override @@ -116,6 +180,58 @@ public class OutSourceProcessSheetServiceImpl implements OutSourceProcessSheetSe @Override @Transactional(rollbackFor = Exception.class) public void update(UpdateOutSourceProcessSheetRequest updateOutSourceProcessSheetRequest) { + OutSourceProcessSheet outSourceProcessSheet = new OutSourceProcessSheet(); + BeanUtils.copyProperties(updateOutSourceProcessSheetRequest, outSourceProcessSheet); + + outSourceProcessSheet.setStatus(true); + + outSourceProcessSheetRepository.save(outSourceProcessSheet); + + // 修改产品信息之前，查询该订单中原来的产品信息，key为产品code + List outSourceProcessSheetProductListBeforeUpdate = outSourceProcessSheetProductRepository.findByOutSourceProcessSheetIdAndStatusTrue(outSourceProcessSheet.getId()); + Map outSourceProcessSheetProductMapBefore = outSourceProcessSheetProductListBeforeUpdate.stream().collect(Collectors.toMap(OutSourceProcessSheetProduct::getProductCode, Function.identity())); + + List outSourceProcessSheetProductRequestList = updateOutSourceProcessSheetRequest.getOutSourceProcessSheetProductList(); + if(CollectionUtils.isEmpty(outSourceProcessSheetProductRequestList)){ + throw new BadRequestException("委外加工单产品不能为空!"); + } + + Map invoiceProductMapAfter = outSourceProcessSheetProductRequestList.stream().collect(Collectors.toMap(OutSourceProcessSheetProductDTO::getProductCode, Function.identity())); + + //需要将订单中原来订单对应的产品删除了的数据 + List deleteTargetList = new ArrayList<>(); + //比较量个map中，key不一样的数据 + for(Map.Entry entry:outSourceProcessSheetProductMapBefore.entrySet()){ + String productCode = entry.getKey(); + //修改后的map记录对应的key在原来中是否存在 + OutSourceProcessSheetProductDTO outSourceProcessSheetProductDTOTemp = invoiceProductMapAfter.get(productCode); + if(null == outSourceProcessSheetProductDTOTemp){ + deleteTargetList.add(entry.getKey()); + } + + } + + + List outSourceProcessSheetProductList = new ArrayList<>(); + for(OutSourceProcessSheetProductDTO outSourceProcessSheetProductDTO : outSourceProcessSheetProductRequestList){ + OutSourceProcessSheetProduct outSourceProcessSheetProduct = new OutSourceProcessSheetProduct(); + BeanUtils.copyProperties(outSourceProcessSheetProductDTO, outSourceProcessSheetProduct); + outSourceProcessSheetProduct.setOutSourceProcessSheetId(outSourceProcessSheet.getId()); + outSourceProcessSheetProduct.setStatus(true); + } + outSourceProcessSheetProductRepository.saveAll(outSourceProcessSheetProductList); + + /** + * 场景描述: + * 1.刚开始新增了 a b c三种产品 + * 2.修改的时候删除了 a c两种产品 + * 3.所以需要查修改前数据库中有的产品，再比较修改传过来的产品数据，如果修改后的在原来里面没有，需要将原来里面对应的删除 + */ + if(!CollectionUtils.isEmpty(deleteTargetList)){ + for(String prductCode : deleteTargetList){ + outSourceProcessSheetProductRepository.deleteByProductCodeAndOutSourceProcessSheetId(prductCode, outSourceProcessSheet.getId()); + } + } }