From e2c14ffb0a6237bb5c397f5d0baaa4fa70cfe3b0 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 11 九月 2023 11:20:01 +0800
Subject: [PATCH] MOM系统-9-11
---
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 3 ++-
inspect-server/src/main/resources/mapper/RawInspectMapper.xml | 1 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 2 --
inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java | 17 +++++++++++++++--
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java | 16 ++++++++++------
inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java | 3 +++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 10 ++++++++++
7 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
index 4b0c6ad..8d31020 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
@@ -28,7 +28,6 @@
* @author zss
* @since 2023-08-07 10:04:01
*/
-@Api(tags = "QMS绠＄悊-->涓嶅悎鏍煎搧绠＄悊")
@RestController
@RequestMapping("/inspectUnaccepted")
public class InspectUnacceptedController {
@@ -42,7 +41,7 @@
@Autowired
private OpinionService opinionService;
- @ApiOperation(value = "鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧绠＄悊")
+ @ApiOperation(value = "涓嶅悎鏍煎搧绠＄悊鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧绠＄悊")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize",value = "椤垫暟",dataTypeClass = Integer.class,required = true),
@ApiImplicitParam(name = "countSize",value = "鏉℃暟/椤�",dataTypeClass = Integer.class,required = true),
@@ -86,6 +85,20 @@
return Result.success(map);
}
+ @ApiOperation(value = "璇勫", tags = "QMS绠＄悊-->鍘熸潗鏂欎笉鍚堟牸鍝�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "rawId",value = "鍘熸潗鏂橧d",dataTypeClass = Integer.class,required = true),
+ @ApiImplicitParam(name = "passOrNo",value = "鏄惁閫氳繃锛�0锛氫笉閫氳繃锛�1锛氶�氳繃",dataTypeClass = Integer.class,required = true)
+ })
+ @PostMapping("/evaluatePassOrNo")
+ public Result<?> rawEvaluate(Integer rawId, Integer passOrNo){
+ Integer integer = inspectUnacceptedService.rawEvaluate(rawId, passOrNo);
+ if (integer >= 1) {
+ return Result.success("璇勫鎴愬姛锛�");
+ }
+ return Result.fail("璇勫澶辫触锛�");
+ }
+
@ApiOperation(value = "涓嶅悎鏍煎搧鍒嗛〉鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize",value = "椤垫暟",dataTypeClass = Integer.class,required = true),
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
index 8505445..f75736e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.InspectUnaccepted;
+import com.yuanchu.mom.vo.Result;
import java.util.Map;
@@ -52,5 +53,7 @@
* @return
*/
Integer descriptionUpdate(Integer rawUnacceptedId, String tell);
+
+ Integer rawEvaluate(Integer rawId, Integer passOrNo);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
index fd02e38..d9c00ba 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
@@ -8,6 +8,7 @@
import com.yuanchu.mom.mapper.InspectUnacceptedMapper;
import com.yuanchu.mom.pojo.InspectUnaccepted;
import com.yuanchu.mom.service.InspectUnacceptedService;
+import com.yuanchu.mom.vo.Result;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -48,5 +49,14 @@
.set(InspectUnaccepted::getTell, tell);
return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
}
+
+ @Override
+ public Integer rawEvaluate(Integer rawId, Integer passOrNo) {
+ LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
+ .eq(InspectUnaccepted::getId, rawId)
+ .set(InspectUnaccepted::getDealReasult, passOrNo)
+ .set(InspectUnaccepted::getDealState, 1);
+ return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
index 98ea903..f3be70b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
@@ -1,15 +1,19 @@
package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.RawInsProductMapper;
import com.yuanchu.mom.mapper.RawInspectMapper;
import com.yuanchu.mom.pojo.RawInsProduct;
import com.yuanchu.mom.pojo.RawInspect;
import com.yuanchu.mom.service.RawInsProductService;
+import com.yuanchu.mom.utils.MyUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.sql.Wrapper;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -64,12 +68,12 @@
//鍙洿鏀硅澶�,涔嬪墠鐨勬楠屽�煎垹鎺�
@Override
public void updateDevByRpId(Integer rpId, Integer devId) {
- RawInsProduct rawInsProduct = new RawInsProduct();
- rawInsProduct.setId(rpId);
- rawInsProduct.setDeviceId(devId);
- rawInsProduct.setTestValue(null);
- rawInsProduct.setTestState(null);
- rawInsProductMapper.updateById(rawInsProduct);
+ LambdaUpdateWrapper<RawInsProduct> updateWrapper = Wrappers.<RawInsProduct>lambdaUpdate()
+ .eq(RawInsProduct::getId, rpId)
+ .set(RawInsProduct::getDeviceId, devId)
+ .set(RawInsProduct::getTestState, null)
+ .set(RawInsProduct::getTestValue, null);
+ rawInsProductMapper.update(new RawInsProduct(), updateWrapper);
}
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
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 5df5261..f53b6c8 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
@@ -106,8 +106,6 @@
//鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏
@Override
public Map<String, Object> selectRawInspectsListById(Integer id) {
- Map<String, Object> map = rawInspectMapper.selectRawInspectsListById(id);
- MyUtil.PrintLog(map.toString());
return rawInspectMapper.selectRawInspectsListById(id);
}
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 7a3d9b8..b6471a3 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -35,7 +35,7 @@
order by ru.id desc
</select>
- <!--鍘熸潗鏂欎笉鍚堟牸-->
+ <!--鍘熸潗鏂欎笉鍚堟牸鍝�-->
<select id="selectUnqualifiedRawMaterials" resultType="map">
SELECT i.id,
DATE_FORMAT(r.form_time, '%Y-%m-%d') dateArrival,
@@ -113,6 +113,7 @@
</if>
)AS s ON s.`id` = i.`raw_inspect_id` AND s.`type` = i.type
WHERE i.`state` = 1
+ AND i.`deal_reasult` = 0
<if test="state != null">
AND i.`deal_state` = #{state}
</if>
diff --git a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
index c51a136..985266e 100644
--- a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
@@ -56,6 +56,7 @@
<if test="name!=null and name!=''">
and name like concat('%',#{name},'%')
</if>
+ ORDER BY id DESC
</select>
<!--鏍规嵁鍘熸潗鏂欐楠屽崟id鏌ョ湅璇︽儏-->
--
Gitblit v1.9.3