From 9fe4b53620f1ea0a4278240a7acee7bc4ef739c6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 07 九月 2023 15:29:53 +0800
Subject: [PATCH] 修改bug9.7
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java | 91 +++------------------------------------------
1 files changed, 7 insertions(+), 84 deletions(-)
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;
- }
- }
- }
}
--
Gitblit v1.9.3