From f9e06198cfbccf337b53c0fa6cb3404455ceb0ba Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 09 九月 2023 09:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 8b1ebbf..616b11a 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
@@ -116,14 +116,11 @@
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);
}
}
@@ -134,14 +131,17 @@
sale.setType(type);
sale.setCheckname(checkname);
sale.setCheckTime(new Date());
- if (type == 1) {
- //濡傛灉瀹℃牳閫氳繃
- sale.setBianzhiState(1);
- } else {
- //濡傛灉瀹℃牳涓嶉�氳繃
- sale.setBianzhiState(2);//鏃犵紪鍒�
- }
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);
+ }
+ }
}
//鏍规嵁璁㈠崟鍙锋煡璇㈤攢鍞俊鎭�
--
Gitblit v1.9.3