From 19b596d3c05b1ca7ff80d8b802e7f6e03ad77dad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 九月 2023 18:02:17 +0800
Subject: [PATCH] 修改 9.11
---
inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 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..c26a616 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
@@ -16,6 +16,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Date;
@@ -43,21 +44,22 @@
//鏌ヨ閿�鍞崟鍒楄〃
@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) {
+ @Transactional(rollbackFor = Exception.class)
+ 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 +71,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();
@@ -82,6 +84,7 @@
//鏍规嵁閿�鍞崟id鍒犻櫎
@Override
+ @Transactional(rollbackFor = Exception.class)
public void delSale(Integer id) {
Sale sale = saleMapper.selectById(id);
sale.setState(0);
@@ -95,6 +98,7 @@
//鏍规嵁id鎵归噺鍒犻櫎
@Override
+ @Transactional(rollbackFor = Exception.class)
public void delAllSale(List<Integer> ids) {
List<Sale> sales = saleMapper.selectBatchIds(ids);
for (Sale sale : sales) {
@@ -110,45 +114,53 @@
//鏍规嵁閿�鍞崟id淇敼淇℃伅
@Override
+ @Transactional(rollbackFor = Exception.class)
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);
- //鏇存柊閿�鍞骇鍝佸崟
- saleMaterialMapper.updateById(saleMaterial);
- }
+ List<SaleMaterialDto> saleMaterialDtos = saleVo.getSaleMaterialList();
+ for (SaleMaterialDto saleMaterialDto : saleMaterialDtos) {
+ SaleMaterial saleMaterial = new SaleMaterial();
+ BeanUtils.copyProperties(saleMaterialDto, saleMaterial);
+ saleMaterialMapper.updateById(saleMaterial);
}
}
//瀹℃牳
@Override
- public void check(String checkname,Integer id,Integer type) {
+ @Transactional(rollbackFor = Exception.class)
+ 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) {
- //濡傛灉瀹℃牳閫氳繃
- sale.setBianzhiState(1);
- }else {
- //濡傛灉瀹℃牳涓嶉�氳繃
- sale.setBianzhiState(null);
- }
saleMapper.updateById(sale);
+ //瀹℃牳閫氳繃鐨勯攢鍞崟灏嗛攢鍞崟涓殑浜у搧鐨勭姸鎬佹敼涓哄緟缂栧埗0
+ List<SaleMaterial> saleMaterials = saleMaterialMapper.selectList(Wrappers.<SaleMaterial>query()
+ .eq("sale_id", id)
+ .eq("state", 1));
+ if (type == 1) {
+ for (SaleMaterial saleMaterial : saleMaterials) {
+ saleMaterial.setType(0);
+ saleMaterialMapper.updateById(saleMaterial);
+ }
+ }
}
//鏍规嵁璁㈠崟鍙锋煡璇㈤攢鍞俊鎭�
@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