From 09ddece4effc738f2611c053d8f0f1fb22102597 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 08 四月 2025 17:28:17 +0800
Subject: [PATCH] 1.原辅料下单标准
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 111 ++++++++++++++++++++++++++-----------------------------
1 files changed, 52 insertions(+), 59 deletions(-)
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 79e3f49..220bce6 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.setStructureItemParameterId(structureItemParameter.getId());
@@ -494,6 +481,7 @@
/**
* 淇敼鏍囧噯搴撳尯闂�
+ *
* @param list
* @return
*/
@@ -501,16 +489,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);
@@ -528,6 +516,7 @@
/**
* 鏍囧噯搴撴嫋鎷�
+ *
* @param resetTreeDragDTO
*/
@Override
@@ -546,7 +535,7 @@
resetTreeDragDTO.getTree());
// 浠庝笅寰�涓�
- } else if (beginIndex > endIndex){
+ } else if (beginIndex > endIndex) {
standardProductListMapper.updateSortDown(beginIndex,
endIndex,
methodId,
@@ -567,6 +556,7 @@
/**
* 妫�楠岄」瑕佹眰鍊煎姣�
+ *
* @param copyDto
* @return
*/
@@ -610,6 +600,7 @@
/**
* 妫�楠岄」澶嶅埗瀵规瘮涓�涓�
+ *
* @param dto
* @return
*/
@@ -644,6 +635,7 @@
/**
* 妫�楠岄」澶嶅埗鎺掑簭
+ *
* @param copyDto
* @return
*/
@@ -682,9 +674,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<>();
@@ -704,11 +696,12 @@
}
// 淇敼鏍囧噯鏍戜笅妫�鏌ラ」鐘舵�佷负瀹℃牳涓�
- standardProductListMapper.updateProductListCheckStatus(standardProductListIds,StandardProductListChcekTypeEnums.CHECK_ING.getCode());
+ standardProductListMapper.updateProductListCheckStatus(standardProductListIds, StandardProductListChcekTypeEnums.CHECK_ING.getCode());
}
/**
* 鏍囧噯鏍戜笅妫�楠岄」瀹℃牳
+ *
* @param standardProductListUpdateRecord
*/
@Override
@@ -716,9 +709,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<>();
@@ -726,12 +719,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);
// 鍥炴粴鏍囧噯鏍戜笅鐨勬楠岄」鐩暟鎹�
@@ -742,11 +735,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) {
@@ -773,11 +766,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;
}
}
--
Gitblit v1.9.3