From d9e5ab959b7ff2c578672938c205a7a82765ef9f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 15 八月 2023 09:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
similarity index 95%
rename from sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
rename to inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
index f661cff..bffc773 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
@@ -11,7 +11,7 @@
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.pojo.vo.SaleVo;
import com.yuanchu.mom.service.SaleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
@@ -53,7 +53,7 @@
BeanUtils.copyProperties(saleDto,sale);
sale.setSaleman(saleman);
saleMapper.insert(sale);
- //濡傛灉saleMaterialList鏈夊��,闇�瑕佹坊鍔犻攢鍞骇鍝佸崟
+ //娣诲姞閿�鍞骇鍝佸崟
List<SaleMaterialDto> saleMaterialDtoList = saleDto.getSaleMaterialList();
for (SaleMaterialDto saleMaterialDto : saleMaterialDtoList) {
SaleMaterial saleMaterial = new SaleMaterial();
@@ -134,6 +134,13 @@
sale.setType(type);
sale.setCheckname(checkname);
sale.setCheckTime(new Date());
+ if (type==1) {
+ //濡傛灉瀹℃牳閫氳繃
+ sale.setBianzhiState(1);
+ }else {
+ //濡傛灉瀹℃牳涓嶉�氳繃
+ sale.setBianzhiState(null);
+ }
saleMapper.updateById(sale);
}
--
Gitblit v1.9.3