From f682213b9ff8a7d41ea16edfb1b68d996c46e080 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期六, 29 三月 2025 14:03:36 +0800
Subject: [PATCH] 1.清除无用方法 2.检测项目预警修改 3.数采绑定调整
---
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarning.java | 2
basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java | 3
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java | 3
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 13 +
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java | 2
cnas-device/src/main/java/com/ruoyi/device/mapper/DataConfigMapper.java | 7 +
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java | 31 +++--
inspect-server/src/main/java/com/ruoyi/inspect/dto/InsProductDeviationWarningDto.java | 11 +
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 18 +++
inspect-server/src/main/java/com/ruoyi/inspect/service/InsSampleService.java | 8 +
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 95 ++++++++-------
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 10 -
inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java | 7 +
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodListMapper.java | 2
cnas-device/src/main/java/com/ruoyi/device/service/DataConfigService.java | 9 +
inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningService.java | 1
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 9 +
cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java | 10 +
inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml | 11 +
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningMapper.java | 3
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java | 7 +
basic-server/src/main/resources/mapper/StandardMethodListMapper.xml | 18 ---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsSampleServiceImpl.java | 11 +
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java | 4
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java | 9 +
cnas-device/src/main/resources/mapper/DataConfigMapper.xml | 14 ++
27 files changed, 216 insertions(+), 104 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodListMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodListMapper.java
index 5c927f2..34c8292 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodListMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodListMapper.java
@@ -26,8 +26,6 @@
List<StandardMethodList> selectStandardMethodLists3(@Param("tree") String tree);
- List<StandardMethodList> selectStandardMethodLists2(@Param("data1") String data1, @Param("data2") String data2, @Param("data3") String data3, @Param("data4") String data4, @Param("data5") String data5);
-
List<StandardProductList> selectParameterList(@Param("code") String code);
List<StandardMethodList> selectListEnum();
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
index af6f8fb..e6fbad1 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
@@ -30,8 +30,6 @@
List<StandardProductList> getStandardProductListBySample(String sampleType);
- List<StandardMethodList> getStandardMethodListBySample(String sampleType);
-
List<StandardProductList> selectStandardProductListByTree(@Param("tree") String tree, @Param("sample") String sample, @Param("model") String model, @Param("trees") String trees, @Param("laboratory") String laboratory);
List<StandardProductList> selectStandardProductListByTree2(@Param("tree") String tree, @Param("sample") String sample, @Param("model") String model, @Param("trees") String trees, @Param("laboratory") String laboratory);
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java
index 7faa8be..1938e9c 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java
@@ -117,5 +117,8 @@
@ApiModelProperty(value = "鏀惰垂鏍囧噯(鍏�/娆�)")
private String rates;
+ @ApiModelProperty(value = "璁惧id")
+ private String deviceIds;
+
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
index aa95f5d..d000b4b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
@@ -27,9 +27,6 @@
private StandardMethodListMapper standardMethodListMapper;
- private StandardProductListMapper standardProductListMapper;
-
-
@Override
public Map<String, List<?>> selectsStandardMethodByFLSSM(String tree) {
String[] trees = tree.split(" - ");
diff --git a/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml b/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml
index 957fd1f..32fbb43 100644
--- a/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml
@@ -52,24 +52,6 @@
from structure_item_parameter
where method = #{code}
</select>
- <select id="selectStandardMethodLists2" resultType="com.ruoyi.basic.pojo.StandardMethodList">
- select sml.id, sml.code, sml.name,sml.remark, sml.create_time, u.name create_user_name
- from standard_method_list sml
- left join user u on u.id = sml.create_user
- where factory = #{data1}
- <if test="data2 != null">
- and laboratory = #{data2}
- </if>
- <if test="data3 != null">
- and sample_type = #{data3}
- </if>
- <if test="data4 != null">
- and sample = #{data4}
- </if>
- <if test="data5 != null">
- and model = #{data5}
- </if>
- </select>
<select id="selectStandardMethodLists3" resultType="com.ruoyi.basic.pojo.StandardMethodList">
select id, code, name, remark
from standard_method
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index a011e82..39c9d07 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -154,15 +154,7 @@
or sp.sample = ''
or sp.sample = '[]'
</select>
- <select id="getStandardMethodListBySample" resultType="com.ruoyi.basic.pojo.StandardMethodList">
- select sm.code,sm.name,sm.remark from standard_method sm
- left join structure_test_object sto on sm.structure_test_object_id = sto.id
- where is_use = 1
- and is_product = 1
- <if test="sampleType != null">
- and sto.specimen_name = #{sampleType}
- </if>
- </select>
+
<select id="selectStandardTreeList2" resultType="com.ruoyi.basic.pojo.StandardTree">
select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
l.laboratory_name laboratory,
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
index bb70b52..574cb60 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
@@ -177,6 +177,11 @@
}
+ @ApiOperation(value = "鏌ヨ缁戝畾浜嗕絾鏄病鏈夐厤缃殑妫�楠岄」")
+ @GetMapping("/getNoConfigProduct")
+ public Result<?> getNoConfigProduct(Integer deviceId) {
+ return Result.success(dataConfigService.getNoConfigProduct(deviceId));
+ }
@ApiOperation(value = "宸︿晶璁惧鏍戝舰鏍�")
@GetMapping("/treeDevice")
@@ -187,13 +192,13 @@
@ApiOperation(value = "璁惧妗ｆ瀵煎嚭")
@GetMapping("/exportDeviceFile")
- public void exportDeviceFile(@RequestParam Integer deviceId, HttpServletResponse response) throws Exception {
+ public void exportDeviceFile(@RequestParam Integer deviceId, HttpServletResponse response){
deviceService.exportDeviceFile(deviceId,response);
}
@ApiOperation(value = "浠櫒璁惧涓�瑙堣〃瀵煎嚭")
@GetMapping("/exportEquipmentDetails")
- public void exportEquipmentDetails(HttpServletResponse response) throws Exception {
+ public void exportEquipmentDetails(HttpServletResponse response){
deviceService.exportEquipmentDetails(response);
}
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/mapper/DataConfigMapper.java b/cnas-device/src/main/java/com/ruoyi/device/mapper/DataConfigMapper.java
index e810e5c..a178ada 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/mapper/DataConfigMapper.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/mapper/DataConfigMapper.java
@@ -19,4 +19,11 @@
List<DeviceConfigDtoPage> selectDataConfigList(Integer deviceId);
List<Integer> deleteDataConfig();
+
+ /**
+ * 鏌ヨ浜嗙粦瀹氫絾鏄病鏈夐厤缃殑妫�楠岄」
+ * @param deviceId
+ * @return
+ */
+ List<DataConfig> getNoConfigProduct(Integer deviceId);
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/DataConfigService.java b/cnas-device/src/main/java/com/ruoyi/device/service/DataConfigService.java
index e680c0e..607608c 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/DataConfigService.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/DataConfigService.java
@@ -5,6 +5,8 @@
import com.ruoyi.device.dto.DataConfigDto;
import com.ruoyi.device.pojo.DataConfig;
+import java.util.List;
+
/**
* <p>
* 鏈嶅姟绫�
@@ -20,4 +22,11 @@
void saveDataAcquisitionConfiguration(Integer deviceId, DataConfigDto dataConfigList);
Result<?> queryDataAcquisitionConfiguration(DataConfig dataConfig);
+
+ /**
+ * 鏌ヨ浜嗙粦瀹氫絾鏄病鏈夐厤缃殑妫�楠岄」
+ * @param deviceId
+ * @return
+ */
+ List<DataConfig> getNoConfigProduct(Integer deviceId);
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
index 1bbac34..cde5054 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
@@ -72,4 +72,14 @@
return Result.success(dataConfigMapper.selectDataConfigList(dataConfig.getDeviceId()));
}
}
+
+ /**
+ * 鏌ヨ浜嗙粦瀹氫絾鏄病鏈夐厤缃殑妫�楠岄」
+ * @param deviceId
+ * @return
+ */
+ @Override
+ public List<DataConfig> getNoConfigProduct(Integer deviceId) {
+ return baseMapper.getNoConfigProduct(deviceId);
+ }
}
diff --git a/cnas-device/src/main/resources/mapper/DataConfigMapper.xml b/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
index c28aac6..d5782b9 100644
--- a/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DataConfigMapper.xml
@@ -47,4 +47,18 @@
left join structure_item_parameter ip on not FIND_IN_SET(ip.id, d.ins_product_ids)
inner join device_data_config ddc on ddc.device_id = d.id and ddc.structure_item_parameter_id = ip.id
</select>
+ <select id="getNoConfigProduct" resultType="com.ruoyi.device.pojo.DataConfig">
+ SELECT d.id device_id,
+ ip.inspection_item,
+ ip.inspection_item_class,
+ ip.inspection_item_subclass ,
+ ip.sample,
+ ip.id structureItemParameterId,
+ ddc.id
+ FROM structure_item_parameter ip
+ left join device d on FIND_IN_SET(d.id, ip.device_ids)
+ left join device_data_config ddc on ddc.device_id = d.id and ddc.structure_item_parameter_id = ip.id
+ where d.id = #{deviceId}
+ and ddc.id is null
+ </select>
</mapper>
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index 21a7226..880fad5 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -235,8 +235,7 @@
@ApiOperation(value = "鏍规嵁璁㈠崟id鏌ヨ鏍峰搧")
@GetMapping("/getSampleByOrderId")
public Result<List<InsSample>> getSampleByOrderId(Integer insOrderId) {
- return Result.success(insSampleService.list(Wrappers.<InsSample>lambdaQuery()
- .eq(InsSample::getInsOrderId, insOrderId)));
+ return Result.success(insSampleService.getSampleByOrderId(insOrderId));
}
@ApiOperation(value = "鏍规嵁鏍峰搧id鏌ヨ妫�楠岄」鏍�")
@@ -258,4 +257,14 @@
insOrderService.rawAllInsOrderExport(sampleOrderDto,response);
}
+
+ @ApiOperation(value = "淇敼鏍峰搧鍨嬪彿")
+ @PostMapping("/updateSampleModel")
+ public Result<?> updateSampleModel(@RequestBody List<InsSample> insSampleList) {
+ for (InsSample insSample : insSampleList) {
+ insOrderService.updateSampleModel(insSample);
+ }
+ return Result.success();
+ }
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java
index 2456861..42ffb37 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsProductDeviationWarningController.java
@@ -1,9 +1,13 @@
package com.ruoyi.inspect.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.inspect.dto.InsProductDeviationWarningDto;
import com.ruoyi.inspect.dto.SampleOrderDto;
+import com.ruoyi.inspect.pojo.InsProductDeviationWarningDetail;
+import com.ruoyi.inspect.service.InsProductDeviationWarningDetailService;
import com.ruoyi.inspect.service.InsProductDeviationWarningService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -11,6 +15,8 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
/**
* <p>
@@ -28,6 +34,7 @@
private InsProductDeviationWarningService insProductDeviationWarningService;
+ private InsProductDeviationWarningDetailService insProductDeviationWarningDetailService;
/**
* 鏌ヨ棰勮鍒楄〃
@@ -37,20 +44,20 @@
*/
@ApiOperation(value = "鏌ヨ棰勮鍒楄〃")
@GetMapping("/selectDeviationWarningPage")
- public Result selectDeviationWarningPage(Page page, InsProductDeviationWarningDto deviationWarningDto) {
+ public Result<IPage<InsProductDeviationWarningDto>> selectDeviationWarningPage(Page page, InsProductDeviationWarningDto deviationWarningDto) {
return Result.success(insProductDeviationWarningService.selectDeviationWarningPage(page, deviationWarningDto));
}
-// /**
-// * 鏌ヨ棰勮璇︽儏
-// * @param page
-// * @return
-// * @throws Exception
-// */
-// @ApiOperation(value = "鏌ヨ棰勮鍒楄〃")
-// @GetMapping("/selectDeviationWarning")
-// public Result selectDeviationWarning(InsProductDeviationWarningDto deviationWarningDto){
-//// return Result.success(insProductDeviationWarningService.selectDeviationWarningPage(page, deviationWarningDto));
-// }
+ /**
+ * 鏌ヨ棰勮璇︽儏
+ * @return
+ * @throws Exception
+ */
+ @ApiOperation(value = "鏌ヨ棰勮璇︽儏")
+ @GetMapping("/selectDeviationWarning")
+ public Result<List<InsProductDeviationWarningDetail>> selectDeviationWarning(Integer deviationWarningId){
+ return Result.success(insProductDeviationWarningDetailService.list(Wrappers.<InsProductDeviationWarningDetail>lambdaQuery()
+ .eq(InsProductDeviationWarningDetail::getDeviationWarningId, deviationWarningId)));
+ }
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsProductDeviationWarningDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsProductDeviationWarningDto.java
index f4fe2f5..6c30bab 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsProductDeviationWarningDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/InsProductDeviationWarningDto.java
@@ -1,6 +1,7 @@
package com.ruoyi.inspect.dto;
import com.ruoyi.inspect.pojo.InsProductDeviationWarning;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -9,4 +10,14 @@
*/
@Data
public class InsProductDeviationWarningDto extends InsProductDeviationWarning {
+
+ @ApiModelProperty("鏍峰搧")
+ private String sampleName;
+
+ @ApiModelProperty("鍨嬪彿")
+ private String sampleModel;
+
+ @ApiModelProperty("妫�楠岄」")
+ private String inspectionItemName;
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningMapper.java
index b3ca203..037a171 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsProductDeviationWarningMapper.java
@@ -6,6 +6,7 @@
import com.ruoyi.inspect.dto.InsProductDeviationWarningDto;
import com.ruoyi.inspect.pojo.InsProductDeviationWarning;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -22,5 +23,5 @@
* @param page
* @return
*/
- IPage<InsProductDeviationWarningDto> selectDeviationWarningPage(Page page, QueryWrapper<InsProductDeviationWarningDto> ew);
+ IPage<InsProductDeviationWarningDto> selectDeviationWarningPage(@Param("page") Page page, @Param("ew") QueryWrapper<InsProductDeviationWarningDto> ew);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
index 633ebc1..98493f1 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
@@ -123,6 +123,13 @@
* @return
*/
List<InsProduct> selectProductResult(@Param("itemIds") List<Integer> itemIds);
+
+ /**
+ * 鏍规嵁璁㈠崟id鏌ヨ鏍峰搧
+ * @param insOrderId
+ * @return
+ */
+ List<InsSample> getSampleByOrderId(Integer insOrderId);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarning.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarning.java
index b2a5e9d..1bedf2b 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarning.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarning.java
@@ -26,8 +26,6 @@
@ApiModel(value = "InsProductDeviationWarning瀵硅薄", description = "妫�楠岄」鍋忓樊棰勮涓昏〃")
public class InsProductDeviationWarning implements Serializable {
- private static final long serialVersionUID = 1L;
-
@TableId(value = "deviation_warning_id", type = IdType.AUTO)
private Integer deviationWarningId;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java
index 3b925cb..2fa5dc1 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProductDeviationWarningDetail.java
@@ -26,8 +26,6 @@
@ApiModel(value = "InsProductDeviationWarningDetail瀵硅薄", description = "妫�楠岄」鍋忓樊棰勮璇︽儏琛�")
public class InsProductDeviationWarningDetail implements Serializable {
- private static final long serialVersionUID = 1L;
-
@TableId(value = "deviation_warning_detail_id", type = IdType.AUTO)
private Integer deviationWarningDetailId;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
index f3657e4..90c6a90 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
@@ -120,4 +120,8 @@
@TableField(select = false,exist = false)
private Integer num=1;
+ @ApiModelProperty("鏍囧噯鏂规硶鍚嶇О")
+ @TableField(select = false,exist = false)
+ private String standardMethodName;
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
index e666245..a0a8192 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.StandardProductList;
import com.ruoyi.inspect.pojo.InsOrder;
+import com.ruoyi.inspect.pojo.InsSample;
import com.ruoyi.inspect.pojo.InsUnqualifiedRetestProduct;
import com.ruoyi.inspect.dto.*;
import com.ruoyi.inspect.vo.InsOrderPrintingVo;
@@ -107,4 +108,10 @@
* @param response
*/
void rawAllInsOrderExport(SampleOrderDto sampleOrderDto, HttpServletResponse response);
+
+ /**
+ * 淇敼鏍峰搧鍨嬪彿
+ * @param insSample
+ */
+ void updateSampleModel(InsSample insSample);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningService.java
index 150efc6..5303108 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductDeviationWarningService.java
@@ -5,6 +5,7 @@
import com.ruoyi.inspect.dto.InsProductDeviationWarningDto;
import com.ruoyi.inspect.pojo.InsProductDeviationWarning;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsSampleService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsSampleService.java
index b87df95..207effc 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsSampleService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsSampleService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.inspect.pojo.InsSample;
+import java.util.List;
+
/**
* @author Administrator
* @description 閽堝琛ㄣ�恑ns_sample(妫�楠屾牱鍝�)銆戠殑鏁版嵁搴撴搷浣淪ervice
@@ -10,4 +12,10 @@
*/
public interface InsSampleService extends IService<InsSample> {
+ /**
+ * 鏍规嵁璁㈠崟id鏌ヨ鏍峰搧
+ * @param insOrderId
+ * @return
+ */
+ List<InsSample> getSampleByOrderId(Integer insOrderId);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index f8d709c..8daa256 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -527,55 +527,60 @@
// 娣诲姞璁惧璁板綍
threadPoolTaskExecutor.execute(() -> {
- InsOrder order = insOrderMapper.selectById(insSample.getInsOrderId());
- User user = userMapper.selectById(userId);
- // 鏌ヨ璁惧浣跨敤璁板綍鏌ヨ璇ヨ鍗曠殑浣跨敤璁板綍
- List<InsOrderDeviceRecordDto> deviceRecordDtoList = insOrderDeviceRecordMapper.selectDeviceNumber(insSample.getInsOrderId());
- Set<String> recordCodeset = deviceRecordDtoList.stream().map(InsOrderDeviceRecordDto::getManagementNumber).collect(Collectors.toSet());
+ // 娣诲姞璁惧浣跨敤璁板綍
+ addDeviceRecord(insSample, userId);
+ });
+ }
- // 鑾峰彇璁㈠崟璁惧缂栧彿
- List<InsProductResult> resultList = insProductResultMapper.selectResultByOrderId(insSample.getInsOrderId());
- Set<String> deviceCodeSet = new HashSet<>();
- for (InsProductResult result : resultList) {
- // 娣诲姞璁惧缂栧彿
- List<JSONObject> jsonObjects = JSON.parseArray(result.getEquipValue(), JSONObject.class);
- for (JSONObject jsonObject : jsonObjects) {
- if (!"".equals(jsonObject.get("v") + "")) {
- List<String> v = StrUtil.split(jsonObject.get("v") + "", "锛�");
- deviceCodeSet.addAll(v);
- }
+ private synchronized void addDeviceRecord(InsSample insSample, Integer userId) {
+ InsOrder order = insOrderMapper.selectById(insSample.getInsOrderId());
+ User user = userMapper.selectById(userId);
+ // 鏌ヨ璁惧浣跨敤璁板綍鏌ヨ璇ヨ鍗曠殑浣跨敤璁板綍
+ List<InsOrderDeviceRecordDto> deviceRecordDtoList = insOrderDeviceRecordMapper.selectDeviceNumber(insSample.getInsOrderId());
+ Set<String> recordCodeset = deviceRecordDtoList.stream().map(InsOrderDeviceRecordDto::getManagementNumber).collect(Collectors.toSet());
+
+ // 鑾峰彇璁㈠崟璁惧缂栧彿
+ List<InsProductResult> resultList = insProductResultMapper.selectResultByOrderId(insSample.getInsOrderId());
+ Set<String> deviceCodeSet = new HashSet<>();
+ for (InsProductResult result : resultList) {
+ // 娣诲姞璁惧缂栧彿
+ List<JSONObject> jsonObjects = JSON.parseArray(result.getEquipValue(), JSONObject.class);
+ for (JSONObject jsonObject : jsonObjects) {
+ if (!"".equals(jsonObject.get("v") + "")) {
+ List<String> v = StrUtil.split(jsonObject.get("v") + "", "锛�");
+ deviceCodeSet.addAll(v);
}
}
- // 1.鍒ゆ柇鏄惁鏈夋病鏈夋坊鍔犵殑浣跨敤璁板綍
- Set<String> orderDeviceNumbers = getDeviceDifference(deviceCodeSet, recordCodeset);
- // 娣诲姞浣跨敤璁板綍, 鏍规嵁缂栧彿鏌ヨ璁惧id
- if (CollectionUtils.isNotEmpty(orderDeviceNumbers)) {
- List<Integer> orderDeviceIds = insOrderDeviceRecordMapper.selectDeviceIdsByNumbers(orderDeviceNumbers);
- List<InsOrderDeviceRecord> collect = orderDeviceIds.stream().map(deviceId -> {
- InsOrderDeviceRecord insOrderDeviceRecord = new InsOrderDeviceRecord();
- insOrderDeviceRecord.setInsOrderId(insSample.getInsOrderId());
- insOrderDeviceRecord.setDeviceId(deviceId);
- insOrderDeviceRecord.setSampleCode(order.getEntrustCode());
- insOrderDeviceRecord.setUseBefore(1);
- insOrderDeviceRecord.setUseAfter(1);
- insOrderDeviceRecord.setUsePerson(user.getName());
- insOrderDeviceRecord.setUsePersonId(user.getId());
- return insOrderDeviceRecord;
- }).collect(Collectors.toList());
+ }
+ // 1.鍒ゆ柇鏄惁鏈夋病鏈夋坊鍔犵殑浣跨敤璁板綍
+ Set<String> orderDeviceNumbers = getDeviceDifference(deviceCodeSet, recordCodeset);
+ // 娣诲姞浣跨敤璁板綍, 鏍规嵁缂栧彿鏌ヨ璁惧id
+ if (CollectionUtils.isNotEmpty(orderDeviceNumbers)) {
+ List<Integer> orderDeviceIds = insOrderDeviceRecordMapper.selectDeviceIdsByNumbers(orderDeviceNumbers);
+ List<InsOrderDeviceRecord> collect = orderDeviceIds.stream().map(deviceId -> {
+ InsOrderDeviceRecord insOrderDeviceRecord = new InsOrderDeviceRecord();
+ insOrderDeviceRecord.setInsOrderId(insSample.getInsOrderId());
+ insOrderDeviceRecord.setDeviceId(deviceId);
+ insOrderDeviceRecord.setSampleCode(order.getEntrustCode());
+ insOrderDeviceRecord.setUseBefore(1);
+ insOrderDeviceRecord.setUseAfter(1);
+ insOrderDeviceRecord.setUsePerson(user.getName());
+ insOrderDeviceRecord.setUsePersonId(user.getId());
+ return insOrderDeviceRecord;
+ }).collect(Collectors.toList());
- insOrderDeviceRecordService.saveBatch(collect);
+ insOrderDeviceRecordService.saveBatch(collect);
- }
+ }
- // 2.鍒ゆ柇鏄惁鍙栨秷浜嗚澶囦娇鐢�
- Set<String> repoprNumbers = getDeviceDifference(recordCodeset, deviceCodeSet);
- if (CollectionUtils.isNotEmpty(repoprNumbers)) {
- List<Integer> reportDeviceIds = insOrderDeviceRecordMapper.selectDeviceIdsByNumbers(repoprNumbers);
- insOrderDeviceRecordMapper.delete(Wrappers.<InsOrderDeviceRecord>lambdaQuery()
- .in(InsOrderDeviceRecord::getDeviceId, reportDeviceIds)
- .eq(InsOrderDeviceRecord::getInsOrderId, insSample.getInsOrderId()));
- }
- });
+ // 2.鍒ゆ柇鏄惁鍙栨秷浜嗚澶囦娇鐢�
+ Set<String> repoprNumbers = getDeviceDifference(recordCodeset, deviceCodeSet);
+ if (CollectionUtils.isNotEmpty(repoprNumbers)) {
+ List<Integer> reportDeviceIds = insOrderDeviceRecordMapper.selectDeviceIdsByNumbers(repoprNumbers);
+ insOrderDeviceRecordMapper.delete(Wrappers.<InsOrderDeviceRecord>lambdaQuery()
+ .in(InsOrderDeviceRecord::getDeviceId, reportDeviceIds)
+ .eq(InsOrderDeviceRecord::getInsOrderId, insSample.getInsOrderId()));
+ }
}
private static Set<String> getDeviceDifference(Set<String> number1, Set<String> number2) {
@@ -674,7 +679,7 @@
}
/**
- * todo: 娓呴櫎娌℃湁浣跨敤鐨勬楠岄」
+ * todo: 鍘熷璁板綍妯℃澘娓呴櫎娌℃湁浣跨敤鐨勬楠岄」(鏆傛椂鏈塨ug鏃犳硶浣跨敤)
* @param sheet
* @param itemNameList
*/
@@ -980,7 +985,7 @@
private void addAnalysis(List<InsProduct> productList, IfsInventoryQuantity ifsInventoryQuantity, InsOrder order) {
for (InsProduct insProduct : productList) {
// todo: 鏆傛椂鍒ゆ柇鏄惁鏄�佸寲
- if (insProduct.getInspectionItem().contains("鑰佸寲")) {
+ if (insProduct.getInspectionItem().contains("鑰佸寲") && insProduct.getInsResult().equals(1)) {
List<InsProductDeviationWarningDetail> insProductAnalysisDtoList = insProductMapper.selectAnalysis(insProduct, ifsInventoryQuantity.getSupplierName());
if (insProductAnalysisDtoList.size() < 10) {
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index 64e4d1a..e830686 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -1034,6 +1034,24 @@
}
}
+ /**
+ * 淇敼鏍峰搧鍨嬪彿
+ * @param insSample
+ */
+ @Override
+ public void updateSampleModel(InsSample insSample) {
+ // 鍒ゆ柇褰撳墠璁㈠崟鏄惁鐢熸垚浜嗘姤鍛�, 鐢熸垚浜嗘姤鍛婁笉鑳戒慨鏀瑰崟鍙�
+ Long count = insReportMapper.selectCount(Wrappers.<InsReport>lambdaQuery()
+ .eq(InsReport::getInsOrderId, insSample.getInsOrderId()));
+ if (count > 0 ) {
+ throw new ErrorException("褰撳墠璁㈠崟宸茬粡鐢熸垚浜嗘姤鍛婁笉鑳戒慨鏀圭紪鍙�");
+ }
+
+ insSampleService.update(Wrappers.<InsSample>lambdaUpdate()
+ .eq(InsSample::getId, insSample.getId())
+ .set(InsSample::getModel, insSample.getModel()));
+ }
+
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsSampleServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsSampleServiceImpl.java
index f16964d..f21c463 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsSampleServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsSampleServiceImpl.java
@@ -6,6 +6,8 @@
import com.ruoyi.inspect.service.InsSampleService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* @author Administrator
* @description 閽堝琛ㄣ�恑ns_sample(妫�楠屾牱鍝�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
@@ -15,6 +17,15 @@
public class InsSampleServiceImpl extends ServiceImpl<InsSampleMapper, InsSample>
implements InsSampleService {
+ /**
+ * 鏍规嵁璁㈠崟id鏌ヨ鏍峰搧
+ * @param insOrderId
+ * @return
+ */
+ @Override
+ public List<InsSample> getSampleByOrderId(Integer insOrderId) {
+ return baseMapper.getSampleByOrderId(insOrderId);
+ }
}
diff --git a/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml b/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
index 26fa63d..24007fb 100644
--- a/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductDeviationWarningMapper.xml
@@ -4,11 +4,14 @@
<!-- 鏌ョ湅棰勮鍒楄〃 -->
<select id="selectDeviationWarningPage" resultType="com.ruoyi.inspect.dto.InsProductDeviationWarningDto">
- select * from (select ipdw.*,
- isa.sample sample_name,
- isa.model sample_model
+ select *
+ from (select ipdw.*,
+ isa.sample sample_name,
+ isa.model sample_model,
+ concat(ip.inspection_item, ip.inspection_item_subclass) inspection_item_name
from ins_product_deviation_warning ipdw
- left join ins_sample isa on isa.id = ipdw.ins_sample_id) a
+ left join ins_sample isa on isa.id = ipdw.ins_sample_id
+ left join ins_product ip On ip.id = ipdw.ins_product_id) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 84af8bb..94effbe 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -697,4 +697,13 @@
order by ip.sort asc
</select>
+ <!-- 鏍规嵁璁㈠崟id鏌ヨ鏍峰搧 -->
+ <select id="getSampleByOrderId" resultType="com.ruoyi.inspect.pojo.InsSample">
+ select is2.*,
+ sml.name standard_method_name
+ from ins_sample is2
+ left join standard_method sml on sml.id = is2.standard_method_list_id
+ where is2.ins_order_id = #{insOrderId}
+ </select>
+
</mapper>
--
Gitblit v1.9.3