From d1ea726be5628c46fb6be700a0197002d55d39f1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 13:14:24 +0800
Subject: [PATCH] 修改2.0 9.25
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 85 ++++++++++++++++++++++++++++++------------
1 files changed, 61 insertions(+), 24 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
index 736da38..b5923e3 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
@@ -1,12 +1,12 @@
package com.yuanchu.mom.service.impl;
-import cn.hutool.extra.qrcode.BufferedImageLuminanceSource;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.zxing.*;
-import com.google.zxing.common.HybridBinarizer;
+import com.yuanchu.mom.Task.SyncOrder;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.pojo.vo.RawInsProductVo;
@@ -17,10 +17,6 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
@@ -47,24 +43,51 @@
@Resource
UserMapper userMapper;
+ //鏂板鍘熸潗鏂欐楠屽崟-->鏍规嵁鍘熸潗鏂欑紪鐮佸緱鍒癷fs涓殑鎶ユ鏁版嵁
+ @Override
+ public RawInspectVo chooseIFS(String code) {
+ RawInspectVo rawInspectVo = new RawInspectVo();
+ List<Map<String, Object>> mapList = SyncOrder.ifsInterfaces();
+ for (Map<String, Object> map : mapList) {
+ //todo: 鍚庣画闇�瑕佸皢鐘舵�佹敼鎴愬緟妫�楠�
+ if (map.get("STATE").equals("宸叉帴鏀�")) {
+ if (map.get("PART_NO").toString().equals(code)) {
+ rawInspectVo.setCode(map.get("PART_NO").toString()); //鍘熸潗鏂欑紪鐮�
+ String[] split = map.get("PART_DESC").toString().split("锛�");
+ rawInspectVo.setName(split[0]); //鍘熸潗鏂欏悕绉�
+ rawInspectVo.setSpecifications(split[1]); //鍨嬪彿瑙勬牸
+ rawInspectVo.setUnit(map.get("BUY_UNIT_MEAS").toString()); //鍗曚綅
+ rawInspectVo.setNumber(Integer.parseInt(String.valueOf(map.get("QTY_TO_INSPECT")))); //鏁伴噺
+ rawInspectVo.setFormTime(DateUtil.parse(map.get("APPROVED_DATE").toString())); //鏉ユ枡鏃ユ湡
+ rawInspectVo.setSupplier(map.get("SUPPLIER_NAME").toString()); //渚涘簲鍟�
+ }
+ }
+ }
+ //鏌ヨ璇ュ師鏉愭枡鏄惁鏈夋楠岄」鐩褰�
+ RawInspect rawInspect = rawInspectMapper.selOneByCode(code);
+ if (ObjectUtils.isNotEmpty(rawInspect)){
+ List<RawInsProduct> rawInsProductList = rawInsProductMapper.selectList(Wrappers.<RawInsProduct>query().eq("raw_inspect_id", rawInspect.getId()));
+ List<RawInsProductVo> rawInsProductVos = rawInsProductList.stream().map(rawInsProduct -> {
+ RawInsProductVo rawInsProductVo = new RawInsProductVo();
+ rawInsProductVo.setName(rawInsProduct.getName());
+ rawInsProductVo.setUnit(rawInsProduct.getUnit());
+ rawInsProductVo.setRequired(rawInsProduct.getRequired());
+ rawInsProductVo.setInternal(rawInsProduct.getInternal());
+ return rawInsProductVo;
+ }).collect(Collectors.toList());
+ rawInspectVo.setRawInsProducts(rawInsProductVos);
+ }
+ return rawInspectVo;
+ }
+
//鏂板鍘熸潗鏂欐楠屽崟
@Override
@Transactional(rollbackFor = Exception.class)
- public String addRawInspects(String userId, RawInspectVo rawInspectVo) throws Exception {
+ public String addRawInspects(String userId, RawInspectVo rawInspectVo) {
//鎶ユ浜�(鏂板妫�楠屽崟鐨勪汉)
rawInspectVo.setUserName(userMapper.selectById(userId).getName());
//鏍￠獙鏍囧噯鍊�,鍐呮帶鍊兼牸寮�
List<RawInsProductVo> rawInsProductVos = rawInspectVo.getRawInsProducts();
- /*for (RawInsProductVo rawInsProductVo : rawInsProductVos) {
- char internal = rawInsProductVo.getInternal().charAt(0);
- char required = rawInsProductVo.getRequired().charAt(0);
- if (internal != '>' && internal != '<' && internal != '=') {
- return "鍐呮帶鍊艰緭鍏ユ牸寮忔湁闂!";
- }
- if (required != '>' && required != '<' && required != '=') {
- return "鏍囧噯鍊艰緭鍏ユ牸寮忔湁闂!";
- }
- }*/
/*鏂板鍘熸潗鏂欐楠屽崟*/
RawInspect rawInspect = new RawInspect();
BeanUtils.copyProperties(rawInspectVo, rawInspect);
@@ -83,8 +106,14 @@
String required = rawInsProduct.getRequired();//鏍囧噯鍊�
String internal = rawInsProduct.getInternal();//鍐呮帶鍊�
String testValue = rawInsProduct.getTestValue();//妫�娴嬪��
+ char req = required.charAt(0);
List<Integer> list = Arrays.stream(testValue.split(",")).map(s -> {
- int values = checkValues(required, internal, s);
+ int values = 2;
+ if (req == '>' || req == '<' || req == '=') {
+ values = checkValues(required, internal, s);
+ } else {
+ values = conValues(required, internal, s);
+ }
return values;
}).collect(Collectors.toList());
if (list.contains(0)) {
@@ -120,7 +149,7 @@
//鏇存柊妫�楠岀姸鎬�(涓婃姤)
@Override
@Transactional(rollbackFor = Exception.class)
- public String updateRawInspectsById(Integer id) {
+ public String updateRawInspectsById(Integer id,Integer number) {
/*鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀粨璁�*/
//鍏堝垽鏂楠岀粨鏋�
List<Integer> results = rawInsProductMapper.getresult(id);
@@ -147,17 +176,21 @@
if (rawInspect.getJudgeState() == 0) {
InspectUnaccepted rawUnaccepted = InspectUnaccepted.builder()
.reason(rawInspectMapper.selectById(id).getName() + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓哄師鏉愭枡涓嶅悎鏍�
+ .number(number)
.rawInspectId(id)
.type(0) //绫诲瀷涓哄師鏉愭枡
.build();
inspectUnacceptedMapper.insert(rawUnaccepted);
}
- return "涓婃姤鎴愬姛!";
+ /*妫�楠屽畬鎴愬悗锛屾棤璁哄悎鏍间笌鍚︼紝灏咺FS鎶ユ鐘舵�佹洿鏀逛负宸叉帴鏀�*/
+
+ return rawInspect.getJudgeState().toString();
}
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
- private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
+ //濡傛灉鏄辩殑鎿嶄綔
+ private int conValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
double standVar = Double.parseDouble(standardValueStr);
double controlVar = Double.parseDouble(controlValueStr);
double detecVar = Double.parseDouble(detectionValueStr);
@@ -167,14 +200,18 @@
return 1;
}
return 0;
- /*boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
+ }
+
+ //濡傛灉鏄�> , < ,=鐨勬搷浣�
+ 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) {
--
Gitblit v1.9.3