From f77a2eba10ce3f430d31a34790a8a1184c8069e6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 22 八月 2023 11:50:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
index 4e3721e..3169392 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/MaterialServiceImpl.java
@@ -85,9 +85,11 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Integer addMaterialInformation(AddMaterialDto addMaterialDto) {
- Material material = materialMapper.selectOne(Wrappers.<Material>query().eq("name", addMaterialDto.getMaterialName()));
- material.setType(addMaterialDto.getType());
- int isInsertSuccess = materialMapper.updateById(material);
+ Material material = new Material()
+ .setCode("BZ" + IdWorker.getIdStr())
+ .setName(addMaterialDto.getMaterialName())
+ .setType(addMaterialDto.getType());
+ int isInsertSuccess = materialMapper.insert(material);
if (isInsertSuccess > 0) {
Standard standard = new Standard()
.setMaterialId(material.getId())
@@ -125,7 +127,7 @@
//娣诲姞鎸囨爣-->閫夋嫨鏍峰搧鍚嶇О
@Override
public List<String> selectmater() {
- return materialMapper.selectmater();
+ return productModelMapper.selectmater();
}
--
Gitblit v1.9.3