From 232cab080647152de06755fbac3d4170629d5b3c Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 26 九月 2023 10:25:58 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentGoodsServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentGoodsServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentGoodsServiceImpl.java
index 31bada5..fd26613 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentGoodsServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/service/impl/SysEmbedmentGoodsServiceImpl.java
@@ -21,9 +21,9 @@
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
/**
* @Author QiuYuHao
@@ -43,13 +43,19 @@
private SysEmbedmentCorrectionMapper sysEmbedmentCorrectionMapper;
//=======================种类到此开始=======================
+
+ @Override
+ public BasicResult getType() {
+ return BasicResult.success(sysEmbedmentGoodsMapper.getType());
+ }
@Override
public BasicResult insert(SysEmbedmentGoodsEntity sysEmbedmentGoodsEntity) {
SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
sysEmbedmentGoodsEntity.setCompanyId(sysUserInfo.getCompanyId());
String embedmentName = sysEmbedmentGoodsEntity.getEmbedmentName();
String embedmentType = sysEmbedmentGoodsEntity.getEmbedmentType();
- String id = sysEmbedmentGoodsMapper.embedmentNameAndType(embedmentName,embedmentType);
+ String embedmentModel = sysEmbedmentGoodsEntity.getEmbedmentModel();
+ String id = sysEmbedmentGoodsMapper.embedmentNameAndType(embedmentName,embedmentType, embedmentModel);
if(!StringUtil.isEmpty(id)){
return BasicResult.faild("11111","error","名称和规格型号不可重复");
}
@@ -69,8 +75,9 @@
sysEmbedmentGoodsEntity.setCompanyId(sysUserInfo.getCompanyId());
String embedmentName = sysEmbedmentGoodsEntity.getEmbedmentName();
String embedmentType = sysEmbedmentGoodsEntity.getEmbedmentType();
- String id = sysEmbedmentGoodsMapper.embedmentNameAndType(embedmentName,embedmentType);
- if(!StringUtil.isEmpty(id)){
+ String embedmentModel = sysEmbedmentGoodsEntity.getEmbedmentModel();
+ String id = sysEmbedmentGoodsMapper.embedmentNameAndType(embedmentName,embedmentType, embedmentModel);
+ if(!StringUtil.isEmpty(id) && !sysEmbedmentGoodsEntity.getId().equals(id)){
return BasicResult.faild("11111","error","名称和规格型号不可重复");
}
sysEmbedmentGoodsMapper.update(sysEmbedmentGoodsEntity);
@@ -92,6 +99,12 @@
return BasicResult.success(sysEmbedmentGoodsMapper.findEntity(id));
}
+
+
+ @Override
+ public BasicResult findAllDetails(String id) {
+ return BasicResult.success(sysEmbedmentGoodsMapper.findEntity(id).getEmbedmentModel());
+ }
//=======================种类到此结束=======================
//=======================库存管理开始=======================
@@ -170,6 +183,7 @@
PageInfo<SysEmbedmentCorrectionEntity> pageInfo = new PageInfo<>(sysEmbedmentCorrectionEntities);
return BasicResult.success(pageInfo);
}
+
//=======================校正记录结束=======================
}
--
Gitblit v1.9.3