From 68f6642d4d1fff10c6bd898d69dd7bff27adbc16 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 24 九月 2023 15:18:29 +0800
Subject: [PATCH] 修改2.0 9.24
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java | 3
inspect-server/src/main/java/com/yuanchu/mom/controller/FinishedInspectController.java | 7 +-
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 112 +++++++++++++++++++------------------
inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java | 5 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 4 +
inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/ProcessInspectService.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java | 3
inspect-server/src/main/java/com/yuanchu/mom/controller/ProcessInspectController.java | 7 +-
inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java | 7 +-
inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java | 2
11 files changed, 84 insertions(+), 70 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 3814183..4a6b30a 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
@@ -62,17 +62,18 @@
@ApiOperation(value = "涓婃姤(鏇存柊妫�楠岀姸鎬�)")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "number", value = "涓嶅悎鏍兼暟閲�", dataTypeClass = Integer.class)
})
@PostMapping("/updateFinishInspectsById")
- public Result updateFinishInspectsById(@RequestHeader("token") String token, Integer id) throws Exception {
+ public Result updateFinishInspectsById(@RequestHeader("token") String token, Integer id,Integer number) throws Exception {
//濡傛灉宸茬粡涓婃姤浜嗕笉鑳藉啀涓�娆′笂鎶�
FinishedInspect finishedInspect = finishedInspectService.getById(id);
if (ObjectUtils.isNotEmpty(finishedInspect.getResult())) {
return Result.fail("宸茬粡涓婃姤杩囦簡,涓嶈兘鍐嶆涓婃姤!");
}
Map<String, String> data = JackSonUtil.unmarshal(jwt.readJWT(token).get("data"), Map.class);
- return Result.success(finishedInspectService.updateFinishInspectsById(data.get("name").replaceAll("\"", ""), id));
+ return Result.success(finishedInspectService.updateFinishInspectsById(data.get("name").replaceAll("\"", ""), id,number));
}
@ApiOperation(value = "鏍规嵁妫�楠屽崟id鏌ヨ鎴愬搧妫�楠屽崟璇︽儏")
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/ProcessInspectController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/ProcessInspectController.java
index e3fac84..4299d1d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/ProcessInspectController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/ProcessInspectController.java
@@ -58,16 +58,17 @@
@ApiOperation(value = "涓婃姤(鏇存柊妫�楠岀姸鎬�)")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "number", value = "涓嶅悎鏍兼暟閲�", dataTypeClass = Integer.class)
})
@PostMapping("/updateProcessInspectsById")
- public Result updateProcessInspectsById(Integer id) {
+ public Result updateProcessInspectsById(Integer id,Integer number) {
//濡傛灉宸茬粡涓婃姤浜嗕笉鑳藉啀涓�娆′笂鎶�
ProcessInspect processInspect = processInspectService.getById(id);
if (ObjectUtils.isNotEmpty(processInspect.getResult())) {
return Result.fail("宸茬粡涓婃姤杩囦簡,涓嶈兘鍐嶆涓婃姤!");
}
- return Result.success(processInspectService.updateProcessInspectsById(id));
+ return Result.success(processInspectService.updateProcessInspectsById(id,number));
}
@ApiOperation(value = "鏍规嵁妫�楠屽崟id鏌ヨ杩囩▼妫�楠屽崟璇︽儏")
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
index f71ce6d..4dc32e3 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
@@ -79,16 +79,17 @@
@ApiOperation(value = "涓婃姤(鏇存柊妫�楠岀姸鎬�)")
@ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true)
+ @ApiImplicitParam(name = "id", value = "妫�楠屽崟id", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "number", value = "涓嶅悎鏍兼暟閲�", dataTypeClass = Integer.class)
})
@PostMapping("/updateRawInspectsById/{id}")
- public Result updateRawInspectsById(@PathVariable Integer id) {
+ public Result updateRawInspectsById(@PathVariable Integer id,Integer number) {
//濡傛灉宸茬粡涓婃姤浜嗕笉鑳藉啀涓�娆′笂鎶�
RawInspect rawInspect = rawInspectService.getById(id);
if (rawInspect.getInsState() == 1) {
return Result.fail("宸茬粡涓婃姤杩囦簡,涓嶈兘鍐嶆涓婃姤!");
}
- return Result.success(rawInspectService.updateRawInspectsById(id));
+ return Result.success(rawInspectService.updateRawInspectsById(id,number));
}
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
index 0aaa0e6..c0039ed 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
@@ -41,6 +41,11 @@
private String reason;
/**
+ * 鏁伴噺
+ **/
+ private Integer number;
+
+ /**
* 澶勭悊鐘舵�� 0锛氬緟澶勭悊锛�1锛氬凡澶勭悊
**/
private Integer dealState;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java
index 38545ce..55cca2d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java
@@ -42,7 +42,7 @@
* @param id
* @return
*/
- String updateFinishInspectsById(String username,Integer id);
+ String updateFinishInspectsById(String username,Integer id,Integer number);
/**
* 鍒嗛〉鏌ヨ鎴愬搧妫�楠屽崟鍒楄〃
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/ProcessInspectService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/ProcessInspectService.java
index 7f20d43..8f94a42 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/ProcessInspectService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/ProcessInspectService.java
@@ -37,7 +37,7 @@
* @param id
* @return
*/
- String updateProcessInspectsById(Integer id);
+ String updateProcessInspectsById(Integer id,Integer number);
/**
* 鏍规嵁妫�楠屽崟id鏌ヨ杩囩▼妫�楠屽崟璇︽儏
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
index 0bce4a8..7439b81 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java
@@ -53,7 +53,7 @@
* 鏇存柊妫�楠岀姸鎬�
* @param id
*/
- String updateRawInspectsById(Integer id);
+ String updateRawInspectsById(Integer id,Integer number);
}
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 17e5402..d06c736 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
@@ -102,7 +102,7 @@
//涓婃姤(鏇存柊妫�楠岀姸鎬�)
@Override
@Transactional(rollbackFor = Exception.class)
- public String updateFinishInspectsById(String username, Integer id) {
+ public String updateFinishInspectsById(String username, Integer id,Integer number) {
/*鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀粨璁�*/
//鍏堝垽鏂楠岀粨鏋�
List<Integer> results = inspectionItemMapper.getResult(id, 2);
@@ -126,6 +126,7 @@
if (finishedInspect.getResult() == 0) {
InspectUnaccepted finishUnaccepted = InspectUnaccepted.builder()
.reason(finishedInspect.getMaterial() + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓轰骇鍝佸悕绉颁笉鍚堟牸
+ .number(number)
.rawInspectId(id)
.type(1) //绫诲瀷涓烘垚鍝佹楠�
.build();
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 540548e..7bb7f00 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
@@ -76,7 +76,7 @@
//涓婃姤(鏇存柊妫�楠岀姸鎬�)
@Override
@Transactional(rollbackFor = Exception.class)
- public String updateProcessInspectsById(Integer id) {
+ public String updateProcessInspectsById(Integer id,Integer number) {
/*鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀粨璁�*/
//鍏堝垽鏂楠岀粨鏋�
List<Integer> results = inspectionItemMapper.getResult(id, 1);
@@ -100,6 +100,7 @@
if (processInspect.getResult() == 0) {
InspectUnaccepted processUnaccepted = InspectUnaccepted.builder()
.reason(processInspect.getMaterial() + processInspect.getTechname() + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓轰骇鍝佸悕绉�+宸ヨ壓涓嶅悎鏍�
+ .number(number)
.rawInspectId(id)
.type(2) //绫诲瀷涓鸿繃绋嬫楠�
.build();
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 531a1eb..d3509d2 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
@@ -49,6 +49,7 @@
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()); //鍘熸潗鏂欑紪鐮�
@@ -148,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);
@@ -175,6 +176,7 @@
if (rawInspect.getJudgeState() == 0) {
InspectUnaccepted rawUnaccepted = InspectUnaccepted.builder()
.reason(rawInspectMapper.selectById(id).getName() + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓哄師鏉愭枡涓嶅悎鏍�
+ .number(number)
.rawInspectId(id)
.type(0) //绫诲瀷涓哄師鏉愭枡
.build();
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 83fe31d..18683bc 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.mom.mapper.InspectUnacceptedMapper">
-
-
<!--涓嶅悎鏍肩鐞�-->
<select id="selectInsList" resultType="java.util.Map">
SELECT ru.id,
@@ -15,7 +13,7 @@
fi.project_name,
fi.specifications_model,
fi.unit,
- fi.quantity,
+ number quantity,
DATE_FORMAT(fi.inspectionDate, '%Y-%m-%d') inspectionDate,
DATE_FORMAT(fi.processingDate, '%Y-%m-%d') processingDate
FROM mom_ocean.inspect_unaccepted ru, mom_ocean.`user` u, (
@@ -53,23 +51,23 @@
<!--鍘熸潗鏂欎笉鍚堟牸鍝�-->
<select id="selectUnqualifiedRawMaterials" resultType="map">
SELECT i.id,
- DATE_FORMAT(r.form_time, '%Y-%m-%d') dateArrival,
- i.`reason`,
- r.`code`,
- r.`name`,
- r.`specifications`,
- r.`unit`,
- r.`number`,
- DATE_FORMAT(r.`create_time`,'%Y-%m-%d') inspectionDate,
- r.`user_name`,
- DATE_FORMAT(r.`ins_time`,'%Y-%m-%d') processingDate,
- r.`supplier`,
- i.`deal_state`,
- i.`deal_reasult`
+ DATE_FORMAT(r.form_time, '%Y-%m-%d') dateArrival,
+ i.`reason`,
+ r.`code`,
+ r.`name`,
+ r.`specifications`,
+ r.`unit`,
+ i.number,
+ DATE_FORMAT(r.`create_time`,'%Y-%m-%d') inspectionDate,
+ r.`user_name`,
+ DATE_FORMAT(r.`ins_time`,'%Y-%m-%d') processingDate,
+ r.`supplier`,
+ i.`deal_state`,
+ i.`deal_reasult`
FROM mom_ocean.inspect_unaccepted i
- LEFT JOIN mom_ocean.raw_inspect r ON i.`raw_inspect_id` = r.`id`
+ LEFT JOIN mom_ocean.raw_inspect r ON i.`raw_inspect_id` = r.`id`
WHERE i.`state` = 1
- AND i.`type` = 0
+ AND i.`type` = 0
<if test="formTime != null and formTime != ''">
AND r.form_time = #{formTime}
</if>
@@ -87,48 +85,52 @@
<!--涓嶅悎鏍煎缃�-->
<select id="selectDisposal" resultType="map">
- SELECT i.`id`, s.`type`, s.name productName, s.`specifications`, s.number, i.`tell` description,
+ SELECT i.`id`, s.`type`, s.name productName, s.`specifications`, i.number, i.`tell` description,
i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`
FROM mom_ocean.inspect_unaccepted i
LEFT JOIN
(
- -- 鍘熸潗鏂�
- SELECT 0 AS `type`, r.`name`, r.`specifications`, r.`number`, r.`id`, r.`user_name`
- FROM mom_ocean.raw_inspect r
- WHERE r.state = 1
- <if test="specificationModel != null and specificationModel != ''">AND r.`specifications` LIKE CONCAT('%',
- #{specificationModel}, '%')
- </if>
- <if test="
- productName != null and productName != ''">AND r.`name` LIKE CONCAT('%', #{productName}, '%')
- </if>
- UNION ALL
- -- 鎴愬搧
- SELECT 1 AS `type`, f.`project_name` `name`, f.`specifications_model` specifications, f.`quantity` `number`, f.`id`, u.name user_name
- FROM mom_ocean.finished_inspect f, mom_ocean.`user` u
- WHERE f.`state` = 1
- AND u.id = f.user_id
- <if test="specificationModel != null and specificationModel != ''">
- AND f.`specifications_model` LIKE CONCAT('%', #{specificationModel}, '%')
- </if>
- <if test="productName != null and productName != ''">
- AND f.`project_name` LIKE CONCAT('%', #{productName}, '%')
- </if>
- UNION ALL
- -- 鍗婃垚鍝�
- SELECT 2 AS `type`, p.`material` `name`, p.`specifications_model` specifications, p.`quantity` `number`, p.`id`, u.name user_name
- FROM mom_ocean.process_inspect p, mom_ocean.`user` u
- WHERE p.state = 1
- AND u.id = p.user_id
- <if test="specificationModel != null and specificationModel != ''">
- AND p.`specifications_model` LIKE CONCAT('%', #{specificationModel}, '%')
- </if>
- <if test="productName != null and productName != ''">
- AND p.`material` LIKE CONCAT('%', #{productName}, '%')
- </if>
- )AS s ON s.`id` = i.`raw_inspect_id` AND s.`type` = i.type
+ -- 鍘熸潗鏂�
+ SELECT 0 AS `type`, r.`name`, r.`specifications`, r.`number`, r.`id`, r.`user_name`
+ FROM mom_ocean.raw_inspect r
+ WHERE r.state = 1
+ <if test="specificationModel != null and specificationModel != ''">
+ AND r.`specifications` LIKE CONCAT('%',
+ #{specificationModel}, '%')
+ </if>
+ <if test="
+ productName != null and productName != ''">
+ AND r.`name` LIKE CONCAT('%', #{productName}, '%')
+ </if>
+ UNION ALL
+ -- 鎴愬搧
+ SELECT 1 AS `type`, f.`project_name` `name`, f.`specifications_model` specifications, f.`quantity` `number`,
+ f.`id`, u.name user_name
+ FROM mom_ocean.finished_inspect f, mom_ocean.`user` u
+ WHERE f.`state` = 1
+ AND u.id = f.user_id
+ <if test="specificationModel != null and specificationModel != ''">
+ AND f.`specifications_model` LIKE CONCAT('%', #{specificationModel}, '%')
+ </if>
+ <if test="productName != null and productName != ''">
+ AND f.`project_name` LIKE CONCAT('%', #{productName}, '%')
+ </if>
+ UNION ALL
+ -- 鍗婃垚鍝�
+ SELECT 2 AS `type`, p.`material` `name`, p.`specifications_model` specifications, p.`quantity` `number`, p.`id`,
+ u.name user_name
+ FROM mom_ocean.process_inspect p, mom_ocean.`user` u
+ WHERE p.state = 1
+ AND u.id = p.user_id
+ <if test="specificationModel != null and specificationModel != ''">
+ AND p.`specifications_model` LIKE CONCAT('%', #{specificationModel}, '%')
+ </if>
+ <if test="productName != null and productName != ''">
+ AND p.`material` LIKE CONCAT('%', #{productName}, '%')
+ </if>
+ )AS s ON s.`id` = i.`raw_inspect_id` AND s.`type` = i.type
WHERE i.`state` = 1
- AND i.`deal_reasult` = 0
+ AND i.`deal_reasult` = 0
<if test="state != null">
AND i.`deal_state` = #{state}
</if>
--
Gitblit v1.9.3