From 4ad61e4c257621124625a89853eaa8334a11b0be Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 09 九月 2023 11:26:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java | 130 ++++++++++++++----------------------------
1 files changed, 44 insertions(+), 86 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java
index adbb905..2e2d137 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.ConsignmentMapper;
@@ -16,11 +18,13 @@
import com.yuanchu.mom.utils.MyUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* 鎴愬搧鍙戣揣琛�(Consignment)琛ㄦ湇鍔″疄鐜扮被
@@ -42,28 +46,26 @@
//鏂板鎴愬搧鍙戣揣
@Override
+ @Transactional(rollbackFor = Exception.class)
public String addCon(String name, ConsignmentDto consignmentDto) {
//鐢熸垚涓�涓娂杩愬崟缂栧彿
- String escortCode = MyUtil.getTimeSixNumberCode("YY");
- //濡傛灉璇ヨ鍗曞凡缁忓彂杩囪揣浜嗕笉鑳藉啀鍙戣揣
+ String escortCode = MyUtil.getTimeSixNumberCode("YY", "num");
List<Consignment> consignments = consignmentMapper.selectAll();
- //濡傛灉娌℃湁鍙戣揣琛ㄤ腑娌℃湁鏁版嵁涔熷彲浠ュ彂璐�
- if (consignments.size()==0) {
+ //濡傛灉鍙戣揣琛ㄤ腑娌℃湁鏁版嵁涔熷彲浠ュ彂璐�
+ if (consignments.size() == 0) {
/*鏂板鎴愬搧鍙戣揣*/
- String mes1 = addConsign(name, consignmentDto, escortCode);
- return mes1;
- } else {
- for (Consignment consignment : consignments) {
- if (consignment.getCustomerCode().equals(consignmentDto.getCustomerCode())) {
- return "璇ュ悎鍚岃鍗曞凡鍙戣繃璐�,鏃犳硶鍐嶆鍙戣揣!";
- } else {
- /*鏂板鎴愬搧鍙戣揣*/
- String mes2 = addConsign(name, consignmentDto, escortCode);
- return mes2;
- }
- }
+ return addConsign(name, consignmentDto, escortCode);
}
- return null;
+ //鑾峰彇鍙戣揣琛ㄤ腑鐨勫悎鍚岀紪鍙烽泦鍚�
+ List<String> customerCodeList = consignments.stream().map(consignment -> {
+ String customerCode = consignment.getCustomerCode();
+ return customerCode;
+ }).distinct().collect(Collectors.toList());
+ if (customerCodeList.contains(consignmentDto.getCustomerCode())) {
+ return "璇ュ悎鍚岃鍗曞凡鍙戣繃璐�,鏃犳硶鍐嶆鍙戣揣!";
+ }
+ /*鏂板鎴愬搧鍙戣揣*/
+ return addConsign(name, consignmentDto, escortCode);
}
//鏌ヨ鍙戣揣璁板綍鍒楄〃
@@ -72,85 +74,41 @@
return consignmentMapper.selectAllCon(page, name, specifications, time);
}
- //鏍规嵁id鍒犻櫎
- @Override
- public void delCon(Integer id) {
- //鍒犻櫎鍙戣揣璁板綍
- Consignment consignment = consignmentMapper.selectById(id);
- consignment.setState(0);
- consignmentMapper.updateById(consignment);
- //搴撳瓨涔熻鏂板
- LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(Repertory::getCode, consignment.getCode())
- .eq(Repertory::getName, consignment.getName())
- .eq(Repertory::getSpecifications, consignment.getSpecifications())
- .eq(Repertory::getUnit, consignment.getUnit())
- .eq(Repertory::getType, 0) //鎴愬搧鍙戣揣
- .eq(Repertory::getCheckState, 1); //鍙湁宸叉楠屾墠鑳藉彂璐�
- Repertory repertory = repertoryMapper.selectOne(queryWrapper);
- repertory.setNumber(repertory.getNumber() + consignment.getNumber());
- repertoryMapper.updateById(repertory);
- }
-
- //鎵归噺鍒犻櫎
- @Override
- public void delAllCon(List<Integer> ids) {
- List<Consignment> consignments = consignmentMapper.selectBatchIds(ids);
- for (Consignment consignment : consignments) {
- consignment.setState(0);
- //鍒犻櫎鍙戣揣璁板綍
- consignmentMapper.updateById(consignment);
- //搴撳瓨鏂板
- LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(Repertory::getCode, consignment.getCode())
- .eq(Repertory::getName, consignment.getName())
- .eq(Repertory::getSpecifications, consignment.getSpecifications())
- .eq(Repertory::getUnit, consignment.getUnit())
- .eq(Repertory::getType, 0) //鎴愬搧鍙戣揣
- .eq(Repertory::getCheckState, 1); //鍙湁宸叉楠屾墠鑳藉彂璐�
- Repertory repertory = repertoryMapper.selectOne(queryWrapper);
- repertory.setNumber(repertory.getNumber() + consignment.getNumber());
- repertoryMapper.updateById(repertory);
- }
- }
-
-
//鏂板鍙戣揣涓�绯诲垪鎿嶄綔
private String addConsign(String name, ConsignmentDto consignmentDto, String escortCode) {
/*鏂板鎴愬搧鍙戣揣*/
List<ConsignmentDto2> messages = consignmentDto.getMessages();
for (ConsignmentDto2 message : messages) {
- //鏌ヨ浜у搧缂栫爜(閫氳繃鍦ㄦ垚鍝佸簱瀛樿〃涓殑浜у搧鍚嶇О,瑙勬牸鍨嬪彿浠ュ強鍗曚綅杩涜鏌ユ壘)
+ //鏌ヨ浜у搧搴撳瓨鏁伴噺
LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Repertory::getName, message.getName())
.eq(Repertory::getSpecifications, message.getSpecifications())
.eq(Repertory::getUnit, message.getUnit())
- .eq(Repertory::getType, 0);
+ .eq(Repertory::getType, 0)
+ .eq(Repertory::getOrderCode, consignmentDto.getOrderCode());
Repertory repertory = repertoryMapper.selectOne(queryWrapper);
- //璇ユ垚鍝佺殑妫�楠岀姸鎬佹槸宸叉楠�1鎵嶈兘杩涜鍙戣揣
- if (repertory.getCheckState() == 1) {
- //璇ユ垚鍝佸簱瀛樼殑鏁伴噺澶т簬绛変簬鍙戣揣鐨勬暟閲忔墠鑳借繘琛屽彂璐�
- if (repertory.getNumber() >= message.getNumber()) {
- //鏋勯�犳垚鍝佸彂璐у疄浣撶被
- Consignment consig = Consignment.builder()
- .customerCode(consignmentDto.getCustomerCode())
- .escortCode(escortCode)
- .orderCode(consignmentDto.getOrderCode())
- .userName(name)
- .checkName(consignmentDto.getCheckName())
- .fitName(consignmentDto.getFitName())
- .name(message.getName())
- .specifications(message.getSpecifications())
- .unit(message.getUnit())
- .number(message.getNumber())
- .code(repertory.getCode())
- .build();
- consignmentMapper.insert(consig);
- /*鍑忓皯瀵瑰簲鐨勫簱瀛�*/
- repertory.setNumber(repertory.getNumber() - consig.getNumber());
- repertoryMapper.updateById(repertory);
- } else return "搴撳瓨涓嶈冻,鏃犳硶鍙戣揣!";
- } else return "璇ヤ骇鍝佽繕鏈楠�,涓嶈兘鍙戣揣!";
+ //璇ユ垚鍝佸簱瀛樹笉涓虹┖涓旀暟閲忓ぇ浜庣瓑浜庡彂璐х殑鏁伴噺鎵嶈兘杩涜鍙戣揣
+ if (ObjectUtils.isNotEmpty(repertory) && repertory.getNumber() < message.getNumber()) {
+ return "搴撳瓨涓嶈冻,鏃犳硶鍙戣揣!";
+ }
+ //鏋勯�犳垚鍝佸彂璐у疄浣撶被
+ Consignment consig = Consignment.builder()
+ .customerCode(consignmentDto.getCustomerCode())
+ .escortCode(escortCode)
+ .orderCode(consignmentDto.getOrderCode())
+ .userName(name)
+ .checkName(consignmentDto.getCheckName())
+ .fitName(consignmentDto.getFitName())
+ .name(message.getName())
+ .specifications(message.getSpecifications())
+ .unit(message.getUnit())
+ .number(message.getNumber())
+ .qualityTraceability(repertory.getQualityTraceability())
+ .build();
+ consignmentMapper.insert(consig);
+ /*鍑忓皯瀵瑰簲鐨勫簱瀛�*/
+ repertory.setNumber(repertory.getNumber() - consig.getNumber());
+ repertoryMapper.updateById(repertory);
}
/*鍙戣揣鎴愬姛涔嬪悗闇�瑕佹柊澧炰竴寮犲洖鍗�*/
Receipt receipt = new Receipt();
--
Gitblit v1.9.3