From e8a75a44bdc130e8b162351c3c94c01f3d8ada5e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 10 八月 2023 17:58:00 +0800
Subject: [PATCH] 入库+发货
---
sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java b/sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
index df08cff..f661cff 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
+++ b/sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
@@ -7,10 +7,11 @@
import com.yuanchu.mom.pojo.Sale;
import com.yuanchu.mom.mapper.SaleMapper;
import com.yuanchu.mom.pojo.SaleMaterial;
+import com.yuanchu.mom.pojo.dto.ConsignmentDto1;
+import com.yuanchu.mom.pojo.dto.ConsignmentDto2;
import com.yuanchu.mom.pojo.dto.SaleDto;
import com.yuanchu.mom.pojo.dto.SaleMaterialDto;
import com.yuanchu.mom.pojo.dto.vo.SaleVo;
-import com.yuanchu.mom.service.SaleMaterialService;
import com.yuanchu.mom.service.SaleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
@@ -20,7 +21,6 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -136,4 +136,26 @@
sale.setCheckTime(new Date());
saleMapper.updateById(sale);
}
+
+ //鏍规嵁璁㈠崟鍙锋煡璇㈤攢鍞俊鎭�
+ @Override
+ public ConsignmentDto1 selSale(String orderNumber) {
+ Sale sale = saleMapper.selectOne(Wrappers.<Sale>query().eq("order_number", orderNumber));
+ List<SaleMaterial> saleMaterials = saleMaterialMapper.selectList(Wrappers.<SaleMaterial>query().eq("sale_id", sale.getId()));
+ List<ConsignmentDto2> dto2List = saleMaterials.stream().map(saleMaterial -> {
+ ConsignmentDto2 consignmentDto2 = new ConsignmentDto2();
+ BeanUtils.copyProperties(saleMaterial, consignmentDto2);
+ return consignmentDto2;
+ }).collect(Collectors.toList());
+ ConsignmentDto1 consignmentDto1 = ConsignmentDto1.builder()
+ .orderCode(orderNumber)
+ .customerCode(sale.getCode())
+ .proname(sale.getProname())
+ .adress(sale.getAdress())
+ .username(sale.getUsername())
+ .phone(sale.getPhone())
+ .messages(dto2List)
+ .build();
+ return consignmentDto1;
+ }
}
--
Gitblit v1.9.3