From 088ceb9faf6f1d0d9f57bb9cd65f542337d40b7f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 07 九月 2023 15:30:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml | 1
standard-server/src/main/java/com/yuanchu/mom/service/ProductService.java | 14 -
inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java | 91 ---------
standard-server/src/main/java/com/yuanchu/mom/controller/ProductController.java | 23 --
standard-server/src/main/java/com/yuanchu/mom/controller/MaterialController.java | 11 +
standard-server/src/main/java/com/yuanchu/mom/service/impl/MbomServiceImpl.java | 13 -
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java | 4
standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyController.java | 10 -
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java | 89 ---------
standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java | 31 +-
standard-server/src/main/resources/mapper/ProductMapper.xml | 1
standard-server/src/main/java/com/yuanchu/mom/controller/TechniqueController.java | 11 -
standard-server/src/main/java/com/yuanchu/mom/service/TechniqueService.java | 7
inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java | 4
standard-server/src/main/java/com/yuanchu/mom/mapper/ProductMapper.java | 4
standard-server/src/main/java/com/yuanchu/mom/service/impl/MaterialServiceImpl.java | 93 ++++++++++
standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java | 7
standard-server/src/main/java/com/yuanchu/mom/service/MbomService.java | 6
standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java | 32 +-
inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java | 14 -
standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java | 13 -
standard-server/src/main/java/com/yuanchu/mom/service/TechnologyService.java | 7
inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectionItemMapper.java | 2
inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml | 2
standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java | 11 -
25 files changed, 168 insertions(+), 333 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
index 8dd51eb..3814183 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java
@@ -39,14 +39,6 @@
@Autowired
private FinishedInspectService finishedInspectService;
- @Autowired
- private UserService userService;
-
- @Autowired
- private SpecificationsService specificationsService;
-
- @Autowired
- private MaterialService materialService;
@Autowired
Jwt jwt;
@@ -94,14 +86,14 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ鎴愬搧妫�楠屽崟鍒楄〃")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "pageNo", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "result", value = "妫�楠岀粨鏋�(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "material", value = "浜у搧鍚嶇О", dataTypeClass = String.class)
})
@GetMapping("/list_page")
- public Result<?> list_page(Integer pageNo, Integer pageSize, Integer result, String material) {
- IPage<Map<String, Object>> page = finishedInspectService.selectFinishedInspectPage(new Page<Object>(pageNo, pageSize), result, material);
+ public Result<?> list_page(Integer pageSize, Integer countSize, Integer result, String material) {
+ IPage<Map<String, Object>> page = finishedInspectService.selectFinishedInspectPage(new Page<Object>(pageSize, countSize), result, material);
Map<String, Object> map = new HashMap<>();
map.put("total", page.getTotal());
map.put("row", page.getRecords());
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectionItemMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectionItemMapper.java
index f3a2c89..0871763 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectionItemMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectionItemMapper.java
@@ -21,7 +21,7 @@
//鑾峰彇璇ョ被鍨嬫楠屽崟id涓嬬殑妫�楠岄」鐩粨鏋滈泦
List<Integer> getResult(Integer id, int type);
- List<InspectionItemDto> selectInspectionItem(Integer finishInspectId, Integer type);
+ List<InspectionItemDto> selectInspectionItem(Integer id, Integer type);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java
index 58c06ff..231202d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectionItemService.java
@@ -21,10 +21,10 @@
/**
* 鏂板鎸夐挳-->2銆佹煡璇㈡墍鏈夋楠岄」鐩�
- * @param finishInspectId
+ * @param id
* @return
*/
- List<InspectionItemDto> selectInspectionItem(Integer finishInspectId, Integer type);
+ List<InspectionItemDto> selectInspectionItem(Integer id, Integer type);
/**
* 鏂板鎸夐挳-->2銆佹楠岄」鐩�-->澶卞幓鐒︾偣鍙戣捣璇ヨ姹�
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
index 9704d8b..39cd482 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
@@ -16,6 +16,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -34,15 +35,6 @@
@Resource
FinishedInspectMapper finishedInspectMapper;
-
- @Resource
- MaterialMapper materialMapper;
-
- @Resource
- StandardService standardService;
-
- @Resource
- SpecificationsService specificationsService;
@Resource
ManualTechnologyMapper manualTechnologyMapper;
@@ -87,17 +79,19 @@
finishedInspectMapper.insert(finishedInspect);
/*鎵归噺鏂板鎴愬搧妫�楠岄」鐩崟*/
//鑾峰彇鍨嬪彿id
- Integer specificationId = getSpecificationId(finishedInspectVo.getMaterial(), finishedInspectVo.getMcode(), finishedInspectVo.getSpecificationsModel());
+ //Integer specificationId = getSpecificationId(finishedInspectVo.getMaterial(), finishedInspectVo.getMcode(), finishedInspectVo.getSpecificationsModel());
//鏍规嵁鐢熶骇璁㈠崟id鏌ヨ缂栧埗宸ュ簭鐨勬渶鍚庝竴閬撳伐鑹�
List<ManualTechnology> manualTechnologyList = manualTechnologyMapper.selAllByMoId(finishedInspectVo.getId());
//鑾峰彇鏈�鍚庝竴閬撳伐鑹哄叧鑱旂殑宸ヨ壓璺嚎id
Integer technologyId = manualTechnologyList.get(0).getTechnologyId();
- //鏌ヨ鏍囧噯BOM鎶�鏈寚鏍囦腑璇ュ瀷鍙峰伐鑹轰笅鏈�鏂扮増鏈殑妫�楠岄」鐩�
- Integer ver = productService.selectVerByPro(specificationId).get(0);//璇ュ瀷鍙蜂笅鎶�鏈寚鏍囨渶鏂扮増鏈�
- List<Product> productList = productService.selProByVerSpe(technologyId, ver);
+ /*//鏌ヨ鏍囧噯BOM鎶�鏈寚鏍囦腑璇ュ瀷鍙峰伐鑹轰笅鏈�鏂扮増鏈殑妫�楠岄」鐩�
+ Integer ver = productService.selectVerByPro(specificationId).get(0);//璇ュ瀷鍙蜂笅鎶�鏈寚鏍囨渶鏂扮増鏈�*/
+ List<Product> productList = productService.selProByVerSpe(technologyId);
List<InspectionItem> inspectionItemList = productList.stream().map(product -> {
InspectionItem inspectionItem = new InspectionItem();
BeanUtils.copyProperties(product, inspectionItem);
+ inspectionItem.setCreateTime(new Date());
+ inspectionItem.setUpdateTime(new Date());
inspectionItem.setInspectId(finishedInspect.getId());
inspectionItem.setType(2);//鎴愬搧
return inspectionItem;
@@ -183,76 +177,5 @@
return finishedInspectMapper.selectFinishInspectsListById(id);
}
-
- /*鏍规嵁鏍峰搧鍚嶇О,鏍峰搧缂栧彿,鍨嬪彿瑙勬牸鑾峰彇鍨嬪彿id*/
- private Integer getSpecificationId(String name, String mcode, String specification) {
- //鑾峰彇鐗╂枡id
- Material material = materialMapper.selectOne(Wrappers.<Material>query()
- .eq("name", name)
- .eq("code", mcode));
- if (Objects.isNull(material)) {
- return null;
- }
- //鑾峰彇瑙勬牸鍚嶇О鍜屽瀷鍙峰悕绉�
- String[] split = specification.split("-");
- String stName = split[0];
- String spName = split[1];
- //鑾峰彇瑙勬牸id
- Standard standard = standardService.getOne(Wrappers.<Standard>query()
- .eq("name", stName)
- .eq("material_id", material.getId()));
- //鑾峰彇鍨嬪彿id
- Specifications specifications = specificationsService.getOne(Wrappers.<Specifications>query()
- .eq("name", spName)
- .eq("standard_id", standard.getId()));
- return specifications.getId();
- }
-
- /*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
- private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
- boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
- boolean isControlValueSatisfied = isValueSatisfied(controlValueStr, detectionValueStr);
-
- if (isStandardValueSatisfied && isControlValueSatisfied) {
- return 1;
- } else {
- return 0;
- }
- }
-
- private boolean isValueSatisfied(String valueStr, String detectionValueStr) {
- String substring = valueStr.substring(1, 2);
- if (substring.equals("=")) {
- String operator = valueStr.substring(0, 2);
- Double standardValue = Double.parseDouble(valueStr.substring(2));
- Double detectionValue = Double.parseDouble(detectionValueStr);
- switch (operator) {
- case ">=":
- return detectionValue >= standardValue;
- case "<=":
- return detectionValue <= standardValue;
- default:
- return false;
- }
- } else {
- String operator = valueStr.substring(0, 1);
- Double standardValue = Double.parseDouble(valueStr.substring(1));
- Double detectionValue = Double.parseDouble(detectionValueStr);
- switch (operator) {
- case ">":
- return detectionValue > standardValue;
- case "鈮�":
- return detectionValue >= standardValue;
- case "鈮�":
- return detectionValue <= standardValue;
- case "<":
- return detectionValue < standardValue;
- case "=":
- return detectionValue.equals(standardValue);
- default:
- return false;
- }
- }
- }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
index 82273bf..c84861f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
@@ -38,8 +38,8 @@
//鏂板鎸夐挳-->2銆佹煡璇㈡墍鏈夋楠岄」鐩�
@Override
- public List<InspectionItemDto> selectInspectionItem(Integer finishInspectId, Integer type) {
- return inspectionItemMapper.selectInspectionItem(finishInspectId,type);
+ public List<InspectionItemDto> selectInspectionItem(Integer id, Integer type) {
+ return inspectionItemMapper.selectInspectionItem(id,type);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java
index ca30a73..8756848 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -29,15 +30,6 @@
@Resource
ProcessInspectMapper processInspectMapper;
-
- @Resource
- MaterialMapper materialMapper;
-
- @Resource
- StandardService standardService;
-
- @Resource
- SpecificationsService specificationsService;
@Resource
ProductService productService;
@@ -67,14 +59,16 @@
BeanUtils.copyProperties(processInspectVo, processInspect);
processInspectMapper.insert(processInspect);
/*鎵归噺鏂板杩囩▼妫�楠岄」鐩〃*/
- //鑾峰彇鍨嬪彿id
+ /*//鑾峰彇鍨嬪彿id
Integer specificationId = getSpecificationId(processInspectVo.getMaterial(), processInspectVo.getMaterialCode(), processInspectVo.getSpecificationsModel());
//鏌ヨ鏍囧噯BOM鎶�鏈寚鏍囦腑璇ュ瀷鍙峰伐鑹轰笅鏈�鏂扮増鏈殑妫�楠岄」鐩�
- Integer ver = productService.selectVerByPro(specificationId).get(0);//璇ュ瀷鍙蜂笅鎶�鏈寚鏍囨渶鏂扮増鏈�
- List<Product> productList = productService.selProByVerSpe(processInspectVo.getTechnologyId(), ver);
+ Integer ver = productService.selectVerByPro(specificationId).get(0);//璇ュ瀷鍙蜂笅鎶�鏈寚鏍囨渶鏂扮増鏈�*/
+ List<Product> productList = productService.selProByVerSpe(processInspectVo.getTechnologyId());
List<InspectionItem> inspectionItemList = productList.stream().map(product -> {
InspectionItem inspectionItem = new InspectionItem();
BeanUtils.copyProperties(product, inspectionItem);
+ inspectionItem.setCreateTime(new Date());
+ inspectionItem.setUpdateTime(new Date());
inspectionItem.setInspectId(processInspect.getId());
inspectionItem.setType(1);
return inspectionItem;
@@ -130,76 +124,5 @@
return processInspectMapper.selectProcessInspectsList(page,techfather,result,name);
}
-
- /*鏍规嵁鏍峰搧鍚嶇О,鏍峰搧缂栧彿,鍨嬪彿瑙勬牸鑾峰彇鍨嬪彿id*/
- private Integer getSpecificationId(String name, String mcode, String specification) {
- //鑾峰彇鐗╂枡id
- Material material = materialMapper.selectOne(Wrappers.<Material>query()
- .eq("name", name)
- .eq("code", mcode));
- if (Objects.isNull(material)) {
- return null;
- }
- //鑾峰彇瑙勬牸鍚嶇О鍜屽瀷鍙峰悕绉�
- String[] split = specification.split("-");
- String stName = split[0];
- String spName = split[1];
- //鑾峰彇瑙勬牸id
- Standard standard = standardService.getOne(Wrappers.<Standard>query()
- .eq("name", stName)
- .eq("material_id", material.getId()));
- //鑾峰彇鍨嬪彿id
- Specifications specifications = specificationsService.getOne(Wrappers.<Specifications>query()
- .eq("name", spName)
- .eq("standard_id", standard.getId()));
- return specifications.getId();
- }
-
- /*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
- private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
- boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
- boolean isControlValueSatisfied = isValueSatisfied(controlValueStr, detectionValueStr);
-
- if (isStandardValueSatisfied && isControlValueSatisfied) {
- return 1;
- } else {
- return 0;
- }
- }
-
- private boolean isValueSatisfied(String valueStr, String detectionValueStr) {
- String substring = valueStr.substring(1, 2);
- if (substring.equals("=")) {
- String operator = valueStr.substring(0, 2);
- Double standardValue = Double.parseDouble(valueStr.substring(2));
- Double detectionValue = Double.parseDouble(detectionValueStr);
- switch (operator) {
- case ">=":
- return detectionValue >= standardValue;
- case "<=":
- return detectionValue <= standardValue;
- default:
- return false;
- }
- } else {
- String operator = valueStr.substring(0, 1);
- Double standardValue = Double.parseDouble(valueStr.substring(1));
- Double detectionValue = Double.parseDouble(detectionValueStr);
- switch (operator) {
- case ">":
- return detectionValue > standardValue;
- case "鈮�":
- return detectionValue >= standardValue;
- case "鈮�":
- return detectionValue <= standardValue;
- case "<":
- return detectionValue < standardValue;
- case "=":
- return detectionValue.equals(standardValue);
- default:
- return false;
- }
- }
- }
}
diff --git a/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml b/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
index 4c3684d..1c6c3a0 100644
--- a/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
@@ -39,7 +39,6 @@
<result property="qualityTraceability" column="quality_traceability"/>
<result property="specifications" column="specifications"/>
<result property="unit" column="unit"/>
- <collection property="children" resultMap="threeMap" javaType="List"/>
</resultMap>
<select id="chooseMater" resultMap="oneMap">
select s.proname prname,
diff --git a/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml b/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml
index ce020f7..9a96f0c 100644
--- a/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/ProcessInspectMapper.xml
@@ -110,7 +110,7 @@
<if test="techfather!=null and techfather!=''">
and techfather like concat('%',#{techfather},'%')
</if>
- <if test="material!=null and material!=''">
+ <if test="name!=null and name!=''">
and material like concat('%',#{name},'%')
</if>
<if test="result!=null ">
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/MaterialController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/MaterialController.java
index 8bde0da..8870f1d 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/MaterialController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/MaterialController.java
@@ -95,4 +95,15 @@
return Result.fail("娌℃湁璇ョ被鍨�!");
}
+ @ApiOperation("娣诲姞鍚屼竴涓瀷鍙峰伐鑹鸿矾绾�,鎶�鏈寚鏍�,鐗╂枡娓呭崟,鐢熶骇宸ヨ壓鐨勭増鏈�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "version", value = "褰撳墠鐗堟湰", dataTypeClass = Integer.class, required = true)
+ })
+ @PostMapping("/addVersion")
+ public Result<?> addVersion(Integer specificationsId ,Integer version) {
+ Integer version1 = materialService.addVersion(specificationsId,version);
+ return Result.success("娣诲姞鍨嬪彿"+specificationsId+"鐨勭増鏈�"+version1+"鎴愬姛");
+ }
+
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java
index a13dbd9..144e91d 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/MbomController.java
@@ -63,17 +63,6 @@
return Result.fail("鏇存柊澶辫触");
}
- @ApiOperation("娣诲姞鍚屼竴涓瀷鍙风墿鏂欐竻鍗曠殑鐗堟湰")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "version", value = "褰撳墠鐗堟湰", dataTypeClass = Integer.class, required = true)
- })
- @PostMapping("/addVersion")
- public Result<?> addVersion(Integer specificationsId ,Integer version) {
- Integer version1 = mbomService.addVersion(specificationsId,version);
- return Result.success("娣诲姞鍨嬪彿"+specificationsId+"鐨勭墿鏂欐竻鍗曠増鏈�"+version1+"鎴愬姛");
- }
-
@ApiOperation(value = "鍒犻櫎")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "鐗╂枡娓呭崟id", dataTypeClass = Integer.class,required = true)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/ProductController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/ProductController.java
index a8e8164..5968b60 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/ProductController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/ProductController.java
@@ -58,37 +58,22 @@
})
@PostMapping("/write")
public Result<?> write(Integer id, String required, String internal) {
- Integer write = productService.write(id, required, internal);
- if (write >= 1){
- return Result.success("鏇存柊鎴愬姛");
- }
- return Result.fail("鏇存柊澶辫触");
- }
-
- @ApiOperation("娣诲姞鍚屼竴涓瀷鍙锋妧鏈寚鏍囩殑鐗堟湰")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "version", value = "褰撳墠鐗堟湰", dataTypeClass = Integer.class, required = true)
- })
- @PostMapping("/addVersion")
- public Result<?> addVersion(Integer specificationsId ,Integer version) {
- Integer version1 = productService.addVersion(specificationsId,version);
- return Result.success("娣诲姞鍨嬪彿"+specificationsId+"鐨勬妧鏈寚鏍囩増鏈�"+version1+"鎴愬姛");
+ return Result.success(productService.write(id, required, internal));
}
@ApiOperation(value = "鍒犻櫎")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "鎶�鏈寚鏍噄d", dataTypeClass = Integer.class,required = true)
+ @ApiImplicitParam(name = "id", value = "鎶�鏈寚鏍噄d", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/delTechById")
public Result delProById(Integer id) {
productService.delProById(id);
- return Result.success("鍒犻櫎"+id+"鎴愬姛!");
+ return Result.success("鍒犻櫎" + id + "鎴愬姛!");
}
@ApiOperation(value = "鎵归噺鍒犻櫎")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "ids", value = "鎶�鏈寚鏍噄d", dataTypeClass = String.class,required = true)
+ @ApiImplicitParam(name = "ids", value = "鎶�鏈寚鏍噄d", dataTypeClass = String.class, required = true)
})
@PostMapping("/delAllPro")
public Result delAllPro(String ids) {
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/TechniqueController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/TechniqueController.java
index cd22e42..f5415f0 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/TechniqueController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/TechniqueController.java
@@ -65,17 +65,6 @@
return Result.success("娣诲姞鐢熶骇宸ヨ壓鎴愬姛");
}
- @ApiOperation("娣诲姞鍚屼竴涓瀷鍙风敓浜у伐鑹虹殑鐗堟湰")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "version", value = "褰撳墠鐗堟湰", dataTypeClass = Integer.class, required = true)
- })
- @PostMapping("/addVersion")
- public Result<?> addVersion(Integer specificationsId,Integer version ) {
- Integer version1 = techniqueService.addVersion(specificationsId,version);
- return Result.success("娣诲姞鍨嬪彿"+specificationsId+"鐨勭敓浜у伐鑹虹増鏈�"+version1+"鎴愬姛");
- }
-
@ApiOperation(value = "鍒犻櫎")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "鐢熶骇宸ヨ壓id", dataTypeClass = Integer.class,required = true)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyController.java b/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyController.java
index 1314d76..176ae9b 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyController.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/controller/TechnologyController.java
@@ -69,16 +69,6 @@
return Result.fail("鏇存柊澶辫触");
}
- @ApiOperation("娣诲姞鍚屼竴涓瀷鍙峰伐鑹鸿矾绾跨殑鐗堟湰")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "specificationsId", value = "鍨嬪彿id", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "version", value = "褰撳墠鐗堟湰", dataTypeClass = Integer.class, required = true)
- })
- @PostMapping("/addVersion")
- public Result<?> addVersion(Integer specificationsId ,Integer version) {
- Integer version1 = technologyService.addVersion(specificationsId,version);
- return Result.success("娣诲姞鍨嬪彿"+specificationsId+"鐨勫伐鑹鸿矾绾跨増鏈�"+version1+"鎴愬姛");
- }
@ApiOperation(value = "鍒犻櫎")
@ApiImplicitParams(value = {
diff --git a/standard-server/src/main/java/com/yuanchu/mom/mapper/ProductMapper.java b/standard-server/src/main/java/com/yuanchu/mom/mapper/ProductMapper.java
index 7e12789..16be974 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/mapper/ProductMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/mapper/ProductMapper.java
@@ -39,8 +39,8 @@
//鏍规嵁鎶�鏈寚鏍噄d鎵归噺鍒犻櫎
void delAllPro(String ids);
- //鏌ヨ鏍囧噯BOM鎶�鏈寚鏍囦腑璇ュ瀷鍙峰伐鑹轰笅鏈�鏂扮増鏈殑妫�楠岄」鐩�
- List<Product> selProByVerSpe(Integer technologyId, Integer ver);
+ //鏌ヨ鏍囧噯BOM鎶�鏈寚鏍囦腑璇ュ瀷鍙峰伐鑹轰笅鐨勬楠岄」鐩�
+ List<Product> selProByVerSpe(Integer technologyId);
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java b/standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java
index b5fa40e..a9dea0c 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/MaterialService.java
@@ -29,4 +29,11 @@
String addMaterial(MaterialDto materialDto);
+ /**
+ * 娣诲姞鍚屼竴涓瀷鍙峰伐鑹鸿矾绾�,鎶�鏈寚鏍�,鐗╂枡娓呭崟,鐢熶骇宸ヨ壓鐨勭増鏈�
+ * @param specificationsId
+ * @param version
+ * @return
+ */
+ Integer addVersion(Integer specificationsId, Integer version);
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/MbomService.java b/standard-server/src/main/java/com/yuanchu/mom/service/MbomService.java
index 359a9f6..7557a3f 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/MbomService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/MbomService.java
@@ -52,12 +52,6 @@
*/
Integer write(Integer id, Integer num);
- /**
- * 娣诲姞鍚屼竴涓瀷鍙风墿鏂欐竻鍗曠殑鐗堟湰
- * @param specificationsId
- * @return
- */
- Integer addVersion(Integer specificationsId,Integer version);
/**
* 鍒犻櫎
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/ProductService.java b/standard-server/src/main/java/com/yuanchu/mom/service/ProductService.java
index 5263a32..c1f3c96 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/ProductService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/ProductService.java
@@ -64,14 +64,7 @@
* @param internal
* @return
*/
- Integer write(Integer id, String required, String internal);
-
- /**
- * 娣诲姞鍚屼竴涓瀷鍙锋妧鏈寚鏍囩殑鐗堟湰
- * @param specificationsId
- * @return
- */
- Integer addVersion(Integer specificationsId,Integer version);
+ String write(Integer id, String required, String internal);
/**
* 鍒犻櫎
@@ -86,10 +79,9 @@
void delAllPro(String ids);
/**
- * 鏌ヨ鏍囧噯BOM鎶�鏈寚鏍囦腑璇ュ瀷鍙峰伐鑹轰笅鏈�鏂扮増鏈殑妫�楠岄」鐩�
+ * 鏌ヨ鏍囧噯BOM鎶�鏈寚鏍囦腑璇ュ瀷鍙峰伐鑹轰笅鐨勬楠岄」鐩�
* @param technologyId
- * @param ver
* @return
*/
- List<Product> selProByVerSpe(Integer technologyId, Integer ver);
+ List<Product> selProByVerSpe(Integer technologyId);
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/TechniqueService.java b/standard-server/src/main/java/com/yuanchu/mom/service/TechniqueService.java
index c102f35..1a68826 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/TechniqueService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/TechniqueService.java
@@ -59,13 +59,6 @@
void addTechnique(Integer technologyId, TechniqueDto techniqueDto);
/**
- * 娣诲姞鍚屼竴涓瀷鍙风敓浜у伐鑹虹殑鐗堟湰
- * @param specificationsId
- * @return
- */
- Integer addVersion(Integer specificationsId,Integer version);
-
- /**
* 鍒犻櫎
* @param id
*/
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyService.java b/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyService.java
index 6147b41..d766ca0 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/TechnologyService.java
@@ -59,13 +59,6 @@
Integer write(Integer id, Integer productionQuota);
/**
- * 娣诲姞鍚屼竴涓瀷鍙峰伐鑹鸿矾绾跨殑鐗堟湰
- * @param specificationsId
- * @return
- */
- Integer addVersion(Integer specificationsId,Integer version);
-
- /**
* 鍒犻櫎
* @param id
*/
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 f588796..9eaf9db 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
@@ -61,6 +61,18 @@
@Resource
DeviceMapper deviceMapper;
+ @Resource
+ TechnologyMapper technologyMapper;
+
+ @Resource
+ ProductMapper productMapper;
+
+ @Resource
+ MbomMapper mbomMapper;
+
+ @Resource
+ TechniqueMapper techniqueMapper;
+
//鏍囧噯MOM-->宸︿晶浜旂骇鏍戝睍绀�
@Override
public List<Map<String, Object>> selectTreeByMaterial() {
@@ -72,10 +84,13 @@
@Transactional(rollbackFor = Exception.class)
public String addMaterial(MaterialDto materialDto) {
//鏍￠獙娣诲姞鐗╂枡鏄惁閲嶅
- if (materialMapper.selectOne(Wrappers.<Material>query()
+ List<Material> materialList = materialMapper.selectList(Wrappers.<Material>query()
.eq("type", materialDto.getType())
- .eq("father", materialDto.getFather())).getName().equals(materialDto.getName())) {
- return "璇ョ被鍨嬩骇鍝佸ぇ绫讳笅鏈夎浜у搧鍚嶇О";
+ .eq("father", materialDto.getFather()));
+ for (Material material : materialList) {
+ if (material.getName().equals(materialDto.getName())) {
+ return "璇ョ被鍨嬩骇鍝佸ぇ绫讳笅鏈夎浜у搧鍚嶇О";
+ }
}
/*鏂板鐗╂枡琛�*/
Material material = new Material();
@@ -163,6 +178,78 @@
}
+ //娣诲姞鍚屼竴涓瀷鍙峰伐鑹鸿矾绾�,鎶�鏈寚鏍�,鐗╂枡娓呭崟,鐢熶骇宸ヨ壓鐨勭増鏈�
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Integer addVersion(Integer specificationsId, Integer version) {
+ List<Technology> technologyList = technologyMapper.selectList(Wrappers.<Technology>query()
+ .eq("specifications_id", specificationsId)
+ .eq("version", version));
+ /*涓婁竴涓増鏈殑宸ヨ壓璺嚎id闆嗗悎*/
+ List<Integer> techTemIds = technologyList.stream().map(Technology::getId).collect(Collectors.toList());
+ for (Technology technology : technologyList) {
+ technology.setId(null);
+ //鏈�鏂扮増鏈�+1
+ technology.setVersion(technologyMapper.selectVerByTec(specificationsId).get(0) + 1);
+ }
+ technologyService.saveBatch(technologyList);
+ /*宸ヨ壓璺嚎鐨勭増鏈柊澧炵殑鍚屾椂璇ュ伐鑹鸿矾绾夸笅涓嬬殑鎶�鏈寚鏍�,鐢熶骇宸ヨ壓,鐗╂枡娓呭崟閮借鏂板*/
+ //鏂板鐗堟湰鐨勫伐鑹鸿矾绾縤d闆嗗悎
+ List<Integer> technologyIds = technologyList.stream().map(Technology::getId).collect(Collectors.toList());
+ //涓よ�呴暱搴︿竴瀹氫竴鏍�
+ List<Product> productList = new ArrayList<>();
+ for (int i = 0; i < technologyIds.size(); i++) {
+ List<Product> products = productMapper.selectList(Wrappers.<Product>query().eq("technology_id", techTemIds.get(i)));
+ for (Product pro : products) {
+ Product product = new Product();
+ product.setFather(pro.getFather());
+ product.setName(pro.getName());
+ product.setUnit(pro.getUnit());
+ product.setRequired(pro.getRequired());
+ product.setInternal(pro.getInternal());
+ product.setVersion(pro.getVersion()+1);
+ product.setTechnologyId(technologyIds.get(i));
+ productList.add(product);
+ }
+ }
+ productService.saveBatch(productList);
+ /*鏂板鏍囧噯BOM-->鐗╂枡娓呭崟(鎵归噺娣诲姞)*/
+ List<Mbom> mbomList = new ArrayList<>();
+ for (int i = 0; i < technologyIds.size(); i++) {
+ List<Mbom> mboms = mbomMapper.selectList(Wrappers.<Mbom>query().eq("technology_id", techTemIds.get(i)));
+ for (Mbom mb : mboms) {
+ Mbom mbom = new Mbom();
+ mbom.setUnit(mb.getUnit());
+ mbom.setName(mb.getName());
+ mbom.setSupplier(mb.getSupplier());
+ mbom.setQualityTraceability(mb.getQualityTraceability());
+ mbom.setSpecifications(mb.getSpecifications());
+ mbom.setVersion(mb.getVersion()+1);
+ mbom.setNum(mb.getNum());
+ mbom.setTechnologyId(technologyIds.get(i));
+ mbomList.add(mbom);
+ }
+ }
+ mbomService.saveBatch(mbomList);
+ /*鏂板鏍囧噯BOM-->鐢熶骇宸ヨ壓(鎵归噺娣诲姞)*/
+ List<Technique> techniqueList = new ArrayList<>();
+ for (int i = 0; i < technologyIds.size(); i++) {
+ List<Technique> techniques = techniqueMapper.selectList(Wrappers.<Technique>query().eq("technology_id", techTemIds.get(i)));
+ for (Technique teque : techniques) {
+ Technique technique = new Technique();
+ technique.setTechnologyId(technologyIds.get(i));
+ technique.setDevice(teque.getDevice());
+ technique.setProductFather(teque.getProductFather());
+ technique.setProduct(teque.getProduct());
+ technique.setUnit(teque.getUnit());
+ technique.setVersion(teque.getVersion()+1);
+ techniqueList.add(technique);
+ }
+ }
+ techniqueService.saveBatch(techniqueList);
+ return technologyList.get(0).getVersion();
+ }
+
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/MbomServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/MbomServiceImpl.java
index b438470..dff40ee 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/MbomServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/MbomServiceImpl.java
@@ -64,19 +64,6 @@
return mbomMapper.updateById(mbom);
}
- //娣诲姞鍚屼竴涓瀷鍙风墿鏂欐竻鍗曠殑鐗堟湰
- @Override
- public Integer addVersion(Integer specificationsId,Integer version) {
- List<Mbom> mbomList = mbomMapper.selAllBySpeId(specificationsId,version);
- for (Mbom mbom : mbomList) {
- mbom.setId(null);
- //鏈�鏂扮増鏈�+1
- mbom.setVersion(mbomMapper.selectVerByMbom(specificationsId).get(0) + 1);
- }
- saveBatch(mbomList);
- return mbomList.get(0).getVersion();
- }
-
//鍒犻櫎
@Override
public void delMbomById(Integer id) {
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
index 1b3815d..c42c0d4 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/ProductServiceImpl.java
@@ -70,25 +70,23 @@
//濉啓鏍囧噯鍊间笌鍐呮帶鍊�,榧犳爣绉诲紑淇濆瓨
@Override
- public Integer write(Integer id, String required, String internal) {
+ public String write(Integer id, String required, String internal) {
+ //鏍￠獙鏍囧噯鍊�,鍐呮帶鍊兼牸寮�
+ char inter = internal.charAt(0);
+ char requ = required.charAt(0);
+ if (inter != '>' && inter != '<' && inter != '=') {
+ return "鍐呮帶鍊艰緭鍏ユ牸寮忔湁闂!";
+ }
+ if (requ != '>' && requ != '<' && requ != '=') {
+ return "鏍囧噯鍊艰緭鍏ユ牸寮忔湁闂!";
+ }
+
Product product = new Product();
product.setId(id);
product.setRequired(required);
product.setInternal(internal);
- return productMapper.updateById(product);
- }
-
- //娣诲姞鍚屼竴涓瀷鍙锋妧鏈寚鏍囩殑鐗堟湰
- @Override
- public Integer addVersion(Integer specificationsId,Integer version) {
- List<Product> productList = productMapper.selAllBySpeId(specificationsId,version);
- for (Product product : productList) {
- product.setId(null);
- //鏈�鏂扮増鏈�+1
- product.setVersion(productMapper.selectVerByPro(specificationsId).get(0)+1);
- }
- saveBatch(productList);
- return productList.get(0).getVersion();
+ productMapper.updateById(product);
+ return "淇濆瓨鎴愬姛!";
}
//鍒犻櫎
@@ -108,8 +106,8 @@
//鏌ヨ鏍囧噯BOM鎶�鏈寚鏍囦腑璇ュ瀷鍙峰伐鑹轰笅鏈�鏂扮増鏈殑妫�楠岄」鐩�
@Override
- public List<Product> selProByVerSpe(Integer technologyId, Integer ver) {
- return productMapper.selProByVerSpe(technologyId,ver);
+ public List<Product> selProByVerSpe(Integer technologyId) {
+ return productMapper.selProByVerSpe(technologyId);
}
}
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java
index 7ccdfc7..1729a3d 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechniqueServiceImpl.java
@@ -67,19 +67,6 @@
techniqueMapper.insert(technique);
}
- //娣诲姞鍚屼竴涓瀷鍙风敓浜у伐鑹虹殑鐗堟湰
- @Override
- public Integer addVersion(Integer specificationsId,Integer version) {
- List<Technique> techniqueList = techniqueMapper.selAllBySpeId(specificationsId,version);
- for (Technique technique : techniqueList) {
- technique.setId(null);
- //鏈�鏂扮増鏈�+1
- technique.setVersion(techniqueMapper.selectVerByTeq(specificationsId).get(0)+1);
- }
- saveBatch(techniqueList);
- return techniqueList.get(0).getVersion();
- }
-
//鍒犻櫎
@Override
public void delTeqById(Integer id) {
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java
index f713884..43b8597 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/impl/TechnologyServiceImpl.java
@@ -4,17 +4,19 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.mapper.*;
-import com.yuanchu.mom.pojo.Technology;
+import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.pojo.dto.TechnologyDto;
-import com.yuanchu.mom.service.TechnologyService;
+import com.yuanchu.mom.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -40,7 +42,16 @@
MbomMapper mbomMapper;
@Resource
+ MbomService mbomService;
+
+ @Resource
TechniqueMapper techniqueMapper;
+
+ @Resource
+ ProductService productService;
+
+ @Resource
+ TechniqueService techniqueService;
//鏍规嵁鍨嬪彿id鏌ヨ鐗堟湰
@@ -69,6 +80,7 @@
//鍙充笂瑙掓柊澧�-->宸ヨ壓璺嚎
@Override
+ @Transactional(rollbackFor = Exception.class)
public void addTechnology(Integer specificationsId, TechnologyDto technologyDto) {
Technology technology = new Technology();
BeanUtils.copyProperties(technologyDto, technology);
@@ -83,21 +95,6 @@
technology.setId(id);
technology.setProductionQuota(productionQuota);
return technologyMapper.updateById(technology);
- }
-
- //娣诲姞鍚屼竴涓瀷鍙峰伐鑹鸿矾绾跨殑鐗堟湰
- @Override
- public Integer addVersion(Integer specificationsId, Integer version) {
- List<Technology> technologyList = technologyMapper.selectList(Wrappers.<Technology>query()
- .eq("specifications_id", specificationsId)
- .eq("version", version));
- for (Technology technology : technologyList) {
- technology.setId(null);
- //鏈�鏂扮増鏈�+!
- technology.setVersion(technologyMapper.selectVerByTec(specificationsId).get(0) + 1);
- }
- saveBatch(technologyList);
- return technologyList.get(0).getVersion();
}
//鍒犻櫎
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 8a0c049..ffb32b8 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -93,7 +93,6 @@
select *
from mom_ocean.product
where state = 1
- and version = #{ver}
and technology_id = #{technologyId}
</select>
--
Gitblit v1.9.3