From 2fb28b36f15de26249ae34160e1accf118c011c7 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 17 十一月 2023 16:47:17 +0800
Subject: [PATCH] Changes16
---
mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerServiceImpl.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerServiceImpl.java
index d85b3ac..f5db505 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerServiceImpl.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/service/impl/CustomerServiceImpl.java
@@ -18,20 +18,24 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.chinaztt.mes.plan.dto.CustomerDTO;
import com.chinaztt.mes.plan.entity.Customer;
import com.chinaztt.mes.plan.entity.CustomerOrder;
import com.chinaztt.mes.plan.mapper.CustomerMapper;
import com.chinaztt.mes.plan.mapper.CustomerOrderMapper;
+import com.chinaztt.mes.plan.service.CustomerOrderService;
import com.chinaztt.mes.plan.service.CustomerService;
import com.chinaztt.mes.plan.state.auditstate.constant.AuditStateStringValues;
import com.chinaztt.mes.plan.state.orderstate.constant.CustomerOrderStateStringValues;
+import com.chinaztt.mes.plan.vo.CustomerOrderVO;
+import com.chinaztt.mes.plan.vo.CustomerVO;
import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 瀹㈡埛璁㈠崟涓昏〃
@@ -45,24 +49,44 @@
private CustomerOrderMapper customerOrderMapper;
+ private CustomerOrderService customerOrderService;
@Override
- public boolean saveDto(CustomerDTO customerDTO) {
- //瀹㈡埛璁㈠崟鍙� ZTTIC20220001
+ public boolean saveDto(CustomerVO customerVO) {
+ /*鏂板瀹㈡埛璁㈠崟涓昏〃*/
+ //瀹㈡埛璁㈠崟鍙� ZTMSLS2023101801
+ Customer customer = new Customer();
+ BeanUtils.copyProperties(customerVO,customer);
String contractNo = contractNoMake();
- customerDTO.setContractNo(contractNo);
- baseMapper.insert(customerDTO);
- CustomerOrder customerOrder = customerDTO.getCustomerOrder();
- customerOrder.setCustomerId(customerDTO.getId());
- customerOrder.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK);
- customerOrder.setIsAudit(AuditStateStringValues.DRAFT);
- customerOrder.setSalesmanName(customerDTO.getSalesMan());
- customerOrder.setDivision(customerDTO.getSalesDepartment());
- customerOrder.setCustomerName(customerDTO.getCustomerName());
- customerOrder.setOtcPartSync(true);
- customerOrder.setCustomerOrderNo(contractNo);
- customerOrder.setOtcPartSync(false);
- customerOrder.setSalesPartNo(customerDTO.getCustomerOrder().getPartNo());
- customerOrderMapper.insert(customerOrder);
+ customer.setContractNo(contractNo); //鍚堝悓鍙�
+ baseMapper.insert(customer);
+ /*鎵归噺鏂板瀹㈡埛璁㈠崟浜у搧琛�*/
+ List<CustomerOrderVO> customerOrderVOList = customerVO.getCustomerOrderVOList();
+ List<CustomerOrder> customerOrders = customerOrderVOList.stream().map(customerOrderVO -> {
+ CustomerOrder customerOrder = new CustomerOrder();
+ BeanUtils.copyProperties(customerOrderVO, customerOrder);
+ //鍚堝悓鍙�
+ customerOrder.setCustomerOrderNo(customer.getContractNo());
+ //瀹㈡埛鍙�
+ customerOrder.setCustomerNo(customer.getCustomerNo());
+ //瀹㈡埛鍚嶇О
+ customerOrder.setCustomerName(customer.getCustomerName());
+ //宸ョ▼鍚嶇О
+ customerOrder.setEntityName(customer.getEntityName());
+ //鏈熸湜浜よ揣鏃堕棿
+ customerOrder.setWantedDeliveryDate(customerVO.getDeliveryDate());
+ //涓氬姟鍛�
+ customerOrder.setSalesmanName(customer.getSalesMan());
+ //鐘舵��:宸ヨ壓鏂囦欢寰呴��
+ customerOrder.setCoState(CustomerOrderStateStringValues.TECHNOLOGYUNCHECK);
+ //瀹℃牳鐘舵�佷负 01draft 鑽夌
+ customerOrder.setIsAudit(AuditStateStringValues.DRAFT);
+ //鏉ユ簮 1:鎵嬪姩
+ customerOrder.setSourceId("1");
+ //鍏宠仈涓昏〃id
+ customerOrder.setCustomerId(customer.getId());
+ return customerOrder;
+ }).collect(Collectors.toList());
+ customerOrderService.saveBatch(customerOrders);
return true;
}
--
Gitblit v1.9.3