From 608fa275864c7cb4353e5e030e4a1304e56529ac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 九月 2023 13:12:05 +0800
Subject: [PATCH] 修改4.0 9.20
---
standard-server/src/main/java/com/yuanchu/mom/service/impl/StandardServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/StandardServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/StandardServiceImpl.java
index 647020d..ebb7772 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/StandardServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/StandardServiceImpl.java
@@ -61,7 +61,15 @@
//(3绾�)鏂板-->鏍囧噯,鍨嬪彿
@Override
@Transactional(rollbackFor = Exception.class)
- public void addStandard(StandardDto standardDto) {
+ public String addStandard(StandardDto standardDto) {
+ //鏍￠獙娣诲姞璇ョ墿鏂欎笅鐨勬爣鍑嗘槸鍚﹂噸澶�
+ List<String> standNameList = standardMapper.selectList(Wrappers.<Standard>query().eq("material_id", standardDto.getId())).stream().map(standard -> {
+ String standardName = standard.getName();
+ return standardName;
+ }).collect(Collectors.toList());
+ if (standNameList.contains(standardDto.getStandard())){
+ return "璇ヤ骇鍝佷笅鏈夎鏍囧噯";
+ }
/*鏂板鏍囧噯琛�*/
Standard standard = new Standard();
standard.setMaterial_id(standardDto.getId());
@@ -75,7 +83,17 @@
/*鏂板鏍囧噯BOM-->宸ヨ壓璺嚎(鎵归噺娣诲姞)*/
//鏌ヨ鐗╂枡鐨勫ぇ绫�(鏍规嵁鐗╂枡id)
Material material = materialMapper.selectById(standardDto.getId());
- List<TechnologyTemplate> technologyTemplateList = technologyTemplateMapper.selectList(Wrappers.<TechnologyTemplate>query().eq("type", material.getFather()));
+ Integer type = null;
+ if (material.getFather().equals("姗¤兌杩炴帴鍣�")){
+ type=0;
+ }else if (material.getFather().equals("閲戝睘杩炴帴鍣�")){
+ type=1;
+ }else if(material.getFather().equals("婀挎彃鎷旂數杩炴帴鍣�")){
+ type=2;
+ }else if(material.getFather().equals("鍒嗘敮缁勪欢")){
+ type=3;
+ }else return "娣诲姞鏍囧噯銆�" + standardDto.getStandard() + "銆戞垚鍔�";
+ List<TechnologyTemplate> technologyTemplateList = technologyTemplateMapper.selectList(Wrappers.<TechnologyTemplate>query().eq("type", type));
List<Technology> technologyList = technologyTemplateList.stream().map(technologyTemplate -> {
Technology technology = new Technology();
technology.setSpecificationsId(specifications.getId());
@@ -139,6 +157,7 @@
}
}
techniqueService.saveBatch(techniqueList);
+ return "娣诲姞鏍囧噯銆�"+ standardDto.getStandard() +"銆戞垚鍔燂紒";
}
}
--
Gitblit v1.9.3