From 66ff6f509bbbba04cffc428e7e1c886b534b4f13 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 17 八月 2023 17:09:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java | 76 --------------------------------------
1 files changed, 0 insertions(+), 76 deletions(-)
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java
index e23fda3..d0699e0 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/ImportRepertoryServiceImpl.java
@@ -30,41 +30,6 @@
@Resource
ImportRepertoryMapper importRepertoryMapper;
- @Resource
- RepertoryMapper repertoryMapper;
-
- //鏂板鎴愬搧鍏ュ簱
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void addImpRep(String name, ImportRepertoryDto importRepertoryDto) {
- //鏂板鎴愬搧鍏ュ簱
- ImportRepertory importRepertory = new ImportRepertory();
- BeanUtils.copyProperties(importRepertoryDto, importRepertory);
- importRepertory.setUserName(name);
- importRepertoryMapper.insert(importRepertory);
- /*鏂板鎴愬搧搴撳瓨(鏈楠�)*/
- //濡傛灉鍏ュ簱鐨勪俊鎭竴鏍峰彧鏈夊簱瀛樹笉涓�鏍�,鍒欏湪鍘熸潵鐨勫簱瀛樻暟閲忎笂鍔犱笂鐩稿簲鐨勬暟閲�
- LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(Repertory::getOrderCode, importRepertoryDto.getOrderCode())
- .eq(Repertory::getQualityTraceability, importRepertoryDto.getQualityTraceability())
- .eq(Repertory::getName, importRepertoryDto.getName())
- .eq(Repertory::getSpecifications, importRepertoryDto.getSpecifications())
- .eq(Repertory::getUnit, importRepertoryDto.getUnit())
- .eq(Repertory::getType, 0);
- Repertory rep = repertoryMapper.selectOne(queryWrapper);
- if (rep != null ) {
- rep.setNumber(rep.getNumber() + importRepertoryDto.getNumber());
- rep.setUserName(name);
- repertoryMapper.updateById(rep);
- } else {
- //濡傛灉闄や簡搴撳瓨鍒殑淇℃伅鏈変换浣曚竴涓笉涓�鏍�,鍒欐柊澧炰竴鏉℃垚鍝佸簱瀛�
- Repertory repertory = new Repertory();
- BeanUtils.copyProperties(importRepertoryDto, repertory);
- repertory.setUserName(name);
- repertory.setType(0);
- repertoryMapper.insert(repertory);
- }
- }
//鏌ヨ鍏ュ簱鍒楄〃
@Override
@@ -72,46 +37,5 @@
return importRepertoryMapper.selectAllImpRep(page, orderCode, name, time);
}
- //鏍规嵁id鍒犻櫎
- @Override
- public void delImpRep(Integer id) {
- //鍒犻櫎鍏ュ簱璁板綍
- ImportRepertory importRepertory = importRepertoryMapper.selectById(id);
- importRepertory.setState(0);
- importRepertoryMapper.updateById(importRepertory);
- //搴撳瓨涔熻鍑忓皯
- LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(Repertory::getOrderCode, importRepertory.getOrderCode())
- .eq(Repertory::getQualityTraceability, importRepertory.getQualityTraceability())
- .eq(Repertory::getName, importRepertory.getName())
- .eq(Repertory::getSpecifications, importRepertory.getSpecifications())
- .eq(Repertory::getUnit, importRepertory.getUnit())
- .eq(Repertory::getType, 0);
- Repertory rep = repertoryMapper.selectOne(queryWrapper);
- rep.setNumber(rep.getNumber() - importRepertory.getNumber());
- repertoryMapper.updateById(rep);
- }
-
- //鎵归噺鍒犻櫎
- @Override
- public void delAllImpRep(List<Integer> ids) {
- List<ImportRepertory> importRepertories = importRepertoryMapper.selectBatchIds(ids);
- for (ImportRepertory importRepertory : importRepertories) {
- importRepertory.setState(0);
- //鍒犻櫎鍏ュ簱璁板綍
- importRepertoryMapper.updateById(importRepertory);
- //鍑忓皯搴撳瓨
- LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(Repertory::getOrderCode, importRepertory.getOrderCode())
- .eq(Repertory::getQualityTraceability, importRepertory.getQualityTraceability())
- .eq(Repertory::getName, importRepertory.getName())
- .eq(Repertory::getSpecifications, importRepertory.getSpecifications())
- .eq(Repertory::getUnit, importRepertory.getUnit())
- .eq(Repertory::getType, 0);
- Repertory rep = repertoryMapper.selectOne(queryWrapper);
- rep.setNumber(rep.getNumber() - importRepertory.getNumber());
- repertoryMapper.updateById(rep);
- }
- }
}
--
Gitblit v1.9.3