From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java | 64 +++++--------------------------
1 files changed, 11 insertions(+), 53 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 c1c3a7e..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,6 +18,7 @@
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;
@@ -43,9 +46,10 @@
//鏂板鎴愬搧鍙戣揣
@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) {
@@ -70,67 +74,21 @@
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) {
- return "璇ヤ骇鍝佽繕鏈楠�,涓嶈兘鍙戣揣!";
- }
- //璇ユ垚鍝佸簱瀛樼殑鏁伴噺澶т簬绛変簬鍙戣揣鐨勬暟閲忔墠鑳借繘琛屽彂璐�
- if (repertory.getNumber() < message.getNumber()) {
+ //璇ユ垚鍝佸簱瀛樹笉涓虹┖涓旀暟閲忓ぇ浜庣瓑浜庡彂璐х殑鏁伴噺鎵嶈兘杩涜鍙戣揣
+ if (ObjectUtils.isNotEmpty(repertory) && repertory.getNumber() < message.getNumber()) {
return "搴撳瓨涓嶈冻,鏃犳硶鍙戣揣!";
}
//鏋勯�犳垚鍝佸彂璐у疄浣撶被
@@ -145,7 +103,7 @@
.specifications(message.getSpecifications())
.unit(message.getUnit())
.number(message.getNumber())
- .code(repertory.getCode())
+ .qualityTraceability(repertory.getQualityTraceability())
.build();
consignmentMapper.insert(consig);
/*鍑忓皯瀵瑰簲鐨勫簱瀛�*/
--
Gitblit v1.9.3