From 3594a911312b92561b08c478ef0319cf1ae2b0d8 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 11 九月 2023 11:20:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/pojo/Material.java | 4 ++--
standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MaterialDto.java | 2 +-
base-server/src/main/resources/mapper/RecordModelMapper.xml | 1 +
standard-server/src/main/java/com/yuanchu/mom/service/impl/MaterialServiceImpl.java | 14 ++++++++++++--
4 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/base-server/src/main/resources/mapper/RecordModelMapper.xml b/base-server/src/main/resources/mapper/RecordModelMapper.xml
index 5495be6..edc9ec7 100644
--- a/base-server/src/main/resources/mapper/RecordModelMapper.xml
+++ b/base-server/src/main/resources/mapper/RecordModelMapper.xml
@@ -17,6 +17,7 @@
select type,
father techFather,
tt.name techName,
+ tt.id,
rm.name,
unit,
note
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/Material.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/Material.java
index 6656d43..344865a 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/pojo/Material.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/Material.java
@@ -39,9 +39,9 @@
private Integer type;
/**
- * 0锛氭鑳惰繛鎺ュ櫒锛�1锛氶噾灞炶繛鎺ュ櫒锛�2锛氭箍鎻掓嫈鐢佃繛鎺ュ櫒锛�3锛氬垎鏀粍浠�
+ * 浜у搧澶х被0锛氭鑳惰繛鎺ュ櫒锛�1锛氶噾灞炶繛鎺ュ櫒锛�2锛氭箍鎻掓嫈鐢佃繛鎺ュ櫒锛�3锛氬垎鏀粍浠�
**/
- private Integer father;
+ private String father;
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MaterialDto.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MaterialDto.java
index 6d43cad..4cfa724 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MaterialDto.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/pojo/dto/MaterialDto.java
@@ -16,7 +16,7 @@
@JsonSerialize
@NotNull(message = "浜у搧澶х被(4澶х被)涓嶈兘涓虹┖")
- private Integer father;
+ private String father;
@JsonSerialize
@NotBlank(message = "鐗╂枡鍚嶇О涓嶈兘涓虹┖")
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 9eaf9db..35e9113 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
@@ -109,8 +109,18 @@
specifications.setName(materialDto.getSpecifications());
specifications.setStandardId(standard.getId());
specificationsMapper.insert(specifications);
- /*鏂板鏍囧噯BOM-->宸ヨ壓璺嚎(鎵归噺娣诲姞)*/
- List<TechnologyTemplate> technologyTemplateList = technologyTemplateMapper.selectList(Wrappers.<TechnologyTemplate>query().eq("type", materialDto.getFather()));
+ /*鏂板鏍囧噯BOM-->宸ヨ壓璺嚎(鎵归噺娣诲姞)*///0锛氭鑳惰繛鎺ュ櫒锛�1锛氶噾灞炶繛鎺ュ櫒锛�2锛氭箍鎻掓嫈鐢佃繛鎺ュ櫒锛�3锛氬垎鏀粍浠�
+ Integer type = null;
+ if (materialDto.getFather().equals("姗¤兌杩炴帴鍣�")){
+ type=0;
+ }else if (materialDto.getFather().equals("閲戝睘杩炴帴鍣�")){
+ type=1;
+ }else if(materialDto.getFather().equals("婀挎彃鎷旂數杩炴帴鍣�")){
+ type=2;
+ }else if(materialDto.getFather().equals("鍒嗘敮缁勪欢")){
+ type=3;
+ }else return "娣诲姞鐗╂枡銆�" + materialDto.getName() + "銆戞垚鍔�";
+ 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());
--
Gitblit v1.9.3