From 95bd45377f1e04b448d407e3af4ee2707b90a24b Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 17 八月 2023 17:07:52 +0800
Subject: [PATCH] MOM系统-8-17计量管理版本一结束
---
inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 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..b96b27b 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
@@ -45,7 +45,7 @@
@Override
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) {
@@ -79,12 +79,11 @@
consignmentMapper.updateById(consignment);
//搴撳瓨涔熻鏂板
LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(Repertory::getCode, consignment.getCode())
+ queryWrapper.eq(Repertory::getQualityTraceability, consignment.getQualityTraceability())
.eq(Repertory::getName, consignment.getName())
.eq(Repertory::getSpecifications, consignment.getSpecifications())
.eq(Repertory::getUnit, consignment.getUnit())
- .eq(Repertory::getType, 0) //鎴愬搧鍙戣揣
- .eq(Repertory::getCheckState, 1); //鍙湁宸叉楠屾墠鑳藉彂璐�
+ .eq(Repertory::getType, 0); //鎴愬搧鍙戣揣
Repertory repertory = repertoryMapper.selectOne(queryWrapper);
repertory.setNumber(repertory.getNumber() + consignment.getNumber());
repertoryMapper.updateById(repertory);
@@ -100,12 +99,11 @@
consignmentMapper.updateById(consignment);
//搴撳瓨鏂板
LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(Repertory::getCode, consignment.getCode())
+ queryWrapper.eq(Repertory::getQualityTraceability, consignment.getQualityTraceability())
.eq(Repertory::getName, consignment.getName())
.eq(Repertory::getSpecifications, consignment.getSpecifications())
.eq(Repertory::getUnit, consignment.getUnit())
- .eq(Repertory::getType, 0) //鎴愬搧鍙戣揣
- .eq(Repertory::getCheckState, 1); //鍙湁宸叉楠屾墠鑳藉彂璐�
+ .eq(Repertory::getType, 0); //鎴愬搧鍙戣揣
Repertory repertory = repertoryMapper.selectOne(queryWrapper);
repertory.setNumber(repertory.getNumber() + consignment.getNumber());
repertoryMapper.updateById(repertory);
@@ -125,10 +123,6 @@
.eq(Repertory::getUnit, message.getUnit())
.eq(Repertory::getType, 0);
Repertory repertory = repertoryMapper.selectOne(queryWrapper);
- //璇ユ垚鍝佺殑妫�楠岀姸鎬佹槸宸叉楠�1鎵嶈兘杩涜鍙戣揣
- if (repertory.getCheckState() != 1) {
- return "璇ヤ骇鍝佽繕鏈楠�,涓嶈兘鍙戣揣!";
- }
//璇ユ垚鍝佸簱瀛樼殑鏁伴噺澶т簬绛変簬鍙戣揣鐨勬暟閲忔墠鑳借繘琛屽彂璐�
if (repertory.getNumber() < message.getNumber()) {
return "搴撳瓨涓嶈冻,鏃犳硶鍙戣揣!";
@@ -145,7 +139,7 @@
.specifications(message.getSpecifications())
.unit(message.getUnit())
.number(message.getNumber())
- .code(repertory.getCode())
+ .qualityTraceability(repertory.getQualityTraceability())
.build();
consignmentMapper.insert(consig);
/*鍑忓皯瀵瑰簲鐨勫簱瀛�*/
--
Gitblit v1.9.3