From 772ce1ff99b32e0d8c5ee1135f8a9fb03eb9fc60 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 15 八月 2023 14:51:13 +0800
Subject: [PATCH] 添加校验
---
inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
index bffc773..8b1ebbf 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
@@ -43,21 +43,21 @@
//鏌ヨ閿�鍞崟鍒楄〃
@Override
public IPage<Map<String, Object>> selectSaleList(Page<Object> page, String orderNumber, String name, Integer type, String delTime) {
- return saleMapper.selectSaleList(page,orderNumber,name,type,delTime);
+ return saleMapper.selectSaleList(page, orderNumber, name, type, delTime);
}
//鏂板閿�鍞崟
@Override
- public String addSale(String saleman,SaleDto saleDto) {
+ public String addSale(String saleman, SaleDto saleDto) {
Sale sale = new Sale();
- BeanUtils.copyProperties(saleDto,sale);
+ BeanUtils.copyProperties(saleDto, sale);
sale.setSaleman(saleman);
saleMapper.insert(sale);
//娣诲姞閿�鍞骇鍝佸崟
List<SaleMaterialDto> saleMaterialDtoList = saleDto.getSaleMaterialList();
for (SaleMaterialDto saleMaterialDto : saleMaterialDtoList) {
SaleMaterial saleMaterial = new SaleMaterial();
- BeanUtils.copyProperties(saleMaterialDto,saleMaterial);
+ BeanUtils.copyProperties(saleMaterialDto, saleMaterial);
saleMaterial.setSaleId(sale.getId());
saleMaterialMapper.insert(saleMaterial);
}
@@ -69,7 +69,7 @@
public SaleVo selectSaleDatil(Integer id) {
SaleVo saleVo = new SaleVo();
Sale sale = saleMapper.selectById(id);
- BeanUtils.copyProperties(sale,saleVo);
+ BeanUtils.copyProperties(sale, saleVo);
List<SaleMaterial> saleMaterialList = saleMaterialMapper.selectSaleDatil(id);//閿�鍞崟id
List<SaleMaterialDto> saleMaterialDtoList = saleMaterialList.stream().map(saleMaterial -> {
SaleMaterialDto saleMaterialDto = new SaleMaterialDto();
@@ -113,14 +113,14 @@
public void updateSaleById(String saleman, Integer id, SaleVo saleVo) {
Sale sale = saleMapper.selectById(id);
sale.setSaleman(saleman);
- BeanUtils.copyProperties(saleVo,sale);
+ BeanUtils.copyProperties(saleVo, sale);
//鏇存柊閿�鍞崟
saleMapper.updateById(sale);
List<SaleMaterial> saleMaterials = saleMaterialMapper.selectSaleDatil(id);
for (SaleMaterial saleMaterial : saleMaterials) {
List<SaleMaterialDto> saleMaterialDtos = saleVo.getSaleMaterialList();
for (SaleMaterialDto saleMaterialDto : saleMaterialDtos) {
- BeanUtils.copyProperties(saleMaterialDto,saleMaterial);
+ BeanUtils.copyProperties(saleMaterialDto, saleMaterial);
//鏇存柊閿�鍞骇鍝佸崟
saleMaterialMapper.updateById(saleMaterial);
}
@@ -129,17 +129,17 @@
//瀹℃牳
@Override
- public void check(String checkname,Integer id,Integer type) {
+ public void check(String checkname, Integer id, Integer type) {
Sale sale = saleMapper.selectById(id);
sale.setType(type);
sale.setCheckname(checkname);
sale.setCheckTime(new Date());
- if (type==1) {
+ if (type == 1) {
//濡傛灉瀹℃牳閫氳繃
sale.setBianzhiState(1);
- }else {
+ } else {
//濡傛灉瀹℃牳涓嶉�氳繃
- sale.setBianzhiState(null);
+ sale.setBianzhiState(2);//鏃犵紪鍒�
}
saleMapper.updateById(sale);
}
@@ -147,8 +147,14 @@
//鏍规嵁璁㈠崟鍙锋煡璇㈤攢鍞俊鎭�
@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()));
+ Sale sale = saleMapper.selectOne(Wrappers.<Sale>query()
+ .eq("order_number", orderNumber)
+ .eq("type", 1)
+ .eq("state", 1));
+ //鏌ヨ閿�鍞崟涓骇鍝佷俊鎭�
+ List<SaleMaterial> saleMaterials = saleMaterialMapper.selectList(Wrappers.<SaleMaterial>query()
+ .eq("sale_id", sale.getId())
+ .eq("state", 1));
List<ConsignmentDto2> dto2List = saleMaterials.stream().map(saleMaterial -> {
ConsignmentDto2 consignmentDto2 = new ConsignmentDto2();
BeanUtils.copyProperties(saleMaterial, consignmentDto2);
--
Gitblit v1.9.3