From fa0d4fc230b44c04b969b4f7c7bd0ea72a61572d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 06 九月 2023 18:02:41 +0800
Subject: [PATCH] 产品检验+过程检验(初步完成)
---
standard-server/src/main/java/com/yuanchu/mom/service/impl/MaterialServiceImpl.java | 33 ++++++++-------------------------
1 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/MaterialServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/MaterialServiceImpl.java
index ed84a91..f588796 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/MaterialServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/MaterialServiceImpl.java
@@ -70,7 +70,13 @@
//(1,2绾�)鏂板-->鐗╂枡,鏍囧噯,鍨嬪彿
@Override
@Transactional(rollbackFor = Exception.class)
- public void addMaterial(MaterialDto materialDto) {
+ public String addMaterial(MaterialDto materialDto) {
+ //鏍￠獙娣诲姞鐗╂枡鏄惁閲嶅
+ if (materialMapper.selectOne(Wrappers.<Material>query()
+ .eq("type", materialDto.getType())
+ .eq("father", materialDto.getFather())).getName().equals(materialDto.getName())) {
+ return "璇ョ被鍨嬩骇鍝佸ぇ绫讳笅鏈夎浜у搧鍚嶇О";
+ }
/*鏂板鐗╂枡琛�*/
Material material = new Material();
material.setCode(MyUtil.getTimeSixNumberCode("ML", "ML"));
@@ -153,33 +159,10 @@
}
}
techniqueService.saveBatch(techniqueList);
+ return "娣诲姞鐗╂枡銆�" + materialDto.getName() + "銆戞垚鍔�";
}
- //妫�楠屾ā鍧�-->QMS绠＄悊-->鎴愬搧妫�楠�-->鏂板(椤圭洰鍚嶇О涓嬫媺妗嗭細Id涓庡悕绉帮紝缂栫爜)
- @Override
- public List<Map<String, Object>> selectMaterialIdAndNameAndCode() {
- LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
- wrapper.select(Material::getId, Material::getName, Material::getCode);
- return materialMapper.selectMaps(wrapper);
- }
- //鏌ヨ鎵�鏈夌墿鏂欎俊鎭�
- @Override
- public List<Material> selectMaterial() {
- return materialMapper.selectList(Wrappers.<Material>query());
- }
-
- //鏍规嵁鐗╂枡鍚嶇О鏌ヨ鐗╂枡id鍜岀墿鏂欑紪鐮�
- @Override
- public List<Material> selectMcodeId(String name) {
- return materialMapper.selectMcodeId(name);
- }
-
- //鏍规嵁鐗╂枡鍚嶇О鍜岀墿鏂欑紪鐮佹煡璇㈢墿鏂檌d,瑙勬牸淇℃伅鍜屽瀷鍙蜂俊鎭�
- @Override
- public List<Map> selectIdByCoNa(String name, String code) {
- return materialMapper.selectIdByCoNa(name, code);
- }
}
--
Gitblit v1.9.3