From 9f8f73240c885488fdffc1062826520cf7abb86b Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 17:45:03 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java | 2
basic-server/src/main/java/com/ruoyi/basic/dto/ObjectTypeDto.java | 18 +++
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 23 +++
basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java | 2
basic-server/src/main/java/com/ruoyi/basic/dto/WorkShopDto.java | 2
basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 3
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 80 ++++++++++-----
basic-server/src/main/java/com/ruoyi/basic/dto/WorkShopNameDto.java | 18 +++
basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java | 2
basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 22 ++-
basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java | 2
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 111 ++++++++++-----------
13 files changed, 181 insertions(+), 106 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java
index e3f000c..ee48f00 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java
@@ -13,6 +13,6 @@
private String value;
- private List<SampleTypeDto> children;
+ private List<ObjectTypeDto> children;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
index 395316c..a31ad76 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
@@ -5,7 +5,7 @@
@Data
public class ModelDto {
- private String code = "[5]";
+ private String code = "[7]";
private String label;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/ObjectTypeDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/ObjectTypeDto.java
new file mode 100644
index 0000000..e1f580c
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/ObjectTypeDto.java
@@ -0,0 +1,18 @@
+package com.ruoyi.basic.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ObjectTypeDto {
+
+ private String code = "[3]";
+
+ private String label;
+
+ private String value;
+
+ private List<WorkShopNameDto> children;
+
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java
index d6cbc57..89b377c 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java
@@ -12,4 +12,6 @@
private Integer workShopId;
private String workShopName;
+
+ private String labelName;
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java
index 886c9f7..27857bf 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java
@@ -8,7 +8,7 @@
@Data
public class SampleDto {
- private String code = "[4]";
+ private String code = "[6]";
private String label;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java
index 35193a6..b2edd37 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java
@@ -7,7 +7,7 @@
@Data
public class SampleTypeDto {
- private String code = "[3]";
+ private String code = "[5]";
// 妫�娴嬪璞d
private Integer sampleTypeId;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/WorkShopDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/WorkShopDto.java
index e66e70d..833e5bd 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/WorkShopDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/WorkShopDto.java
@@ -1,6 +1,8 @@
package com.ruoyi.basic.dto;
import com.ruoyi.basic.pojo.WorkShop;
+import lombok.Data;
+@Data
public class WorkShopDto extends WorkShop {
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/WorkShopNameDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/WorkShopNameDto.java
new file mode 100644
index 0000000..6c2e690
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/WorkShopNameDto.java
@@ -0,0 +1,18 @@
+package com.ruoyi.basic.dto;
+
+import com.ruoyi.basic.pojo.WorkShop;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WorkShopNameDto{
+
+ private String code = "[4]";
+
+ private String label;
+
+ private String value;
+
+ private List<SampleTypeDto> children;
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index c564514..94fcbd8 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -14,13 +14,10 @@
import com.ruoyi.basic.service.StandardMethodListService;
import com.ruoyi.basic.service.StandardProductListSupplierAskService;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.basic.service.StandardProductListService;
import lombok.AllArgsConstructor;
-import org.aspectj.weaver.ast.Var;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -50,33 +47,24 @@
private ProductPartMapper productPartMapper;
- private StructureTestObjectPartMapper structureTestObjectPartMapper;
+ private StructureTestObjectPartMapper structureTestObjectPartMapper;
- @Autowired
private StandardMethodListService standardMethodListService;
- @Autowired
private StructureItemParameterMapper structureItemParameterMapper;
- @Autowired
private ModelMapper modelMapper;
- @Autowired
private StandardProductListBackupRelMapper standardProductListBackupRelMapper;
- @Autowired
private StandardProductListUpdateRecordMapper standardProductListUpdateRecordMapper;
- @Autowired
private StandardProductListUpdateRecordRelMapper standardProductListUpdateRecordRelMapper;
- @Autowired
private StandardProductListSupplierAskService standardProductListSupplierAskService;
- @Autowired
- private StandardProductListSupplierAskBackupRelMapper standardProductListSupplierAskBackupRelMapper;
+ private StandardProductListSupplierAskBackupRelMapper standardProductListSupplierAskBackupRelMapper;
- @Autowired
private StandardMethodMapper standardMethodMapper;
@@ -84,25 +72,25 @@
public int upStandardProductList(StandardProductList list) {
// 鏍规嵁id 鏌ヨ鍒板師濮嬪��
StandardProductList standardProductList = standardProductListMapper.selectById(list.getId());
- if(ObjectUtils.isEmpty(standardProductList)){
+ if (ObjectUtils.isEmpty(standardProductList)) {
throw new RuntimeException("鏇存柊澶辫触,鏈煡鎵惧埌妫�鏌ラ」");
}
// 鍒ゆ柇褰撳墠鐘舵�� 濡傛灉鏄鏍镐腑
- if(StandardProductListChcekTypeEnums.CHECK_ING.getCode().equals(list.getCheckStatus())){
+ if (StandardProductListChcekTypeEnums.CHECK_ING.getCode().equals(list.getCheckStatus())) {
throw new RuntimeException("瀹℃牳涓笉鏀寔淇敼");
}
// 鍒ゆ柇妫�楠岄」鏄惁涓烘槸鍚﹀鎵樿姹� 鏄殑璇濅笉闇�瑕佸仛澶囦唤鍜岀姸鎬佷慨鏀圭洿鎺ユ洿鏂�
StructureItemParameter structureItemParameter = structureItemParameterMapper.selectById(standardProductList.getStructureItemParameterId());
- if(!ObjectUtils.isEmpty(structureItemParameter) && "1".equals(structureItemParameter.getDelegateRequestFlag())){
+ if (!ObjectUtils.isEmpty(structureItemParameter) && "1".equals(structureItemParameter.getDelegateRequestFlag())) {
return standardProductListMapper.updateById(list);
}
// 鍒ゆ柇鏄惁涓虹敓鏁堢殑淇敼濡傛灉鏄笉鍋氬浠�
- if(null != list.getState()){
+ if (null != list.getState()) {
return standardProductListMapper.updateById(list);
}
// 鏌ヨ鏈�鏂扮殑涓�娆″叧鑱斿浠� 濡傛灉瀛樺湪璇存槑鏈鏍稿畬缁х画淇敼浜嗐�備笉鍋氭暟鎹鐞嗐��
StandardProductListBackupRel standardProductListBackupRel = standardProductListBackupRelMapper.selectById(list.getId());
- if(ObjectUtils.isEmpty(standardProductListBackupRel)){
+ if (ObjectUtils.isEmpty(standardProductListBackupRel)) {
StandardProductListBackupRel productListBackupRel = new StandardProductListBackupRel();
BeanUtils.copyProperties(standardProductList, productListBackupRel);
standardProductListBackupRelMapper.insert(productListBackupRel);
@@ -127,7 +115,7 @@
standardProductListDto.setStandardMethodListIds(insSample.getStandardMethodListIds());
standardProductListDto.setState(insSample.getState());
List<StandardProductList> list = new ArrayList<>();
- if(CollectionUtils.isEmpty(standardProductListDto.getStandardMethodListIds())) {
+ if (CollectionUtils.isEmpty(standardProductListDto.getStandardMethodListIds())) {
return list;
}
list = standardProductListMapper.standardProductListNoPage(standardProductListDto);
@@ -221,8 +209,8 @@
}
ProductPart productPart = productPartMapper.selectOne(new LambdaQueryWrapper<ProductPart>().eq(ProductPart::getPartNo, insSample.getPartNo()));
- if (productPart != null){
- if (StringUtils.isNotEmpty(productPart.getInspectionItem())){
+ if (productPart != null) {
+ if (StringUtils.isNotEmpty(productPart.getInspectionItem())) {
String inspectionItem = productPart.getInspectionItem();
list = list.stream()
.filter(standardProductList -> inspectionItem.equals(standardProductList.getInspectionItem()))
@@ -231,8 +219,8 @@
}
StructureTestObjectPart structureTestObjectPart = structureTestObjectPartMapper.selectOne(new LambdaQueryWrapper<StructureTestObjectPart>().eq(StructureTestObjectPart::getPartNo, insSample.getPartNo()));
- if (structureTestObjectPart != null){
- if (StringUtils.isNotEmpty(structureTestObjectPart.getInspectionItem())){
+ if (structureTestObjectPart != null) {
+ if (StringUtils.isNotEmpty(structureTestObjectPart.getInspectionItem())) {
String inspectionItem = structureTestObjectPart.getInspectionItem();
list = list.stream()
.filter(standardProductList -> inspectionItem.equals(standardProductList.getInspectionItem()))
@@ -243,16 +231,15 @@
}
/**
- *
- * @param str 鍒ゅ畾鍏紡
- * @param model 鍨嬪彿
- * @param standardCores 鑺暟
- * @param conductorMaterial 瀵间綋鏉愯川
- * @param conductorType 瀵间綋绫诲瀷
+ * @param str 鍒ゅ畾鍏紡
+ * @param model 鍨嬪彿
+ * @param standardCores 鑺暟
+ * @param conductorMaterial 瀵间綋鏉愯川
+ * @param conductorType 瀵间綋绫诲瀷
* @param insSample
* @return
*/
- private boolean getIsIf(String str, String model, String standardCores, String conductorMaterial, String conductorType,InsSampleReceiveDto insSample) {
+ private boolean getIsIf(String str, String model, String standardCores, String conductorMaterial, String conductorType, InsSampleReceiveDto insSample) {
Matcher matcher = Pattern.compile("\\d+(\\.\\d+)?").matcher(model);
String model2 = "";
while (matcher.find()) {
@@ -325,11 +312,11 @@
boolean existWorkShopFlag = standardMethodListService.existWorkShop(tree);
// 鎷兼帴鏍�
String[] trees = tree.split(" - ");
- if(trees == null && trees.length < 4){
+ if (trees == null && trees.length < 4) {
return map;
}
// 杞﹂棿灞傜骇澶氫竴灞傜骇
- if(existWorkShopFlag){
+ if (existWorkShopFlag) {
switch (trees.length) {
case 7:
sampleType = trees[4];
@@ -347,7 +334,7 @@
checkItemQueryTree.append("[").append("\"").append(trees[4]).append("\"").append("]");
break;
}
- }else {
+ } else {
switch (trees.length) {
case 6:
sampleType = trees[3];
@@ -366,18 +353,18 @@
break;
}
}
- if(StringUtils.isEmpty(checkItemQueryTree.toString())){
+ if (StringUtils.isEmpty(checkItemQueryTree.toString())) {
return map;
}
// 鍒ゆ柇鏄惁涓哄鎵樿姹傛爣鍑�
StandardMethod standardMethod = standardMethodMapper.selectById(id);
- if(ObjectUtils.isEmpty(standardMethod)){
+ if (ObjectUtils.isEmpty(standardMethod)) {
return map;
}
StructureItemParameterDto structureItemParameterDto = new StructureItemParameterDto();
- if(standardMethod.getName().equals("濮旀墭瑕佹眰")){
+ if (standardMethod.getName().equals("濮旀墭瑕佹眰")) {
structureItemParameterDto.setDelegateRequestFlag("1");
- }else {
+ } else {
structureItemParameterDto.setDelegateRequestFlag("0");
}
structureItemParameterDto.setTree(checkItemQueryTree.toString());
@@ -385,7 +372,7 @@
// 鏍规嵁妫�楠屽璞�/浜у搧鏌ヨ妫�楠岄」
List<StructureItemParameter> structureItemParameterList = structureItemParameterMapper.selectItemParameterBySample(structureItemParameterDto);
// 濡傛灉鏄骇鍝佺殑妫�鏌ラ」涓虹┖鍚戜笂鎺�
- if(CollectionUtils.isEmpty(structureItemParameterList)){
+ if (CollectionUtils.isEmpty(structureItemParameterList)) {
String query = "[\"" + sampleType + "\"]";
structureItemParameterDto.setTree(query);
structureItemParameterList = structureItemParameterMapper.selectItemParameterBySample(structureItemParameterDto);
@@ -403,14 +390,14 @@
boolean existFlag = false;
// 鍒ゆ柇鏄惁宸茬粦瀹�
for (StandardProductList productList : standardProductList) {
- if(structureItemParameter.getId().equals(productList.getStructureItemParameterId())) {
+ if (structureItemParameter.getId().equals(productList.getStructureItemParameterId())) {
BeanUtils.copyProperties(productList, addStandProductList);
existFlag = true;
break;
}
}
// 濡傛灉鏈粦瀹�
- if(!existFlag){
+ if (!existFlag) {
BeanUtils.copyProperties(structureItemParameter, addStandProductList);
addStandProductList.setTell(structureItemParameter.getAskTell());
addStandProductList.setStructureItemParameterId(structureItemParameter.getId());
@@ -495,6 +482,7 @@
/**
* 淇敼鏍囧噯搴撳尯闂�
+ *
* @param list
* @return
*/
@@ -502,16 +490,16 @@
public boolean updateSection(StandardProductList list) {
// 鏍规嵁id 鏌ヨ鍒板師濮嬪��
StandardProductList standardProductList = standardProductListMapper.selectById(list.getId());
- if(ObjectUtils.isEmpty(standardProductList)){
+ if (ObjectUtils.isEmpty(standardProductList)) {
throw new RuntimeException("鏇存柊澶辫触,鏈煡鎵惧埌妫�鏌ラ」");
}
// 鍒ゆ柇褰撳墠鐘舵�� 濡傛灉鏄鏍镐腑
- if(StandardProductListChcekTypeEnums.CHECK_ING.getCode().equals(list.getCheckStatus())){
+ if (StandardProductListChcekTypeEnums.CHECK_ING.getCode().equals(list.getCheckStatus())) {
throw new RuntimeException("瀹℃牳涓笉鏀寔淇敼");
}
// 鏌ヨ鏈�鏂扮殑涓�娆″叧鑱斿浠� 濡傛灉瀛樺湪璇存槑鏈鏍稿畬缁х画淇敼浜嗐�備笉鍋氭暟鎹鐞嗐��
StandardProductListBackupRel standardProductListBackupRel = standardProductListBackupRelMapper.selectById(list.getId());
- if(ObjectUtils.isEmpty(standardProductListBackupRel)){
+ if (ObjectUtils.isEmpty(standardProductListBackupRel)) {
StandardProductListBackupRel productListBackupRel = new StandardProductListBackupRel();
BeanUtils.copyProperties(standardProductList, productListBackupRel);
standardProductListBackupRelMapper.insert(productListBackupRel);
@@ -529,6 +517,7 @@
/**
* 鏍囧噯搴撴嫋鎷�
+ *
* @param resetTreeDragDTO
*/
@Override
@@ -547,7 +536,7 @@
resetTreeDragDTO.getTree());
// 浠庝笅寰�涓�
- } else if (beginIndex > endIndex){
+ } else if (beginIndex > endIndex) {
standardProductListMapper.updateSortDown(beginIndex,
endIndex,
methodId,
@@ -568,6 +557,7 @@
/**
* 妫�楠岄」瑕佹眰鍊煎姣�
+ *
* @param copyDto
* @return
*/
@@ -611,6 +601,7 @@
/**
* 妫�楠岄」澶嶅埗瀵规瘮涓�涓�
+ *
* @param dto
* @return
*/
@@ -645,6 +636,7 @@
/**
* 妫�楠岄」澶嶅埗鎺掑簭
+ *
* @param copyDto
* @return
*/
@@ -683,9 +675,9 @@
public void productListSubmit(StandardProductListUpdateRecord standardProductListUpdateRecord) {
// 鏌ヨ鎵�鏈夊緟瀹℃牳鐨勬暟鎹�
QueryWrapper<StandardProductList> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("check_status",StandardProductListChcekTypeEnums.WAIT_CHECK.getCode());
+ queryWrapper.eq("check_status", StandardProductListChcekTypeEnums.WAIT_CHECK.getCode());
List<StandardProductList> unCheckStandardProductListArray = standardProductListMapper.selectList(queryWrapper);
- if(CollectionUtils.isEmpty(unCheckStandardProductListArray)){
+ if (CollectionUtils.isEmpty(unCheckStandardProductListArray)) {
throw new RuntimeException("鏆傛棤淇敼鏁版嵁");
}
List<Long> standardProductListIds = new ArrayList<>();
@@ -705,11 +697,12 @@
}
// 淇敼鏍囧噯鏍戜笅妫�鏌ラ」鐘舵�佷负瀹℃牳涓�
- standardProductListMapper.updateProductListCheckStatus(standardProductListIds,StandardProductListChcekTypeEnums.CHECK_ING.getCode());
+ standardProductListMapper.updateProductListCheckStatus(standardProductListIds, StandardProductListChcekTypeEnums.CHECK_ING.getCode());
}
/**
* 鏍囧噯鏍戜笅妫�楠岄」瀹℃牳
+ *
* @param standardProductListUpdateRecord
*/
@Override
@@ -717,9 +710,9 @@
public void productListCheck(StandardProductListUpdateRecord standardProductListUpdateRecord) {
// 鏌ヨ鎵�鏈夊鏍镐腑鐨勬暟鎹�
QueryWrapper<StandardProductList> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("check_status",StandardProductListChcekTypeEnums.CHECK_ING.getCode());
+ queryWrapper.eq("check_status", StandardProductListChcekTypeEnums.CHECK_ING.getCode());
List<StandardProductList> standardProductListArray = standardProductListMapper.selectList(queryWrapper);
- if(CollectionUtils.isEmpty(standardProductListArray)){
+ if (CollectionUtils.isEmpty(standardProductListArray)) {
return;
}
List<Long> standardProductListIds = new ArrayList<>();
@@ -727,12 +720,12 @@
standardProductListIds.add(standardProductList.getId());
}
// 瀹℃牳閫氳繃
- if(StandardProductListChcekTypeEnums.PASS_CHECK.getCode().equals(standardProductListUpdateRecord.getCheckStatus())){
+ if (StandardProductListChcekTypeEnums.PASS_CHECK.getCode().equals(standardProductListUpdateRecord.getCheckStatus())) {
// 淇敼鐘舵��
- standardProductListMapper.updateProductListCheckStatus(standardProductListIds,StandardProductListChcekTypeEnums.PASS_CHECK.getCode());
+ standardProductListMapper.updateProductListCheckStatus(standardProductListIds, StandardProductListChcekTypeEnums.PASS_CHECK.getCode());
}
// 瀹℃牳鏈�氳繃
- if(StandardProductListChcekTypeEnums.NO_PASS_CHECK.getCode().equals(standardProductListUpdateRecord.getCheckStatus())){
+ if (StandardProductListChcekTypeEnums.NO_PASS_CHECK.getCode().equals(standardProductListUpdateRecord.getCheckStatus())) {
// 鏌ヨ鎵�鏈夋爣鍑嗘爲涓嬬殑妫�楠岄」鐩浠芥暟鎹�
List<StandardProductListBackupRel> standardProductListBackupRelList = standardProductListBackupRelMapper.selectBatchIds(standardProductListIds);
// 鍥炴粴鏍囧噯鏍戜笅鐨勬楠岄」鐩暟鎹�
@@ -743,11 +736,11 @@
}
// 鍥炴粴妫�楠岄」鐩巶瀹跺瘑搴︾粦瀹氳〃鏁版嵁
QueryWrapper<StandardProductListSupplierAskBackupRel> supplierAskBackupRelQueryWrapper = new QueryWrapper<>();
- supplierAskBackupRelQueryWrapper.in("product_list_id",standardProductListIds);
+ supplierAskBackupRelQueryWrapper.in("product_list_id", standardProductListIds);
List<StandardProductListSupplierAskBackupRel> standardProductListSupplierAskBackupRelList = standardProductListSupplierAskBackupRelMapper.selectList(supplierAskBackupRelQueryWrapper);
- if(!CollectionUtils.isEmpty(standardProductListSupplierAskBackupRelList)){
+ if (!CollectionUtils.isEmpty(standardProductListSupplierAskBackupRelList)) {
QueryWrapper<StandardProductListSupplierAsk> deleteWrapper = new QueryWrapper<>();
- deleteWrapper.in("product_list_id",standardProductListIds);
+ deleteWrapper.in("product_list_id", standardProductListIds);
standardProductListSupplierAskMapper.delete(deleteWrapper);
ArrayList<StandardProductListSupplierAsk> supplierAskRollBackList = new ArrayList<>();
for (StandardProductListSupplierAskBackupRel standardProductListSupplierAskBackupRel : standardProductListSupplierAskBackupRelList) {
@@ -774,11 +767,11 @@
@Override
public boolean existCheckingRecord() {
QueryWrapper<StandardProductListUpdateRecord> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("check_status",StandardProductListChcekTypeEnums.CHECK_ING.getCode());
+ queryWrapper.eq("check_status", StandardProductListChcekTypeEnums.CHECK_ING.getCode());
List<StandardProductListUpdateRecord> standardProductListUpdateRecordList = standardProductListUpdateRecordMapper.selectList(queryWrapper);
- if(CollectionUtils.isEmpty(standardProductListUpdateRecordList)){
+ if (CollectionUtils.isEmpty(standardProductListUpdateRecordList)) {
return false;
- }else {
+ } else {
return true;
}
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
index d8f0dea..316c627 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
@@ -600,15 +600,19 @@
List<StructureTestObject> testObjects = new ArrayList<>();
for (FactoryDto factoryDto : list) {
for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
- List<SampleTypeDto> children = laboratoryDto.getChildren();
- int sort = 0;
- // 寰幆绗笁灞�
- for (SampleTypeDto child : children) {
- StructureTestObject structureTestObject = new StructureTestObject();
- structureTestObject.setSort(sort);
- structureTestObject.setId(child.getSampleTypeId());
- testObjects.add(structureTestObject);
- sort++;
+ for (ObjectTypeDto objectTypeDto : laboratoryDto.getChildren()) {
+ for (WorkShopNameDto workShopNameDto:objectTypeDto.getChildren()) {
+ List<SampleTypeDto> children = workShopNameDto.getChildren();
+ int sort = 0;
+
+ for (SampleTypeDto child : children) {
+ StructureTestObject structureTestObject = new StructureTestObject();
+ structureTestObject.setSort(sort);
+ structureTestObject.setId(child.getSampleTypeId());
+ testObjects.add(structureTestObject);
+ sort++;
+ }
+ }
}
}
}
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index ee3daa5..ffe58e3 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -25,6 +25,18 @@
<resultMap id="LaboratoryDto" type="com.ruoyi.basic.dto.LaboratoryDto">
<result property="label" column="laboratory"/>
<result property="value" column="laboratory"/>
+ <collection property="children" resultMap="ObjectTypeDto"/>
+ </resultMap>
+
+ <resultMap id="ObjectTypeDto" type="com.ruoyi.basic.dto.ObjectTypeDto">
+ <result property="label" column="object_type"/>
+ <result property="value" column="object_type"/>
+ <collection property="children" resultMap="workShopNameDto"/>
+ </resultMap>
+
+ <resultMap id="workShopNameDto" type="com.ruoyi.basic.dto.WorkShopNameDto">
+ <result property="label" column="workShopName"/>
+ <result property="value" column="workShopName"/>
<collection property="children" resultMap="SampleTypeDto"/>
</resultMap>
@@ -92,8 +104,10 @@
</sql>
<select id="selectStandardTreeList" resultMap="FactoryDto">
- select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
+ select '涓ぉ绉戞妧' factory,
l.laboratory_name laboratory,
+ sto.object_type object_type,
+ ws.`name` workShopName,
sto.specimen_name sample_type,
p.name sample,
st.model,
@@ -102,7 +116,6 @@
sto.sort,
sto.specimen_name_en sample_type_en,
p.name_en sample_en,
- ws.`name` workShopName,
ws.id workShopId
from laboratory l
left join structure_test_object sto on sto.laboratory_id = l.id
@@ -169,7 +182,7 @@
</if>
</select>
<select id="selectStandardTreeList2" resultType="com.ruoyi.basic.pojo.StandardTree">
- select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
+ select '涓ぉ绉戞妧' factory,
l.laboratory_name laboratory,
sto.specimen_name sample_type,
p.name sample
@@ -250,8 +263,10 @@
where name = #{name}
</select>
<select id="selectStandardTreeListByPartNo" resultMap="FactoryDto">
- select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
+ select '涓ぉ绉戞妧' factory,
l.laboratory_name laboratory,
+ sto.object_type object_type,
+ ws.`name` workShopName,
sto.specimen_name sample_type,
p.name sample,
m.model_name model,
diff --git a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index 9b3ec8a..d9a1457 100644
--- a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -198,6 +198,7 @@
<resultMap id="productDto" type="com.ruoyi.basic.dto.ProductDto">
<result column="pId" property="id"/>
<result column="pName" property="name"/>
+ <result column="labelName" property="labelName"/>
</resultMap>
<select id="selectItemParameterBySample" resultType="com.ruoyi.basic.pojo.StructureItemParameter">
@@ -217,7 +218,7 @@
</select>
<select id="getItemTreeProduct" resultMap="itemDto">
- select sto.id sId, sto.specimen_name sName, p.id pId, p.name pName
+ select sto.id sId, sto.specimen_name sName, p.name labelName, p.id pId, p.name pName
from structure_test_object sto
left join product p on p.object_id = sto.id
WHERE sto.object_type = #{objectType}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index ad73f30..d02085a 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -89,36 +89,40 @@
RawMaterialStandardTreeDto rawMaterialStandardTreeDto = new RawMaterialStandardTreeDto();
for (FactoryDto factoryDto : factoryDtos) {
for (LaboratoryDto laboratoryDto : factoryDto.getChildren()) {
- for (SampleTypeDto sampleTypeDto : laboratoryDto.getChildren()) {
- if (sampleTypeDto.getChildren().size() == 0) {
- sampleTypeDto.setChildren(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
- }
- // 鍒ゆ柇缁戝畾鐨勬槸鍚︽槸褰撳墠闆朵欢鍙�
- if (sampleTypeDto.getPartNo() != null && sampleTypeDto.getPartNo().equals(partNo)) {
- // 娣诲姞瀵硅薄
- rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
- + laboratoryDto.getValue() + "-"
- + sampleTypeDto.getValue());
- rawMaterialStandardTreeDto.setCode(sampleTypeDto.getCode());
- rawMaterialStandardTreeDto.setLabel(sampleTypeDto.getLabel());
- rawMaterialStandardTreeDto.setValue(sampleTypeDto.getValue());
- rawMaterialStandardTreeDto.setChildren1(sampleTypeDto.getChildren());
- rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
- rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
- } else {
- for (SampleDto sampleDto : sampleTypeDto.getChildren()) {
- if (sampleDto.getPartNo() != null && sampleDto.getPartNo().equals(partNo)) {
+ for (ObjectTypeDto objectTypeDto : laboratoryDto.getChildren()) {
+ for (WorkShopNameDto workShopNameDto : objectTypeDto.getChildren()) {
+ for (SampleTypeDto sampleTypeDto : workShopNameDto.getChildren()) {
+ if (sampleTypeDto.getChildren().size() == 0) {
+ sampleTypeDto.setChildren(standardTreeMapper.getStandardTree3(sampleTypeDto.getValue()));
+ }
+ // 鍒ゆ柇缁戝畾鐨勬槸鍚︽槸褰撳墠闆朵欢鍙�
+ if (sampleTypeDto.getPartNo() != null && sampleTypeDto.getPartNo().equals(partNo)) {
// 娣诲姞瀵硅薄
rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
- + laboratoryDto.getValue() + "-"
- + sampleTypeDto.getValue() + "-"
- + sampleDto.getValue());
- rawMaterialStandardTreeDto.setCode(sampleDto.getCode());
- rawMaterialStandardTreeDto.setLabel(sampleDto.getLabel());
- rawMaterialStandardTreeDto.setValue(sampleDto.getValue());
- rawMaterialStandardTreeDto.setChildren2(sampleDto.getChildren());
+ + laboratoryDto.getValue() + "-" + objectTypeDto.getValue() + "-" + workShopNameDto.getValue() + "-"
+ + sampleTypeDto.getValue());
+ rawMaterialStandardTreeDto.setCode(sampleTypeDto.getCode());
+ rawMaterialStandardTreeDto.setLabel(sampleTypeDto.getLabel());
+ rawMaterialStandardTreeDto.setValue(sampleTypeDto.getValue());
+ rawMaterialStandardTreeDto.setChildren1(sampleTypeDto.getChildren());
rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
+ } else {
+ for (SampleDto sampleDto : sampleTypeDto.getChildren()) {
+ if (sampleDto.getPartNo() != null && sampleDto.getPartNo().equals(partNo)) {
+ // 娣诲姞瀵硅薄
+ rawMaterialStandardTreeDto.setTreeName(factoryDto.getValue() + "-"
+ + laboratoryDto.getValue() + "-" + objectTypeDto.getValue() + "-" + workShopNameDto.getValue() + "-"
+ + sampleTypeDto.getValue() + "-"
+ + sampleDto.getValue());
+ rawMaterialStandardTreeDto.setCode(sampleDto.getCode());
+ rawMaterialStandardTreeDto.setLabel(sampleDto.getLabel());
+ rawMaterialStandardTreeDto.setValue(sampleDto.getValue());
+ rawMaterialStandardTreeDto.setChildren2(sampleDto.getChildren());
+ rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
+ rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
+ }
+ }
}
}
}
@@ -141,6 +145,7 @@
/**
* 鎶ユ
+ *
* @param ids
* @return
*/
@@ -184,6 +189,7 @@
/**
* 鎾ら攢鎶ユ
+ *
* @param id
* @return
*/
@@ -197,6 +203,7 @@
/**
* 鎵撳嵃鏍囩鏌ヨ
+ *
* @param ids
* @return
*/
@@ -207,6 +214,7 @@
/**
* 鎶ユ
+ *
* @param ifsInventoryQuantity
* @return
*/
@@ -237,6 +245,7 @@
/**
* 鑾峰彇閾滀骇涓氶摼妫�娴嬫暟鎹�
+ *
* @param id
* @return
*/
@@ -247,6 +256,7 @@
/**
* 鍘熸潗鏂欐挙閿�鎺ュ彛
+ *
* @param ifsInventoryId
* @return
*/
@@ -273,6 +283,7 @@
/**
* 鍘熸潗鏂欏厤妫�涓嬪崟
+ *
* @param list
* @param insOrder
* @return
@@ -349,6 +360,7 @@
/**
* 鏌ヨ寰呬笅鍗�
+ *
* @param page
* @param ifsInventoryQuantity
* @return
@@ -360,6 +372,7 @@
/**
* 鏌ヨ宸叉楠�
+ *
* @param page
* @param ifsInventoryQuantityDto
* @return
@@ -378,6 +391,7 @@
/**
* 鍒犻櫎鍘熸潗鏂欐姤妫�淇℃伅
+ *
* @param id
* @return
*/
@@ -388,6 +402,7 @@
/**
* 鍘熸潗鏂欐斁琛屽厤妫�
+ *
* @param ifsInventoryId
* @return
*/
@@ -441,8 +456,9 @@
/**
* 0, 鏃犳彁绀�, 1鎻愮ず 褰撳墠鎵规鐨勬牱鍝佸凡妫�楠岃繃, 鍙互鍏嶆, 2 鎻愮ず 褰撳墠鎵规鐨勬牱鍝佸凡瓒�20鍚�, 闇�瑕佸绾у娆℃楠�
- *
+ * <p>
* 鍘熸潗鏂欎笅鍗曢�氱煡鍏嶆鎴栬�呭娆℃楠�
+ *
* @param ifsInventoryId
* @return
*/
@@ -482,6 +498,7 @@
/**
* 鎶ユ鍙互鏂板鎶ユ淇℃伅
+ *
* @param ifsInventoryQuantity
*/
@Override
@@ -493,10 +510,9 @@
}
-
-
/**
* 閾滃崟涓濅笅鍗曞厤妫�
+ *
* @param list
* @param insOrder
*/
@@ -593,6 +609,7 @@
/**
* 鍘熸潗鏂欒繘鍘傛挙閿�涓嬪崟
+ *
* @param enterOrderId
* @return
*/
@@ -631,6 +648,7 @@
/**
* 鍘熸潗鏂欏搴︽挙閿�涓嬪崟
+ *
* @param quarterOrderId
* @return
*/
@@ -671,6 +689,7 @@
/**
* 鍘熸潗鏂欐姤妫�鍏ㄩ儴淇℃伅瀵煎嚭
+ *
* @param ifsInventoryQuantityDto
* @param response
*/
@@ -733,6 +752,7 @@
/**
* 鍘熸潗鏂欐煡璇㈠彲浠ュ搴︽楠岀殑鍐呭
+ *
* @param page
* @param ifsInventoryQuantityDto
* @return
@@ -751,6 +771,7 @@
/**
* 鎻愬墠鍏ュ簱
+ *
* @param ifsInventoryId
* @return
*/
@@ -778,6 +799,7 @@
/**
* 娣诲姞宸ユ椂
+ *
* @param insOrder
* @param ifsInventoryQuantity
*/
--
Gitblit v1.9.3