From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java | 23
src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java | 82 --
src/main/java/com/ruoyi/basic/dto/StorageAttachmentDTO.java | 2
src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java | 34 -
src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java | 159 +----
src/main/java/com/ruoyi/sales/service/ShippingInfoService.java | 5
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 5
src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java | 14
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 104 +--
src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java | 15
src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java | 316 +++++------
src/main/java/com/ruoyi/production/pojo/ProductionPlan.java | 15
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 2
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 27
src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java | 6
src/main/java/com/ruoyi/project/common/CommonController.java | 53 -
src/main/java/com/ruoyi/basic/enums/ApplicationTypeEnum.java | 5
src/main/java/com/ruoyi/basic/pojo/StorageAttachment.java | 8
src/main/java/com/ruoyi/inspectiontask/service/InspectionTaskService.java | 4
src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java | 7
src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java | 2
src/main/java/com/ruoyi/basic/dto/StorageAttachmentVO.java | 14
/dev/null | 433 ----------------
src/main/java/com/ruoyi/basic/dto/StorageBlobDTO.java | 17
src/main/java/com/ruoyi/basic/service/StorageAttachmentService.java | 8
src/main/java/com/ruoyi/basic/utils/FileUtil.java | 212 +++++--
src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java | 1
src/main/resources/mapper/production/ProductionPlanMapper.xml | 37
src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java | 3
29 files changed, 490 insertions(+), 1,123 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/dto/StorageAttachmentDTO.java b/src/main/java/com/ruoyi/basic/dto/StorageAttachmentDTO.java
index 685e29e..ef97145 100644
--- a/src/main/java/com/ruoyi/basic/dto/StorageAttachmentDTO.java
+++ b/src/main/java/com/ruoyi/basic/dto/StorageAttachmentDTO.java
@@ -10,5 +10,5 @@
/**
* 瀛樺偍鏂囦欢鍒楄〃
*/
- private List<StorageBlobVO> storageBlobVOS;
+ private List<StorageBlobDTO> storageBlobDTOs;
}
diff --git a/src/main/java/com/ruoyi/basic/dto/StorageAttachmentVO.java b/src/main/java/com/ruoyi/basic/dto/StorageAttachmentVO.java
new file mode 100644
index 0000000..232ffe6
--- /dev/null
+++ b/src/main/java/com/ruoyi/basic/dto/StorageAttachmentVO.java
@@ -0,0 +1,14 @@
+package com.ruoyi.basic.dto;
+
+import com.ruoyi.basic.pojo.StorageAttachment;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class StorageAttachmentVO extends StorageAttachment {
+ /**
+ * 瀛樺偍鏂囦欢鍒楄〃
+ */
+ private List<StorageBlobVO> storageBlobVOS;
+}
diff --git a/src/main/java/com/ruoyi/basic/dto/StorageBlobDTO.java b/src/main/java/com/ruoyi/basic/dto/StorageBlobDTO.java
new file mode 100644
index 0000000..62857d0
--- /dev/null
+++ b/src/main/java/com/ruoyi/basic/dto/StorageBlobDTO.java
@@ -0,0 +1,17 @@
+package com.ruoyi.basic.dto;
+
+import com.ruoyi.basic.pojo.StorageBlob;
+import lombok.Data;
+
+@Data
+public class StorageBlobDTO extends StorageBlob {
+ /**
+ * 棰勮鍦板潃
+ */
+ private String previewURL;
+
+ /**
+ * 涓嬭浇鍦板潃
+ */
+ private String downloadURL;
+}
diff --git a/src/main/java/com/ruoyi/basic/enums/ApplicationTypeEnum.java b/src/main/java/com/ruoyi/basic/enums/ApplicationTypeEnum.java
index 82b4fa5..35bbd0a 100644
--- a/src/main/java/com/ruoyi/basic/enums/ApplicationTypeEnum.java
+++ b/src/main/java/com/ruoyi/basic/enums/ApplicationTypeEnum.java
@@ -2,7 +2,10 @@
public enum ApplicationTypeEnum {
IMAGE("image"),
- FILE("file");
+ FILE("file"),
+ AFTER_FILE("after_file"),
+ BEFORE_FILE("before_file");
+
private final String type;
ApplicationTypeEnum(String type) { this.type = type; }
diff --git a/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java b/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
index c26b57a..c24eb9e 100644
--- a/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
+++ b/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
@@ -1,7 +1,8 @@
package com.ruoyi.basic.enums;
public enum RecordTypeEnum {
- FILE("file");
+ SHIPPING_INFO("shipping_info"),
+ INSPECTION_TASK("inspection_task");
private final String type;
RecordTypeEnum(String type) { this.type = type; }
diff --git a/src/main/java/com/ruoyi/basic/pojo/StorageAttachment.java b/src/main/java/com/ruoyi/basic/pojo/StorageAttachment.java
index cf44612..12533fb 100644
--- a/src/main/java/com/ruoyi/basic/pojo/StorageAttachment.java
+++ b/src/main/java/com/ruoyi/basic/pojo/StorageAttachment.java
@@ -5,7 +5,7 @@
import lombok.Data;
import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
/**
* 閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭� 瀹炰綋绫�
@@ -23,12 +23,12 @@
/** 鍒涘缓鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT)
- private Date createTime;
+ private LocalDateTime createTime;
/** 鏇存柊鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT_UPDATE)
- private Date updateTime;
+ private LocalDateTime updateTime;
/**
* 閫昏緫鍒犻櫎
@@ -55,4 +55,4 @@
*/
@TableField(value = "storage_blob_id")
private Long storageBlobId;
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ruoyi/basic/service/StorageAttachmentService.java b/src/main/java/com/ruoyi/basic/service/StorageAttachmentService.java
index 4db9fad..7fbaf64 100644
--- a/src/main/java/com/ruoyi/basic/service/StorageAttachmentService.java
+++ b/src/main/java/com/ruoyi/basic/service/StorageAttachmentService.java
@@ -16,14 +16,6 @@
* @since 2025-05-29
*/
public interface StorageAttachmentService extends IService<StorageAttachment> {
- /**
- * 鏌ヨ閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭�
- * @param recordId 鍏宠仈璁板綍id
- * @param recordType 鍏宠仈璁板綍绫诲瀷
- * @param fileType 鏂囦欢绫诲瀷
- * @return 鏂囦欢淇℃伅鍒楄〃
- */
- List<StorageAttachment> selectStorageAttachments(Long recordId, StorageAttachmentRecordType recordType, String fileType);
/**
* 淇濆瓨閫氱敤鏂囦欢涓婁紶鐨勯檮浠朵俊鎭�
diff --git a/src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java
index fbf1e00..f3f3ae3 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/StorageAttachmentServiceImpl.java
@@ -8,7 +8,6 @@
import com.ruoyi.basic.service.StorageBlobService;
import com.ruoyi.common.constant.StorageAttachmentConstants;
import com.ruoyi.common.enums.StorageAttachmentRecordType;
-import com.ruoyi.common.utils.MinioUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -31,28 +30,6 @@
private final StorageBlobService storageBlobService;
- private final MinioUtils minioUtils;
-
- @Override
- public List<StorageAttachment> selectStorageAttachments(Long recordId, StorageAttachmentRecordType recordType, String fileType) {
- // todo fileChange
-// List<StorageAttachment> storageAttachments = storageAttachmentMapper.selectList(new LambdaQueryWrapper<StorageAttachment>()
-// .eq(StorageAttachment::getRecordId, recordId)
-// .eq(StorageAttachment::getRecordType, recordType.ordinal())
-// .eq(StorageAttachment::getName, fileType));
-// if (storageAttachments != null) {
-// for (StorageAttachment storageAttachment : storageAttachments) {
-// StorageBlob storageBlob = storageBlobMapper.selectById(storageAttachment.getStorageBlobId());
-// StorageBlobDTO storageBlobDTO = new StorageBlobDTO();
-// BeanUtils.copyProperties(storageBlob, storageBlobDTO);
-// storageBlobDTO.setUrl(minioUtils.getPreviewUrl(storageBlob.getBucketName(), storageBlob.getBucketName(), true));
-// storageAttachment.setStorageBlobDTO(storageBlobDTO);
-// }
-// }
-
-// return storageAttachments;
- return null;
- }
@Override
public void saveStorageAttachment(List<StorageAttachment> attachments, Long recordId, StorageAttachmentRecordType recordType, StorageAttachmentConstants fileType) {
diff --git a/src/main/java/com/ruoyi/basic/utils/FileUtil.java b/src/main/java/com/ruoyi/basic/utils/FileUtil.java
index 19ac77c..4092f30 100644
--- a/src/main/java/com/ruoyi/basic/utils/FileUtil.java
+++ b/src/main/java/com/ruoyi/basic/utils/FileUtil.java
@@ -2,7 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.ruoyi.basic.dto.StorageAttachmentDTO;
+import com.ruoyi.basic.dto.StorageAttachmentVO;
+import com.ruoyi.basic.dto.StorageBlobDTO;
import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.basic.enums.ApplicationTypeEnum;
import com.ruoyi.basic.enums.RecordTypeEnum;
@@ -48,10 +49,10 @@
* @param application 鏂囦欢鐢ㄩ��
* @param recordType 鍏宠仈璁板綍绫诲瀷
* @param recordId 鍏宠仈璁板綍id
- * @param storageBlobVOS 鏂囦欢淇℃伅
+ * @param storageBlobDTOS 鏂囦欢淇℃伅
*/
- public void saveStorageAttachment(ApplicationTypeEnum application, RecordTypeEnum recordType, Long recordId, List<StorageBlobVO> storageBlobVOS) {
- if (CollectionUtils.isEmpty(storageBlobVOS)) {
+ public void saveStorageAttachment(ApplicationTypeEnum application, RecordTypeEnum recordType, Long recordId, List<StorageBlobDTO> storageBlobDTOS) {
+ if (CollectionUtils.isEmpty(storageBlobDTOS)) {
throw new RuntimeException("鏂囦欢淇℃伅涓嶈兘涓虹┖");
}
if (application == null) {
@@ -66,13 +67,14 @@
// 鍒犻櫎鏃ч檮浠朵俊鎭�
deleteStorageAttachmentsByApplicationAndRecordTypeAndRecordId(application, recordType, recordId);
List<StorageAttachment> storageAttachments = new ArrayList<>();
- for (StorageBlobVO storageBlobVO : storageBlobVOS) {
+ for (StorageBlobDTO storageBlobDTO : storageBlobDTOS) {
StorageAttachment storageAttachment = new StorageAttachment();
storageAttachment.setApplication(application.getType());
storageAttachment.setRecordType(recordType.getType());
storageAttachment.setRecordId(recordId);
- storageAttachment.setStorageBlobId(storageBlobVO.getId());
+ storageAttachment.setStorageBlobId(storageBlobDTO.getId());
storageAttachment.setDeleted(0L);
+ storageAttachments.add(storageAttachment);
}
storageAttachmentMapper.insert(storageAttachments);
}
@@ -102,10 +104,10 @@
*
* @param application 鏂囦欢鐢ㄩ��
* @param recordType 鍏宠仈璁板綍绫诲瀷
- * @param recordId 鍏宠仈璁板綍id
+ * @param recordIds 鍏宠仈璁板綍id
*/
- public void deleteStorageBlobsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum application, RecordTypeEnum recordType, Long recordId) {
- if (recordId == null || recordId <= 0) {
+ public void deleteStorageBlobsByApplicationAndRecordTypeAndRecordIds(ApplicationTypeEnum application, RecordTypeEnum recordType, List<Long> recordIds) {
+ if (recordIds == null || recordIds.isEmpty()) {
throw new RuntimeException("鍏宠仈璁板綍id涓嶈兘涓虹┖");
}
if (application == null) {
@@ -116,7 +118,7 @@
}
List<StorageAttachment> storageAttachments = storageAttachmentMapper.selectList(new LambdaQueryWrapper<StorageAttachment>()
.eq(StorageAttachment::getRecordType, recordType.getType())
- .eq(StorageAttachment::getRecordId, recordId)
+ .in(StorageAttachment::getRecordId, recordIds)
.eq(StorageAttachment::getApplication, application.getType()));
if (CollectionUtils.isNotEmpty(storageAttachments)) {
List<Long> storageAttachmentIds = storageAttachments.stream().map(StorageAttachment::getStorageBlobId)
@@ -135,6 +137,13 @@
storageAttachmentMapper.deleteByIds(storageAttachmentIds);
}
+ /**
+ * 鍒犻櫎鏂囦欢鍏宠仈淇℃伅
+ *
+ * @param application 鏂囦欢鐢ㄩ��
+ * @param recordType 鍏宠仈璁板綍绫诲瀷
+ * @param recordId 鍏宠仈璁板綍id
+ */
public void deleteStorageAttachmentsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum application, RecordTypeEnum recordType, Long recordId) {
if (recordId == null || recordId <= 0) {
throw new RuntimeException("鍏宠仈璁板綍id涓嶈兘涓虹┖");
@@ -145,7 +154,7 @@
if (recordType == null) {
throw new RuntimeException("鍏宠仈璁板綍绫诲瀷涓嶈兘涓虹┖");
}
- deleteStorageBlobsByApplicationAndRecordTypeAndRecordId(application, recordType, recordId);
+ deleteStorageBlobsByApplicationAndRecordTypeAndRecordIds(application, recordType, Arrays.asList(recordId));
storageAttachmentMapper.delete(new LambdaQueryWrapper<StorageAttachment>()
.eq(StorageAttachment::getRecordType, recordType.getType())
.eq(StorageAttachment::getRecordId, recordId)
@@ -153,7 +162,31 @@
}
/**
- * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢淇℃伅
+ * 鎵归噺鍒犻櫎鏂囦欢鍏宠仈淇℃伅 attachment
+ *
+ * @param application 鏂囦欢鐢ㄩ��
+ * @param recordType 鍏宠仈璁板綍绫诲瀷
+ * @param recordIds 鍏宠仈璁板綍id
+ */
+ public void deleteStorageAttachmentsByApplicationAndRecordTypeAndRecordIds(ApplicationTypeEnum application, RecordTypeEnum recordType, List<Long> recordIds) {
+ if (recordIds == null || recordIds.isEmpty()) {
+ throw new RuntimeException("鍏宠仈璁板綍id涓嶈兘涓虹┖");
+ }
+ if (application == null) {
+ throw new RuntimeException("鏂囦欢鐢ㄩ�斾笉鑳戒负绌�");
+ }
+ if (recordType == null) {
+ throw new RuntimeException("鍏宠仈璁板綍绫诲瀷涓嶈兘涓虹┖");
+ }
+ deleteStorageBlobsByApplicationAndRecordTypeAndRecordIds(application, recordType, recordIds);
+ storageAttachmentMapper.delete(new LambdaQueryWrapper<StorageAttachment>()
+ .eq(StorageAttachment::getRecordType, recordType.getType())
+ .in(StorageAttachment::getRecordId, recordIds)
+ .eq(StorageAttachment::getApplication, application.getType()));
+ }
+
+ /**
+ * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢淇℃伅 attachment
*
* @param storageAttachmentIds 鏂囦欢id
*/
@@ -165,7 +198,7 @@
}
/**
- * 閫氳繃鏂囦欢鐢ㄩ�斻�佸叧鑱旇褰曠被鍨嬨�佸叧鑱旇褰昳d鑾峰彇鏂囦欢鍏宠仈淇℃伅
+ * 閫氳繃鏂囦欢鐢ㄩ�斻�佸叧鑱旇褰曠被鍨嬨�佸叧鑱旇褰昳d鑾峰彇鏂囦欢鍏宠仈淇℃伅 attachment
*
* @param application 鏂囦欢鐢ㄩ��
* @param recordType 鍏宠仈璁板綍绫诲瀷
@@ -187,11 +220,11 @@
}
/**
- * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢淇℃伅
+ * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢淇℃伅 blob
*
* @param storageAttachmentIds 鏂囦欢id
*/
- public List<StorageBlobVO> getStorageBlobDTOsByStorageAttachmentIds(List<Long> storageAttachmentIds) {
+ public List<StorageBlobVO> getStorageBlobVOsByStorageAttachmentIds(List<Long> storageAttachmentIds) {
List<StorageAttachment> storageAttachments = getStorageAttachmentsByStorageAttachmentIds(storageAttachmentIds);
if (CollectionUtils.isEmpty(storageAttachments)) {
return null;
@@ -210,12 +243,63 @@
}
/**
- * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢淇℃伅瀛樺湪杩囨湡鏃堕棿
+ * 閫氳繃鏂囦欢鐢ㄩ�斻�佸叧鑱旇褰曠被鍨嬨�佸叧鑱旇褰昳d鑾峰彇鏂囦欢淇℃伅 blob
+ *
+ * @param application 鏂囦欢鐢ㄩ��
+ * @param recordType 鍏宠仈璁板綍绫诲瀷
+ * @param recordId 鍏宠仈璁板綍id
+ */
+ public List<StorageBlobVO> getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum application, RecordTypeEnum recordType, Long recordId) {
+ List<StorageAttachment> storageAttachments = getStorageAttachmentsByApplicationAndRecordTypeAndRecordId(application, recordType, recordId);
+ if (CollectionUtils.isEmpty(storageAttachments)) {
+ return null;
+ }
+ List<Long> storageBlobIds = storageAttachments.stream().map(StorageAttachment::getStorageBlobId).collect(Collectors.toList());
+ List<StorageBlob> storageBlobs = storageBlobMapper.selectByIds(storageBlobIds);
+ List<StorageBlobVO> storageBlobDTOS = new ArrayList<>();
+ for (StorageBlob storageBlob : storageBlobs) {
+ StorageBlobVO storageBlobVO = new StorageBlobVO();
+ BeanUtils.copyProperties(storageBlob, storageBlobVO);
+ storageBlobVO.setPreviewURL(buildSignedPreviewUrl(storageBlobVO));
+ storageBlobVO.setDownloadURL(buildSignedDownloadUrl(storageBlobVO));
+ storageBlobDTOS.add(storageBlobVO);
+ }
+ return storageBlobDTOS;
+ }
+
+ /**
+ * 閫氳繃鏂囦欢鐢ㄩ�斻�佸叧鑱旇褰曠被鍨嬨�佸叧鑱旇褰昳d鑾峰彇鏂囦欢淇℃伅 鑷畾涔夎繃鏈熸椂闂达紙鍒嗛挓锛� blob
+ *
+ * @param application 鏂囦欢鐢ㄩ��
+ * @param recordType 鍏宠仈璁板綍绫诲瀷
+ * @param recordId 鍏宠仈璁板綍id
+ * @param expired 杩囨湡鏃堕棿
+ */
+ public List<StorageBlobVO> getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum application, RecordTypeEnum recordType, Long recordId, BigDecimal expired) {
+ List<StorageAttachment> storageAttachments = getStorageAttachmentsByApplicationAndRecordTypeAndRecordId(application, recordType, recordId);
+ if (CollectionUtils.isEmpty(storageAttachments)) {
+ return null;
+ }
+ List<Long> storageBlobIds = storageAttachments.stream().map(StorageAttachment::getStorageBlobId).collect(Collectors.toList());
+ List<StorageBlob> storageBlobs = storageBlobMapper.selectByIds(storageBlobIds);
+ List<StorageBlobVO> storageBlobDTOS = new ArrayList<>();
+ for (StorageBlob storageBlob : storageBlobs) {
+ StorageBlobVO storageBlobVO = new StorageBlobVO();
+ BeanUtils.copyProperties(storageBlob, storageBlobVO);
+ storageBlobVO.setPreviewURL(buildSignedUrl(storageBlobVO, "/preview/", expired));
+ storageBlobVO.setDownloadURL(buildSignedUrl(storageBlobVO, "/download/", expired));
+ storageBlobDTOS.add(storageBlobVO);
+ }
+ return storageBlobDTOS;
+ }
+
+ /**
+ * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢淇℃伅瀛樺湪杩囨湡鏃堕棿 鑷畾涔夎繃鏈熸椂闂达紙鍒嗛挓锛� blob
*
* @param storageAttachmentIds 鏂囦欢id
* @param expired 杩囨湡鏃堕棿
*/
- public List<StorageBlobVO> getStorageBlobDTOsByStorageAttachmentIds(List<Long> storageAttachmentIds, BigDecimal expired) {
+ public List<StorageBlobVO> getStorageBlobVOsByStorageAttachmentIds(List<Long> storageAttachmentIds, BigDecimal expired) {
List<StorageAttachment> storageAttachments = getStorageAttachmentsByStorageAttachmentIds(storageAttachmentIds);
if (CollectionUtils.isEmpty(storageAttachments)) {
return null;
@@ -234,109 +318,109 @@
}
/**
- * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢淇℃伅
+ * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢淇℃伅 attachment
*
* @param storageAttachmentIds 鏂囦欢id
*/
- public List<StorageAttachmentDTO> getStorageAttachmentDTOsByStorageAttachmentIds(List<Long> storageAttachmentIds) {
+ public List<StorageAttachmentVO> getStorageAttachmentVOSByStorageAttachmentIds(List<Long> storageAttachmentIds) {
List<StorageAttachment> storageAttachments = getStorageAttachmentsByStorageAttachmentIds(storageAttachmentIds);
if (CollectionUtils.isEmpty(storageAttachments)) {
return new ArrayList<>();
}
- List<StorageAttachmentDTO> storageAttachmentDTOS = new ArrayList<>();
+ List<StorageAttachmentVO> storageAttachmentVOS = new ArrayList<>();
for (StorageAttachment storageAttachment : storageAttachments) {
- StorageAttachmentDTO storageAttachmentDTO = new StorageAttachmentDTO();
- BeanUtils.copyProperties(storageAttachment, storageAttachmentDTO);
- List<StorageBlobVO> storageBlobVOS = getStorageBlobDTOsByStorageAttachmentIds(Collections.singletonList(storageAttachment.getId()));
+ StorageAttachmentVO storageAttachmentVO = new StorageAttachmentVO();
+ BeanUtils.copyProperties(storageAttachment, storageAttachmentVO);
+ List<StorageBlobVO> storageBlobVOS = getStorageBlobVOsByStorageAttachmentIds(Collections.singletonList(storageAttachment.getId()));
if (CollectionUtils.isEmpty(storageBlobVOS)) {
- storageAttachmentDTO.setStorageBlobVOS(new ArrayList<>());
+ storageAttachmentVO.setStorageBlobVOS(new ArrayList<>());
} else {
- storageAttachmentDTO.setStorageBlobVOS(storageBlobVOS);
+ storageAttachmentVO.setStorageBlobVOS(storageBlobVOS);
}
- storageAttachmentDTOS.add(storageAttachmentDTO);
+ storageAttachmentVOS.add(storageAttachmentVO);
}
- return storageAttachmentDTOS;
+ return storageAttachmentVOS;
}
/**
- * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢淇℃伅瀛樺湪杩囨湡鏃堕棿
+ * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢淇℃伅瀛樺湪杩囨湡鏃堕棿 鑷畾涔夎繃鏈熸椂闂达紙鍒嗛挓锛� attachment
*
* @param storageAttachmentIds 鏂囦欢id
* @param expired 杩囨湡鏃堕棿
*/
- public List<StorageAttachmentDTO> getStorageAttachmentDTOsByStorageAttachmentIds(List<Long> storageAttachmentIds, BigDecimal expired) {
+ public List<StorageAttachmentVO> getStorageAttachmentVOSByStorageAttachmentIds(List<Long> storageAttachmentIds, BigDecimal expired) {
List<StorageAttachment> storageAttachments = getStorageAttachmentsByStorageAttachmentIds(storageAttachmentIds);
if (CollectionUtils.isEmpty(storageAttachments)) {
return new ArrayList<>();
}
- List<StorageAttachmentDTO> storageAttachmentDTOS = new ArrayList<>();
+ List<StorageAttachmentVO> storageAttachmentVOS = new ArrayList<>();
for (StorageAttachment storageAttachment : storageAttachments) {
- StorageAttachmentDTO storageAttachmentDTO = new StorageAttachmentDTO();
- BeanUtils.copyProperties(storageAttachment, storageAttachmentDTO);
- List<StorageBlobVO> storageBlobVOS = getStorageBlobDTOsByStorageAttachmentIds(Collections.singletonList(storageAttachment.getId()), expired);
+ StorageAttachmentVO storageAttachmentVO = new StorageAttachmentVO();
+ BeanUtils.copyProperties(storageAttachment, storageAttachmentVO);
+ List<StorageBlobVO> storageBlobVOS = getStorageBlobVOsByStorageAttachmentIds(Collections.singletonList(storageAttachment.getId()), expired);
if (CollectionUtils.isEmpty(storageBlobVOS)) {
- storageAttachmentDTO.setStorageBlobVOS(new ArrayList<>());
+ storageAttachmentVO.setStorageBlobVOS(new ArrayList<>());
} else {
- storageAttachmentDTO.setStorageBlobVOS(storageBlobVOS);
+ storageAttachmentVO.setStorageBlobVOS(storageBlobVOS);
}
- storageAttachmentDTOS.add(storageAttachmentDTO);
+ storageAttachmentVOS.add(storageAttachmentVO);
}
- return storageAttachmentDTOS;
+ return storageAttachmentVOS;
}
/**
- * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢淇℃伅
+ * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢淇℃伅 attachment
*
* @param application 搴旂敤
* @param recordType 璁板綍绫诲瀷
* @param recordId 璁板綍id
*/
- public List<StorageAttachmentDTO> getStorageAttachmentDTOsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum application, RecordTypeEnum recordType, Long recordId) {
+ public List<StorageAttachmentVO> getStorageAttachmentVOSByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum application, RecordTypeEnum recordType, Long recordId) {
List<StorageAttachment> storageAttachments = getStorageAttachmentsByApplicationAndRecordTypeAndRecordId(application, recordType, recordId);
if (CollectionUtils.isEmpty(storageAttachments)) {
return new ArrayList<>();
}
- List<StorageAttachmentDTO> storageAttachmentDTOS = new ArrayList<>();
+ List<StorageAttachmentVO> storageAttachmentVOS = new ArrayList<>();
for (StorageAttachment storageAttachment : storageAttachments) {
- StorageAttachmentDTO storageAttachmentDTO = new StorageAttachmentDTO();
- BeanUtils.copyProperties(storageAttachment, storageAttachmentDTO);
- List<StorageBlobVO> storageBlobVOS = getStorageBlobDTOsByStorageAttachmentIds(Collections.singletonList(storageAttachment.getId()));
+ StorageAttachmentVO storageAttachmentVO = new StorageAttachmentVO();
+ BeanUtils.copyProperties(storageAttachment, storageAttachmentVO);
+ List<StorageBlobVO> storageBlobVOS = getStorageBlobVOsByStorageAttachmentIds(Collections.singletonList(storageAttachment.getId()));
if (CollectionUtils.isEmpty(storageBlobVOS)) {
- storageAttachmentDTO.setStorageBlobVOS(new ArrayList<>());
+ storageAttachmentVO.setStorageBlobVOS(new ArrayList<>());
} else {
- storageAttachmentDTO.setStorageBlobVOS(storageBlobVOS);
+ storageAttachmentVO.setStorageBlobVOS(storageBlobVOS);
}
- storageAttachmentDTOS.add(storageAttachmentDTO);
+ storageAttachmentVOS.add(storageAttachmentVO);
}
- return storageAttachmentDTOS;
+ return storageAttachmentVOS;
}
/**
- * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢淇℃伅瀛樺湪杩囨湡鏃堕棿
+ * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢淇℃伅瀛樺湪杩囨湡鏃堕棿 鑷畾涔夎繃鏈熸椂闂达紙鍒嗛挓锛� attachment
*
* @param application 搴旂敤
* @param recordType 璁板綍绫诲瀷
* @param recordId 璁板綍id
* @param expired 杩囨湡鏃堕棿
*/
- public List<StorageAttachmentDTO> getStorageAttachmentDTOsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum application, RecordTypeEnum recordType, Long recordId, BigDecimal expired) {
+ public List<StorageAttachmentVO> getStorageAttachmentVOSByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum application, RecordTypeEnum recordType, Long recordId, BigDecimal expired) {
List<StorageAttachment> storageAttachments = getStorageAttachmentsByApplicationAndRecordTypeAndRecordId(application, recordType, recordId);
if (CollectionUtils.isEmpty(storageAttachments)) {
return new ArrayList<>();
}
- List<StorageAttachmentDTO> storageAttachmentDTOS = new ArrayList<>();
+ List<StorageAttachmentVO> storageAttachmentVOS = new ArrayList<>();
for (StorageAttachment storageAttachment : storageAttachments) {
- StorageAttachmentDTO storageAttachmentDTO = new StorageAttachmentDTO();
- BeanUtils.copyProperties(storageAttachment, storageAttachmentDTO);
- List<StorageBlobVO> storageBlobVOS = getStorageBlobDTOsByStorageAttachmentIds(Collections.singletonList(storageAttachment.getId()), expired);
+ StorageAttachmentVO storageAttachmentVO = new StorageAttachmentVO();
+ BeanUtils.copyProperties(storageAttachment, storageAttachmentVO);
+ List<StorageBlobVO> storageBlobVOS = getStorageBlobVOsByStorageAttachmentIds(Collections.singletonList(storageAttachment.getId()), expired);
if (CollectionUtils.isEmpty(storageBlobVOS)) {
- storageAttachmentDTO.setStorageBlobVOS(new ArrayList<>());
+ storageAttachmentVO.setStorageBlobVOS(new ArrayList<>());
} else {
- storageAttachmentDTO.setStorageBlobVOS(storageBlobVOS);
+ storageAttachmentVO.setStorageBlobVOS(storageBlobVOS);
}
- storageAttachmentDTOS.add(storageAttachmentDTO);
+ storageAttachmentVOS.add(storageAttachmentVO);
}
- return storageAttachmentDTOS;
+ return storageAttachmentVOS;
}
/**
@@ -346,7 +430,7 @@
*/
public List<String> getFilePreviewURLByStorageAttachmentIds(List<Long> storageAttachmentIds) {
List<String> res = new ArrayList<>();
- List<StorageBlobVO> storageBlobVOS = getStorageBlobDTOsByStorageAttachmentIds(storageAttachmentIds);
+ List<StorageBlobVO> storageBlobVOS = getStorageBlobVOsByStorageAttachmentIds(storageAttachmentIds);
for (StorageBlobVO storageBlobVO : storageBlobVOS) {
res.add(buildSignedPreviewUrl(storageBlobVO));
}
@@ -354,14 +438,14 @@
}
/**
- * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢棰勮鍦板潃瀛樺湪杩囨湡鏃堕棿
+ * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢棰勮鍦板潃瀛樺湪杩囨湡鏃堕棿 鑷畾涔夎繃鏈熸椂闂达紙鍒嗛挓锛�
*
* @param storageAttachmentIds 鏂囦欢鍏宠仈id
* @param expired 杩囨湡鏃堕棿
*/
public List<String> getFilePreviewURLByStorageAttachmentIds(List<Long> storageAttachmentIds, BigDecimal expired) {
List<String> res = new ArrayList<>();
- List<StorageBlobVO> storageBlobVOS = getStorageBlobDTOsByStorageAttachmentIds(storageAttachmentIds);
+ List<StorageBlobVO> storageBlobVOS = getStorageBlobVOsByStorageAttachmentIds(storageAttachmentIds);
for (StorageBlobVO storageBlobVO : storageBlobVOS) {
res.add(buildSignedUrl(storageBlobVO, "/preview/", expired));
}
@@ -375,7 +459,7 @@
*/
public List<String> getFileDownloadURLByStorageAttachmentIds(List<Long> storageAttachmentIds) {
List<String> res = new ArrayList<>();
- List<StorageBlobVO> storageBlobVOS = getStorageBlobDTOsByStorageAttachmentIds(storageAttachmentIds);
+ List<StorageBlobVO> storageBlobVOS = getStorageBlobVOsByStorageAttachmentIds(storageAttachmentIds);
for (StorageBlobVO storageBlobVO : storageBlobVOS) {
res.add(buildSignedDownloadUrl(storageBlobVO));
}
@@ -383,14 +467,14 @@
}
/**
- * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢涓嬭浇鍦板潃瀛樺湪杩囨湡鏃堕棿
+ * 閫氳繃鏂囦欢鍏宠仈id鑾峰彇鏂囦欢涓嬭浇鍦板潃瀛樺湪杩囨湡鏃堕棿 鑷畾涔夎繃鏈熸椂闂达紙鍒嗛挓锛�
*
* @param storageAttachmentIds 鏂囦欢鍏宠仈id
* @param expired 杩囨湡鏃堕棿
*/
public List<String> getFileDownloadURLByStorageAttachmentIds(List<Long> storageAttachmentIds, BigDecimal expired) {
List<String> res = new ArrayList<>();
- List<StorageBlobVO> storageBlobVOS = getStorageBlobDTOsByStorageAttachmentIds(storageAttachmentIds);
+ List<StorageBlobVO> storageBlobVOS = getStorageBlobVOsByStorageAttachmentIds(storageAttachmentIds);
for (StorageBlobVO storageBlobVO : storageBlobVOS) {
res.add(buildSignedUrl(storageBlobVO, "/download/", expired));
}
@@ -489,7 +573,7 @@
}
/**
- * 鍘嬬缉鏂囦欢
+ * 鍘嬬缉鏂囦欢 鍥剧墖
*
* @param file 鏂囦欢
* @return 鍘嬬缉鍚庣殑鏂囦欢
diff --git a/src/main/java/com/ruoyi/common/config/MinioConfig.java b/src/main/java/com/ruoyi/common/config/MinioConfig.java
deleted file mode 100644
index 28f489f..0000000
--- a/src/main/java/com/ruoyi/common/config/MinioConfig.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ruoyi.common.config;
-
-import io.minio.MinioClient;
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-
-@Configuration
-@Component
-@ConfigurationProperties(prefix = "minio")
-@Data
-public class MinioConfig {
- private String endpoint;
- private int port;
- private String accessKey;
- private String secretKey;
- private Boolean secure;
-
- @Bean
- public MinioClient getMinioClient() {
- return MinioClient.builder().endpoint(endpoint, port, secure)
- .credentials(accessKey, secretKey)
- .build();
- }
-}
diff --git a/src/main/java/com/ruoyi/common/utils/MinioUtils.java b/src/main/java/com/ruoyi/common/utils/MinioUtils.java
deleted file mode 100644
index 19f0dcd..0000000
--- a/src/main/java/com/ruoyi/common/utils/MinioUtils.java
+++ /dev/null
@@ -1,433 +0,0 @@
-package com.ruoyi.common.utils;
-
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.ruoyi.common.exception.UtilException;
-import com.ruoyi.common.exception.file.InvalidExtensionException;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.MimeTypeUtils;
-import com.ruoyi.framework.web.domain.MinioResult;
-import io.minio.*;
-import io.minio.http.Method;
-import io.minio.messages.DeleteError;
-import io.minio.messages.DeleteObject;
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.util.FastByteArrayOutputStream;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.InputStream;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-@Component
-@RequiredArgsConstructor
-public class MinioUtils {
-
- private final MinioClient minioClient;
-
- @Value("${minio.preview-expiry}")
- private Integer previewExpiry;
-
- /**
- * -- GETTER --
- * 鑾峰彇榛樿瀛樺偍妗跺悕绉�
- *
- * @return
- */
- @Getter
- @Value("${minio.default-bucket}")
- private String defaultBucket;
-
- /**
- * 鍒ゆ柇瀛樺偍妗舵槸鍚﹀瓨鍦紝涓嶅瓨鍦ㄥ垯鍒涘缓
- *
- * @param bucketName 瀛樺偍妗跺悕绉�
- */
- public void existBucket(String bucketName) {
- try {
- boolean exists = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build());
- if (!exists) {
- minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build());
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 鍒涘缓瀛樺偍妗�
- *
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @return 鏄惁鍒涘缓鎴愬姛
- */
- public Boolean makeBucket(String bucketName) {
- try {
- minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build());
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
- return true;
- }
-
- /**
- * 鍒犻櫎瀛樺偍妗�
- *
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @return 鏄惁鍒犻櫎鎴愬姛
- */
- public Boolean removeBucket(String bucketName) {
- try {
- minioClient.removeBucket(RemoveBucketArgs.builder().bucket(bucketName).build());
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
- return true;
- }
-
- /**
- * 鍒ゆ柇瀵硅薄鏄惁瀛樺湪
- *
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @param originalFileName MinIO涓瓨鍌ㄥ璞″叏璺緞
- * @return 瀵硅薄鏄惁瀛樺湪
- */
- public boolean existObject(String bucketName, String originalFileName) {
- try {
- minioClient.statObject(StatObjectArgs.builder().bucket(bucketName).object(originalFileName).build());
- } catch (Exception e) {
- e.printStackTrace();
- return false;
- }
- return true;
- }
-
- /**
- * 鏂囦欢涓婁紶
- *
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @param file 鏂囦欢
- * @return 妗朵腑浣嶇疆
- */
- public MinioResult upload(String bucketName, MultipartFile file, Boolean isPreviewExpiry) throws InvalidExtensionException {
- MultipartFile[] fileArr = {file};
- List<MinioResult> fileNames = upload(bucketName, fileArr, isPreviewExpiry);
- return fileNames.isEmpty() ? null : fileNames.get(0);
- }
-
- /**
- * 涓婁紶鏂囦欢
- *
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @param fileList 鏂囦欢鍒楄〃
- * @return 妗朵腑浣嶇疆鍒楄〃
- */
- public List<MinioResult> upload(String bucketName, List<MultipartFile> fileList, Boolean isPreviewExpiry) throws InvalidExtensionException {
- MultipartFile[] fileArr = fileList.toArray(new MultipartFile[0]);
- return upload(bucketName, fileArr, isPreviewExpiry);
- }
-
- /**
- * description: 涓婁紶鏂囦欢
- *
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @param fileArr 鏂囦欢鍒楄〃
- * @return 妗朵腑浣嶇疆鍒楄〃
- */
- public List<MinioResult> upload(String bucketName, MultipartFile[] fileArr, Boolean isPreviewExpiry) throws InvalidExtensionException {
- for (MultipartFile file : fileArr) {
- FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
- }
- // 淇濊瘉妗朵竴瀹氬瓨鍦�
- existBucket(bucketName);
- // 鎵ц姝ｅ父鎿嶄綔
- List<MinioResult> bucketFileNames = new ArrayList<>(fileArr.length);
- for (MultipartFile file : fileArr) {
- // 鑾峰彇鍘熷鏂囦欢鍚嶇О
- String originalFileName = file.getOriginalFilename();
- // 鑾峰彇褰撳墠鏃ユ湡锛屾牸寮忎緥濡傦細2020-11
- String datePath = new SimpleDateFormat("yyyy-MM").format(new Date());
- // 鏂囦欢鍚嶇О
- String uuid = IdWorker.get32UUID();
- // 鑾峰彇鏂囦欢鍚庣紑
- String suffix = originalFileName.substring(originalFileName.lastIndexOf("."));
- String bucketFilePath = datePath + "/" + uuid + suffix;
-
- // 鎺ㄩ�佹枃浠跺埌MinIO
- try (InputStream in = file.getInputStream()) {
- minioClient.putObject(PutObjectArgs.builder()
- .bucket(bucketName)
- .object(bucketFilePath)
- .stream(in, in.available(), -1)
- .contentType(file.getContentType())
- .build()
- );
- } catch (Exception e) {
- throw new UtilException("MinioUtils锛氫笂浼犳枃浠跺伐鍏风被寮傚父:" + e);
- }
- MinioResult minioResult = new MinioResult();
- minioResult.setBucketFileName(bucketFilePath);
- // 杩斿洖姘镐箙棰勮鍦板潃
- if (isPreviewExpiry) {
- String previewUrl = getPreviewUrl(bucketFilePath, bucketName, isPreviewExpiry);
- minioResult.setPreviewExpiry(previewUrl);
- }
- minioResult.setOriginalName(originalFileName);
- bucketFileNames.add(minioResult);
- }
- return bucketFileNames;
- }
-
- /**
- * 鏂囦欢涓嬭浇
- *
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @param bucketFileName 妗朵腑鏂囦欢鍚嶇О
- * @param originalFileName 鍘熷鏂囦欢鍚嶇О
- * @param response response瀵硅薄
- */
- public void download(String bucketName, String bucketFileName, String originalFileName, HttpServletResponse response) {
- GetObjectArgs objectArgs = GetObjectArgs.builder().bucket(bucketName).object(bucketFileName).build();
- try (GetObjectResponse objResponse = minioClient.getObject(objectArgs)) {
- byte[] buf = new byte[1024];
- int len;
- try (FastByteArrayOutputStream os = new FastByteArrayOutputStream()) {
- while ((len = objResponse.read(buf)) != -1) {
- os.write(buf, 0, len);
- }
- os.flush();
- byte[] bytes = os.toByteArray();
- response.setCharacterEncoding("utf-8");
- //璁剧疆寮哄埗涓嬭浇涓嶆墦寮�
- response.setContentType("application/force-download");
- // 璁剧疆闄勪欢鍚嶇О缂栫爜
- originalFileName = new String(originalFileName.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
- // 璁剧疆闄勪欢鍚嶇О
- response.addHeader("Content-Disposition", "attachment;fileName=" + originalFileName);
- // 鍐欏叆鏂囦欢
- try (ServletOutputStream stream = response.getOutputStream()) {
- stream.write(bytes);
- stream.flush();
- }
- }
- } catch (Exception e) {
- throw new UtilException("MinioUtils锛氫笂浼犳枃浠跺伐鍏风被寮傚父");
- }
- }
-
- /**
- * 鑾峰彇宸蹭笂浼犲璞＄殑鏂囦欢娴侊紙鍚庣鍥犱负涓氬姟闇�瑕佽幏鍙栨枃浠舵祦鍙互璋冪敤璇ユ柟娉曪級
- *
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @param bucketFileName 妗朵腑鏂囦欢鍚嶇О
- * @return 鏂囦欢娴�
- */
- public InputStream getFileStream(String bucketName, String bucketFileName) throws Exception {
- GetObjectArgs objectArgs = GetObjectArgs.builder().bucket(bucketName).object(bucketFileName).build();
- return minioClient.getObject(objectArgs);
- }
-
- /**
- * 鎵归噺鍒犻櫎鏂囦欢瀵硅薄缁撴灉
- *
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @param bucketFileName 妗朵腑鏂囦欢鍚嶇О
- * @return 鍒犻櫎缁撴灉
- */
- public DeleteError removeObjectsResult(String bucketName, String bucketFileName) {
- List<DeleteError> results = removeObjectsResult(bucketName, Collections.singletonList(bucketFileName));
- return !results.isEmpty() ? results.get(0) : null;
- }
-
- /**
- * 鎵归噺鍒犻櫎鏂囦欢瀵硅薄缁撴灉
- *
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @param bucketFileNames 妗朵腑鏂囦欢鍚嶇О闆嗗悎
- * @return 鍒犻櫎缁撴灉
- */
- public List<DeleteError> removeObjectsResult(String bucketName, List<String> bucketFileNames) {
- Iterable<Result<DeleteError>> results = removeObjects(bucketName, bucketFileNames);
- List<DeleteError> res = new ArrayList<>();
- for (Result<DeleteError> result : results) {
- try {
- res.add(result.get());
- } catch (Exception e) {
- throw new UtilException("MinioUtils锛氫笂浼犳枃浠跺伐鍏风被寮傚父");
- }
- }
- return res;
- }
-
- /**
- * 鎵归噺鍒犻櫎鏂囦欢瀵硅薄
- *
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @param bucketFileNames 妗朵腑鏂囦欢鍚嶇О闆嗗悎
- */
- private Iterable<Result<DeleteError>> removeObjects(String bucketName, List<String> bucketFileNames) {
- List<DeleteObject> dos = bucketFileNames.stream().map(DeleteObject::new).collect(Collectors.toList());
- return minioClient.removeObjects(RemoveObjectsArgs.builder().bucket(bucketName).objects(dos).build());
- }
-
- /**
- * 鏌ヨ棰勮url
- * @param bucketFileName minio鏂囦欢鍚嶇О
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @param isPreviewExpiry 鏄惁闇�瑕佽繃鏈熸椂闂� 榛樿24灏忔椂
- * @return
- */
- public String getPreviewUrl(String bucketFileName, String bucketName, Boolean isPreviewExpiry) {
- if (StringUtils.isNotBlank(bucketFileName)) {
- try {
- minioClient.statObject(StatObjectArgs.builder().bucket(bucketName).object(bucketFileName).build());
- // 涓篺alse鍙敓鎴�24灏忔椂鏈夋晥鏃堕暱鐨剈rl閾炬帴锛屽彲浠ヨ闂鏂囦欢
- if (isPreviewExpiry){
- return minioClient.getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder().method(Method.GET).bucket(bucketName).object(bucketFileName).build());
- }else {
- return minioClient.getPresignedObjectUrl(GetPresignedObjectUrlArgs.builder().method(Method.GET).bucket(bucketName).object(bucketFileName).expiry(previewExpiry, TimeUnit.HOURS).build());
- }
- } catch (Exception e) {
- throw new UtilException("MinioUtils锛氫笂浼犳枃浠跺伐鍏风被寮傚父");
- }
- }
- return null;
- }
-
- /**
- * 鐢熸垚棰勮URL
- * @param bucketFilename 鏂囦欢鍦∕inIO涓殑鍞竴鏍囪瘑
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @param useDefaultExpiry 鏄惁浣跨敤榛樿杩囨湡鏃堕棿锛坱rue=浣跨敤榛樿杩囨湡鏃堕棿锛宖alse=姘镐箙鏈夋晥锛�
- * @return 棰勮URL
- */
- public String getPreviewUrls(String bucketFilename, String bucketName, boolean useDefaultExpiry) {
- if (StringUtils.isBlank(bucketFilename)) {
- return null;
- }
-
- try {
- // 楠岃瘉鏂囦欢瀛樺湪鎬�
- minioClient.statObject(StatObjectArgs.builder()
- .bucket(bucketName)
- .object(bucketFilename)
- .build());
-
- GetPresignedObjectUrlArgs.Builder builder = GetPresignedObjectUrlArgs.builder()
- .method(Method.GET)
- .bucket(bucketName)
- .object(bucketFilename);
-
- // 璁剧疆杩囨湡鏃堕棿锛歶seDefaultExpiry=true 浣跨敤閰嶇疆鐨勮繃鏈熸椂闂�
- if (useDefaultExpiry) {
- builder.expiry(previewExpiry, TimeUnit.HOURS);
- }
-
- return minioClient.getPresignedObjectUrl(builder.build());
- } catch (Exception e) {
- throw new UtilException("鐢熸垚棰勮URL澶辫触: " + e.getMessage(), e);
- }
- }
-
-
- /**
- * 鐢熸垚涓嬭浇URL锛堝己鍒舵祻瑙堝櫒涓嬭浇锛�
- * @param bucketFilename 鏂囦欢鍦∕inIO涓殑鍞竴鏍囪瘑
- * @param bucketName 瀛樺偍妗跺悕绉�
- * @param originalFileName 鍘熷鏂囦欢鍚嶏紙鐢ㄤ簬涓嬭浇鏃舵樉绀猴級
- * @param useDefaultExpiry 鏄惁浣跨敤榛樿杩囨湡鏃堕棿锛坱rue=浣跨敤榛樿锛宖alse=鏃犺繃鏈熸椂闂达級
- * @return 涓嬭浇URL
- */
- public String getDownloadUrls(String bucketFilename, String bucketName, String originalFileName, boolean useDefaultExpiry) {
- if (StringUtils.isBlank(bucketFilename)) {
- return null;
- }
-
- try {
- // 楠岃瘉鏂囦欢瀛樺湪鎬�
- minioClient.statObject(StatObjectArgs.builder()
- .bucket(bucketName)
- .object(bucketFilename)
- .build());
-
- // 姝ｇ‘缂栫爜鏂囦欢鍚嶏細鏇挎崲 + 涓� %20
- String encodedFileName = URLEncoder.encode(originalFileName, String.valueOf(StandardCharsets.UTF_8))
- .replace("+", "%20");
-
- Map<String, String> reqParams = new HashMap<>();
- reqParams.put("response-content-disposition",
- "attachment; filename=\"" + encodedFileName + "\"");
-
- GetPresignedObjectUrlArgs.Builder builder = GetPresignedObjectUrlArgs.builder()
- .method(Method.GET)
- .bucket(bucketName)
- .object(bucketFilename)
- .extraQueryParams(reqParams);
-
- // 鏍规嵁鍙傛暟鍐冲畾鏄惁璁剧疆杩囨湡鏃堕棿
- if (useDefaultExpiry) {
- // 浣跨敤榛樿杩囨湡鏃堕棿锛堜粠閰嶇疆璇诲彇锛�
- builder.expiry(previewExpiry, TimeUnit.HOURS);
- } else {
- // 涓嶈缃繃鏈熸椂闂达紙MinIO 榛樿7澶╋級
- }
- return minioClient.getPresignedObjectUrl(builder.build());
- } catch (Exception e) {
- throw new UtilException("鐢熸垚涓嬭浇URL澶辫触: " + e.getMessage(), e);
- }
- }
-
- public String getDownloadUrl(String bucketFileName, String bucketName) {
- if (StringUtils.isNotBlank(bucketFileName)) {
- try {
- // 妫�鏌ユ枃浠舵槸鍚﹀瓨鍦�
- minioClient.statObject(StatObjectArgs.builder()
- .bucket(bucketName)
- .object(bucketFileName)
- .build());
-
- // 璁剧疆鍝嶅簲澶�
- Map<String, String> reqParams = new HashMap<>();
- // 鎻愬彇鍘熷鏂囦欢鍚嶏紙濡傛灉瀛樺偍鏃朵繚鐣欎簡鍘熷鍚嶇О锛�
- String originalFileName = extractOriginalFileName(bucketFileName);
- reqParams.put("response-content-disposition",
- "attachment; filename=\"" + URLEncoder.encode(originalFileName, String.valueOf(StandardCharsets.UTF_8)) + "\"");
-
- // 鏋勫缓棰勭鍚峌RL鍙傛暟
- GetPresignedObjectUrlArgs args = GetPresignedObjectUrlArgs.builder()
- .method(Method.GET)
- .bucket(bucketName)
- .object(bucketFileName)
- .expiry(previewExpiry, TimeUnit.HOURS)
- .extraQueryParams(reqParams)
- .build();
-
- return minioClient.getPresignedObjectUrl(args);
- } catch (Exception e) {
- throw new UtilException("MinioUtils锛氱敓鎴愪笅杞介摼鎺ュ紓甯�", e);
- }
- }
- return null;
- }
-
- private String extractOriginalFileName(String bucketFileName) {
- // 绀轰緥锛氬鏋滃瓨鍌ㄦ牸寮忎负 "鍘熷鏂囦欢鍚峗UUID"
- int underscoreIndex = bucketFileName.lastIndexOf("_");
- if (underscoreIndex > 0) {
- return bucketFileName.substring(0, underscoreIndex);
- }
- // 濡傛灉娌℃湁鐗规畩鏍煎紡锛岀洿鎺ヨ繑鍥炲畬鏁存枃浠跺悕
- return bucketFileName;
- }
-
-}
diff --git a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
index ecda3bd..be8dda5 100644
--- a/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
+++ b/src/main/java/com/ruoyi/inspectiontask/controller/InspectionTaskController.java
@@ -59,7 +59,7 @@
@PostMapping("/addOrEditInspectionTask")
@Operation(summary = "宸℃浠诲姟琛ㄦ柊澧炰慨鏀�")
@Transactional(rollbackFor = Exception.class)
- public R addOrEditInspectionTask(@RequestBody InspectionTaskDto inspectionTaskDto) throws IOException {
+ public R addOrEditInspectionTask(@RequestBody InspectionTaskDto inspectionTaskDto) {
return R.ok(inspectionTaskService.addOrEditInspectionTask(inspectionTaskDto));
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java b/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java
index 8daf720..a207cde 100644
--- a/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java
+++ b/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java
@@ -1,7 +1,8 @@
package com.ruoyi.inspectiontask.dto;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.inspectiontask.pojo.InspectionTask;
-import com.ruoyi.sales.pojo.CommonFile;
import lombok.Data;
import java.util.List;
@@ -16,9 +17,12 @@
//
// private List<StorageAttachment> attachments;
- private List<String> tempFileIds;
- private List<CommonFile> commonFileList; //鐢熶骇涓�
- private List<CommonFile> commonFileListAfter; //鐢熶骇鍚�
- private List<CommonFile> commonFileListBefore; //鐢熶骇鍓�
+ private List<StorageBlobDTO> commonFileListDTO; //鐢熶骇涓�
+ private List<StorageBlobDTO> commonFileListAfterDTO; //鐢熶骇鍚�
+ private List<StorageBlobDTO> commonFileListBeforeDTO; //鐢熶骇鍓�
+
+ private List<StorageBlobVO> commonFileListVO; //鐢熶骇涓�
+ private List<StorageBlobVO> commonFileListAfterVO; //鐢熶骇鍚�
+ private List<StorageBlobVO> commonFileListBeforeVO; //鐢熶骇鍓�
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/InspectionTaskService.java b/src/main/java/com/ruoyi/inspectiontask/service/InspectionTaskService.java
index 72ca5e4..de175f2 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/InspectionTaskService.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/InspectionTaskService.java
@@ -6,8 +6,6 @@
import com.ruoyi.inspectiontask.dto.InspectionTaskDto;
import com.ruoyi.inspectiontask.pojo.InspectionTask;
-import java.io.IOException;
-
/**
* @author :yys
* @date : 2025/9/19 10:49
@@ -16,7 +14,7 @@
IPage<InspectionTaskDto> selectInspectionTaskList(Page<InspectionTask> page, InspectionTaskDto inspectionTaskDto);
- int addOrEditInspectionTask(InspectionTaskDto inspectionTaskDto) throws IOException;
+ int addOrEditInspectionTask(InspectionTaskDto inspectionTaskDto);
int delByIds(Long[] ids);
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java b/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
index d8c4ba7..410336e 100644
--- a/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/inspectiontask/service/impl/InspectionTaskServiceImpl.java
@@ -5,13 +5,9 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.dto.StorageBlobVO;
-import com.ruoyi.basic.mapper.StorageAttachmentMapper;
-import com.ruoyi.basic.mapper.StorageBlobMapper;
-import com.ruoyi.basic.pojo.StorageBlob;
-import com.ruoyi.basic.service.StorageAttachmentService;
-import com.ruoyi.common.enums.FileNameType;
-import com.ruoyi.common.utils.MinioUtils;
+import com.ruoyi.basic.enums.ApplicationTypeEnum;
+import com.ruoyi.basic.enums.RecordTypeEnum;
+import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
@@ -21,18 +17,13 @@
import com.ruoyi.inspectiontask.service.InspectionTaskService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
-import com.ruoyi.sales.mapper.CommonFileMapper;
-import com.ruoyi.sales.pojo.CommonFile;
-import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.io.IOException;
import java.time.format.DateTimeFormatter;
import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -48,19 +39,9 @@
private final InspectionTaskMapper inspectionTaskMapper;
- private final StorageAttachmentService storageAttachmentService;
-
- private final StorageBlobMapper storageBlobMapper;
-
- private final StorageAttachmentMapper storageAttachmentMapper;
-
- private final MinioUtils minioUtils;
-
private final SysUserMapper sysUserMapper;
- private final CommonFileMapper commonFileMapper;
-
- private final CommonFileServiceImpl commonFileService;
+ private final FileUtil fileUtil;
@Override
public IPage<InspectionTaskDto> selectInspectionTaskList(Page<InspectionTask> page, InspectionTaskDto inspectionTaskDto) {
@@ -114,16 +95,6 @@
SysUser::getUserId,
SysUser::getNickName,
(existing, replacement) -> existing));
-
- //澶勭悊闄勪欢
- List<CommonFile> commonFiles = commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>()
- .in(CommonFile::getCommonId, ids)
- .in(CommonFile::getType, Arrays.asList(FileNameType.INSPECTION.getValue(), FileNameType.INSPECTION_PRODUCTION_BEFORE.getValue(), FileNameType.INSPECTION_PRODUCTION_AFTER.getValue())));
- if(commonFiles == null){
- commonFiles = new ArrayList<>();
- }
- AtomicReference<List<CommonFile>> finalCommonFiles = new AtomicReference<>(commonFiles);
-
List<InspectionTaskDto> dtoList = entityPage.getRecords().stream().map(inspectionTask -> {
InspectionTaskDto dto = new InspectionTaskDto();
BeanUtils.copyProperties(inspectionTask, dto); // 澶嶅埗涓诲璞″睘鎬�
@@ -150,11 +121,10 @@
}
dto.setDateStr(inspectionTask.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
- finalCommonFiles.set(finalCommonFiles.get().stream().filter(commonFile -> commonFile.getCommonId().equals(inspectionTask.getId())).collect(Collectors.toList()));
// 鍒濆鍖栦笁涓檮浠跺垪琛�
- dto.setCommonFileList(finalCommonFiles.get().stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION.getValue())).collect(Collectors.toList()));
- dto.setCommonFileListAfter(finalCommonFiles.get().stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_AFTER.getValue())).collect(Collectors.toList()));
- dto.setCommonFileListBefore(finalCommonFiles.get().stream().filter(commonFile -> commonFile.getType().equals(FileNameType.INSPECTION_PRODUCTION_BEFORE.getValue())).collect(Collectors.toList()));
+ dto.setCommonFileListVO(fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum.FILE, RecordTypeEnum.INSPECTION_TASK, inspectionTask.getId()));
+ dto.setCommonFileListAfterVO(fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum.AFTER_FILE, RecordTypeEnum.INSPECTION_TASK, inspectionTask.getId()));
+ dto.setCommonFileListBeforeVO(fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum.BEFORE_FILE, RecordTypeEnum.INSPECTION_TASK, inspectionTask.getId()));
return dto;
@@ -167,32 +137,9 @@
return resultPage;
}
- // 鎻愬彇鍒涘缓BlobDTO鐨勫叕鍏辨柟娉�
- private StorageBlobVO createBlobDto(StorageBlob blob) {
- StorageBlobVO dto = new StorageBlobVO();
- BeanUtils.copyProperties(blob, dto);
-
- // todo fileChange
-// // 璁剧疆URL
-// dto.setUrl(minioUtils.getPreviewUrls(
-// blob.getBucketFilename(),
-// blob.getBucketName(),
-// true
-// ));
-//
-// // 璁剧疆涓嬭浇URL
-// dto.setDownloadUrl(minioUtils.getDownloadUrls(
-// blob.getBucketFilename(),
-// blob.getBucketName(),
-// blob.getOriginalFilename(),
-// true
-// ));
- return dto;
- }
-
@Override
@Transactional(rollbackFor = Exception.class)
- public int addOrEditInspectionTask(InspectionTaskDto inspectionTaskDto) throws IOException {
+ public int addOrEditInspectionTask(InspectionTaskDto inspectionTaskDto) {
InspectionTask inspectionTask = new InspectionTask();
BeanUtils.copyProperties(inspectionTaskDto, inspectionTask);
inspectionTask.setRegistrantId(SecurityUtils.getLoginUser().getUserId());
@@ -203,7 +150,11 @@
} else {
i = inspectionTaskMapper.updateById(inspectionTask);
}
- commonFileService.migrateTempFilesToFormal(inspectionTask.getId(),inspectionTaskDto.getTempFileIds());
+ // 淇濆瓨鏂囦欢
+ fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE, RecordTypeEnum.INSPECTION_TASK, inspectionTask.getId(), inspectionTaskDto.getCommonFileListDTO());
+ fileUtil.saveStorageAttachment(ApplicationTypeEnum.AFTER_FILE, RecordTypeEnum.INSPECTION_TASK, inspectionTask.getId(), inspectionTaskDto.getCommonFileListAfterDTO());
+ fileUtil.saveStorageAttachment(ApplicationTypeEnum.BEFORE_FILE, RecordTypeEnum.INSPECTION_TASK, inspectionTask.getId(), inspectionTaskDto.getCommonFileListBeforeDTO());
+
return i;
}
@@ -214,9 +165,10 @@
if (ids == null || ids.length == 0) {
return 0;
}
- commonFileService.deleteByBusinessIds(Arrays.asList(ids),FileNameType.INSPECTION.getValue());
- commonFileService.deleteByBusinessIds(Arrays.asList(ids),FileNameType.INSPECTION_PRODUCTION_BEFORE.getValue());
- commonFileService.deleteByBusinessIds(Arrays.asList(ids),FileNameType.INSPECTION_PRODUCTION_AFTER.getValue());
+ // 鍒犻櫎鏂囦欢
+ fileUtil.deleteStorageAttachmentsByApplicationAndRecordTypeAndRecordIds(ApplicationTypeEnum.FILE, RecordTypeEnum.INSPECTION_TASK, Arrays.asList(ids));
+ fileUtil.deleteStorageAttachmentsByApplicationAndRecordTypeAndRecordIds(ApplicationTypeEnum.AFTER_FILE, RecordTypeEnum.INSPECTION_TASK, Arrays.asList(ids));
+ fileUtil.deleteStorageAttachmentsByApplicationAndRecordTypeAndRecordIds(ApplicationTypeEnum.BEFORE_FILE, RecordTypeEnum.INSPECTION_TASK, Arrays.asList(ids));
return inspectionTaskMapper.deleteBatchIds(Arrays.asList(ids));
}
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
index 3f6ef76..a980ce2 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
@@ -16,30 +16,10 @@
@Data
public class ProductionPlanDto extends ProductionPlan {
- /**
- * 鐗╂枡缂栫爜
- */
- @Schema(description = "鐗╂枡缂栫爜")
- @Excel(name = "鐗╂枡缂栫爜")
- private String materialCode;
-
- /**
- * 浜у搧鍚嶇О
- */
@Schema(description = "浜у搧鍚嶇О")
@Excel(name = "浜у搧鍚嶇О")
private String productName;
- /**
- * 瀹㈡埛鍚嶇О
- */
- @Schema(description = "瀹㈡埛鍚嶇О")
- @Excel(name = "瀹㈡埛鍚嶇О")
- private String customerName;
-
- /**
- * 浜у搧瑙勬牸
- */
@Schema(description = "浜у搧瑙勬牸")
@Excel(name = "浜у搧瑙勬牸")
private String model;
@@ -59,17 +39,7 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planCompleteTime;
- /**
- * 鍏宠仈鐗╂枡淇℃伅琛�
- */
- @Schema(description = "鍏宠仈鐗╂枡淇℃伅琛↖D")
- private Long productMaterialId;
-
- /**
- * 寮哄害
- */
- @Schema(description = "寮哄害")
- @Excel(name = "寮哄害")
- private String strength;
+ @Schema(description = "浜у搧ID")
+ private Long productId;
}
diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java
index a6aa0ce..5dd5160 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanImportDto.java
@@ -1,12 +1,11 @@
package com.ruoyi.production.bean.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
/**
* <br>
@@ -20,126 +19,43 @@
@Data
@Schema(name = "閿�鍞敓浜ч渶姹� Excel瀵煎叆瀵煎嚭DTO")
public class ProductionPlanImportDto {
- /**
- * 鐢宠鍗曠紪鍙�
- */
- @Schema(description = "鐢宠鍗曠紪鍙�")
- @Excel(name = "鐢宠鍗曠紪鍙�")
- private String applyNo;
- /**
- * 瀹㈡埛鍚嶇О
- */
- @Schema(description = "瀹㈡埛鍚嶇О")
- @Excel(name = "瀹㈡埛鍚嶇О")
- private String customerName;
+ @Schema(description = "涓荤敓浜ц鍒掑彿")
+ @Excel(name = "涓荤敓浜ц鍒掑彿")
+ private String mpsNo;
- /**
- * 鐗╂枡缂栫爜
- */
- @Schema(description = "鐗╂枡缂栫爜")
- @Excel(name = "鐗╂枡缂栫爜")
- private String materialCode;
+ @Schema(description = "闇�姹傛棩鏈�")
+ @Excel(name = "闇�姹傛棩鏈�")
+ private LocalDate requiredDate;
- /**
- * 浜у搧鍚嶇О
- */
+ @Schema(description = "澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+ @Schema(description = "闇�姹傛暟閲�")
+ @Excel(name = "闇�姹傛暟閲�")
+ private BigDecimal qtyRequired;
+
+ @Schema(description = "鏉ユ簮 閿�鍞�/鍐呴儴")
+ @Excel(name = "鏉ユ簮 閿�鍞�/鍐呴儴")
+ private String source;
+
+ @Schema(description = "鎵胯鏃ユ湡")
+ @Excel(name = "鎵胯鏃ユ湡")
+ private LocalDate promisedDeliveryDate;
+
@Schema(description = "浜у搧鍚嶇О")
@Excel(name = "浜у搧鍚嶇О")
private String productName;
- /**
- * 浜у搧瑙勬牸
- */
- @Schema(description = "浜у搧瑙勬牸")
- @Excel(name = "浜у搧瑙勬牸")
- private String productSpec;
+ @Schema(description = "瑙勬牸鍨嬪彿")
+ @Excel(name = "瑙勬牸鍨嬪彿")
+ private String model;
- /**
- * 闀�
- */
- @Schema(description = "闀�")
- @Excel(name = "闀�(mm)")
- private Integer length;
+ @Schema(description = "鍗曚綅")
+ @Excel(name = "鍗曚綅")
+ private String unit;
- /**
- * 瀹�
- */
- @Schema(description = "瀹�")
- @Excel(name = "瀹�(mm)")
- private Integer width;
-
- /**
- * 楂�
- */
- @Schema(description = "楂�")
- @Excel(name = "楂�(mm)")
- private Integer height;
-
- /**
- * 鍧楁暟
- */
- @Schema(description = "鍧楁暟")
- @Excel(name = "鍧楁暟")
- private Integer quantity;
-
- /**
- * 鏂规暟
- */
- @Schema(description = "鏂规暟")
- @Excel(name = "鏂规暟")
- private BigDecimal volume;
-
- /**
- * 寮哄害
- */
- @Schema(description = "寮哄害")
- @Excel(name = "寮哄害")
- private String strength;
-
- /**
- * 寮�濮嬫棩鏈�
- */
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @Schema(description = "寮�濮嬫棩鏈�")
- @Excel(name = "寮�濮嬫棩鏈�", width = 20, dateFormat = "yyyy-MM-dd")
- private Date startDate;
-
- /**
- * 缁撴潫鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @Schema(description = "缁撴潫鏃ユ湡")
- @Excel(name = "缁撴潫鏃ユ湡", width = 20, dateFormat = "yyyy-MM-dd")
- private Date endDate;
-
- /**
- * 鎻愪氦浜�
- */
- @Schema(description = "鎻愪氦浜�")
- @Excel(name = "鎻愪氦浜�")
- private String submitter;
-
- /**
- * 鎻愪氦浜虹粍缁�
- */
- @Schema(description = "鎻愪氦浜虹粍缁�")
- @Excel(name = "鎻愪氦浜虹粍缁�")
- private String submitOrg;
-
- /**
- * 澶囨敞1
- */
- @Schema(description = "澶囨敞1")
- @Excel(name = "澶囨敞1")
- private String remarkOne;
-
- /**
- * 澶囨敞2
- */
- @Schema(description = "澶囨敞2")
- @Excel(name = "澶囨敞2")
- private String remarkTwo;
/**
* 鍒涘缓浜�
@@ -155,22 +71,11 @@
@Excel(name = "淇敼浜�", type = Excel.Type.EXPORT)
private String modifierName;
- /**
- * 鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟
- */
- @Schema(description = "鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟")
- private Integer dataSyncType;
/**
- * 鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板
+ * 宸蹭笅鍙戞暟閲�
*/
- @Schema(description = "鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板")
- private Integer dataSourceType;
-
- /**
- * 涓嬪彂鏁伴噺
- */
- @Schema(description = "涓嬪彂鏁伴噺")
- @Excel(name = "涓嬪彂鏁伴噺", type = Excel.Type.EXPORT)
+ @Schema(description = "宸蹭笅鍙戞暟閲�")
+ @Excel(name = "宸蹭笅鍙戞暟閲�", type = Excel.Type.EXPORT)
private BigDecimal assignedQuantity;
}
diff --git a/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java b/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java
index 4c0dbe3..842fc9b 100644
--- a/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java
+++ b/src/main/java/com/ruoyi/production/bean/vo/ProductionPlanVo.java
@@ -9,8 +9,6 @@
@Data
@Schema(name = "ProductionPlanVo", description = "鐢熶骇璁″垝杩斿洖瀵硅薄")
public class ProductionPlanVo extends ProductionPlan {
- @Schema(description = "鐗╂枡缂栫爜")
- private String materialCode;
@Schema(description = "浜у搧鍚嶇О")
private String productName;
@@ -21,6 +19,6 @@
@Schema(description = "鍗曚綅")
private String unit;
- @Schema(description = "鍏宠仈浜у搧鐗╂枡ID")
- private Long productMaterialId;
+ @Schema(description = "浜у搧ID")
+ private Long productId;
}
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java
index 9810b6e..841dd10 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductionPlanMapper.java
@@ -27,5 +27,4 @@
List<ProductionPlanDto> selectWithMaterialByIds(@Param("ids") List<Long> ids);
ProductionPlanDto selectProductionPlanDtoById(@Param("productionPlanId") Long productionPlanId);
-
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
index eb0ef6d..b7809c8 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionPlan.java
@@ -30,6 +30,12 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ @Schema(description = "閿�鍞彴璐d")
+ private Long salesLedgerId;
+
+ @Schema(description = "閿�鍞骇鍝佽鏍糹d")
+ private Long salesLedgerProductId;
+
@Schema(description = "涓荤敓浜ц鍒掑彿")
private String mpsNo;
@@ -55,6 +61,10 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
+ @Schema(description = "閮ㄩ棬ID")
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
@Schema(description = "浜у搧鍨嬪彿id")
private Long productModelId;
@@ -64,7 +74,7 @@
@Schema(description = "鏄惁涓嬪彂鍒堕�犺鍗�")
private Boolean issued;
- @Schema(description = "鏉ユ簮")
+ @Schema(description = "鏉ユ簮 閿�鍞�/鍐呴儴")
private String source;
@Schema(description = "瀹℃牳鐘舵��")
@@ -72,9 +82,6 @@
@Schema(description = "鎵胯鏃ユ湡")
private LocalDate promisedDeliveryDate;
-
- @Schema(description = "鐢宠鍗曠紪鍙�")
- private String applyNo;
@Schema(description = "鐘舵�� 0鏈笅鍙� 1閮ㄥ垎涓嬪彂 2宸蹭笅鍙�")
private Integer status;
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
index c6d90cf..5ec666b 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -62,7 +63,7 @@
private final FileUtil fileUtil;
@Override
- public com.baomidou.mybatisplus.core.metadata.IPage<ProductionOrderVo> pageProductionOrder(Page<ProductionOrderDto> page, ProductionOrderDto dto) {
+ public IPage<ProductionOrderVo> pageProductionOrder(Page<ProductionOrderDto> page, ProductionOrderDto dto) {
Page<ProductionOrderVo> result = (Page<ProductionOrderVo>) baseMapper.pageProductionOrder(page, dto);
fillProductImages(result.getRecords());
return result;
@@ -359,18 +360,18 @@
if (defaultDecimal(productionOrder.getQuantity()).compareTo(BigDecimal.ZERO) <= 0) {
throw new ServiceException("quantity must be greater than 0");
}
- if (productionOrder.getTechnologyRoutingId() == null) {
- // 鏈樉寮忔寚瀹氬伐鑹鸿矾绾挎椂锛屾寜浜у搧瑙勬牸閫夋渶鏂颁竴鏉″伐鑹轰綔涓洪粯璁よ矾绾裤��
- TechnologyRouting technologyRouting = technologyRoutingMapper.selectOne(
- Wrappers.<TechnologyRouting>lambdaQuery()
- .eq(TechnologyRouting::getProductModelId, productionOrder.getProductModelId())
- .orderByDesc(TechnologyRouting::getId)
- .last("limit 1"));
- if (technologyRouting == null) {
- throw new ServiceException("No technology routing found for the product model");
- }
- productionOrder.setTechnologyRoutingId(technologyRouting.getId());
- }
+// if (productionOrder.getTechnologyRoutingId() == null) {
+// // 鏈樉寮忔寚瀹氬伐鑹鸿矾绾挎椂锛屾寜浜у搧瑙勬牸閫夋渶鏂颁竴鏉″伐鑹轰綔涓洪粯璁よ矾绾裤��
+// TechnologyRouting technologyRouting = technologyRoutingMapper.selectOne(
+// Wrappers.<TechnologyRouting>lambdaQuery()
+// .eq(TechnologyRouting::getProductModelId, productionOrder.getProductModelId())
+// .orderByDesc(TechnologyRouting::getId)
+// .last("limit 1"));
+// if (technologyRouting == null) {
+// throw new ServiceException("No technology routing found for the product model");
+// }
+// productionOrder.setTechnologyRoutingId(technologyRouting.getId());
+// }
if (oldOrder != null && ProductOrderStatusEnum.isStarted(oldOrder.getStatus())) {
// 寮�宸ュ悗鍙厑璁镐慨姝ｉ潪鏍稿績瀛楁锛屾牳蹇冪敓浜т緷鎹攣瀹氥��
if (!Objects.equals(oldOrder.getProductModelId(), productionOrder.getProductModelId())
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
index f9e4008..597ed34 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.production.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +18,7 @@
import com.ruoyi.production.mapper.ProductionPlanMapper;
import com.ruoyi.production.pojo.ProductionOrder;
import com.ruoyi.production.pojo.ProductionPlan;
+import com.ruoyi.production.service.ProductionOrderService;
import com.ruoyi.production.service.ProductionPlanService;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
@@ -24,20 +26,24 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper, ProductionPlan> implements ProductionPlanService {
- private final ProductionPlanMapper productionPlanMapper;
+ private static final int PLAN_STATUS_WAIT = 0;
+ private static final int PLAN_STATUS_PARTIAL = 1;
+ private static final int PLAN_STATUS_ISSUED = 2;
+ private final ProductionPlanMapper productionPlanMapper;
private final ProductionOrderMapper productionOrderMapper;
+ private final ProductionOrderService productionOrderService;
@Override
public IPage<ProductionPlanVo> listPage(Page<ProductionPlanDto> page, ProductionPlanDto productionPlanDto) {
@@ -45,133 +51,98 @@
}
/**
- * 鍚堝苟鐢熶骇璁″垝
+ * 鍚堝苟鐢熶骇璁″垝骞朵笅鍙戠敓浜ц鍗曘��
+ * 涓氬姟绾︽潫锛�
+ * 1. 浠呭厑璁稿悓涓�浜у搧鍨嬪彿鐨勮鍒掑悎骞讹紱
+ * 2. 宸蹭笅鍙戞垨閮ㄥ垎涓嬪彂鐨勮鍒掔姝㈠啀娆″悎骞讹紱
+ * 3. 涓嬪彂鏁伴噺涓嶈兘澶т簬鎵�閫夎鍒掗渶姹傛�婚噺锛�
+ * 4. 璁㈠崟鍒涘缓缁熶竴澶嶇敤 ProductionOrderService.saveProductionOrder锛岀‘淇濆伐鑹�/BOM/棰嗘枡涓诲崟绛夊悗缁�昏緫涓�鑷淬��
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean combine(ProductionPlanDto productionPlanDto) {
- if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
+ if (productionPlanDto == null || productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
return false;
}
- // 鏌ヨ涓荤敓浜ц鍒�
- List<ProductionPlanDto> plans = productionPlanMapper.selectWithMaterialByIds(productionPlanDto.getIds());
-
- if (plans == null || plans.isEmpty()) {
- throw new ServiceException("涓嬪彂澶辫触,鐢熶骇璁″垝涓嶅瓨鍦�");
+ List<Long> planIds = productionPlanDto.getIds().stream()
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+ if (planIds.isEmpty()) {
+ throw new ServiceException("涓嬪彂澶辫触锛屾湭閫夋嫨鐢熶骇璁″垝");
}
- // 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佸悕绉�
- String firstProductName = plans.get(0).getProductName();
- if (plans.stream().anyMatch(p -> p.getProductName() == null || !p.getProductName().equals(firstProductName))) {
- throw new BaseException("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧鍚嶇О");
+ List<ProductionPlanDto> plans = productionPlanMapper.selectWithMaterialByIds(planIds);
+ if (plans == null || plans.isEmpty() || plans.size() != planIds.size()) {
+ throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍒掍笉瀛樺湪鎴栧凡琚垹闄�");
}
- // 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佽鏍�
- String firstProductSpec = plans.get(0).getModel();
- if (plans.stream().anyMatch(p -> p.getModel() == null || !p.getModel().equals(firstProductSpec))) {
- throw new BaseException("鍚堝苟澶辫触锛屽瓨鍦ㄤ笉鍚岀殑浜у搧瑙勬牸");
+ ProductionPlanDto firstPlan = plans.getFirst();
+ if (firstPlan.getProductModelId() == null) {
+ throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍒掔己灏戜骇鍝佸瀷鍙�");
}
- // 鍒涘缓鐢熶骇璁㈠崟
+ boolean hasDifferentModel = plans.stream()
+ .anyMatch(item -> !Objects.equals(item.getProductModelId(), firstPlan.getProductModelId()));
+ if (hasDifferentModel) {
+ throw new BaseException("鍚堝苟澶辫触锛屾墍閫夌敓浜ц鍒掔殑浜у搧鍨嬪彿涓嶄竴鑷�");
+ }
+
+ boolean hasIssuedPlan = plans.stream()
+ .anyMatch(item -> item.getStatus() != null && item.getStatus() != PLAN_STATUS_WAIT);
+ if (hasIssuedPlan) {
+ throw new BaseException("鍚堝苟澶辫触锛屾墍閫夌敓浜ц鍒掑瓨鍦ㄥ凡涓嬪彂鎴栭儴鍒嗕笅鍙戞暟鎹�");
+ }
+
+ BigDecimal totalRequiredQuantity = plans.stream()
+ .map(ProductionPlan::getQtyRequired)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ if (totalRequiredQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("涓嬪彂澶辫触锛屾墍閫夌敓浜ц鍒掗渶姹傛�婚噺蹇呴』澶т簬0");
+ }
+
+ BigDecimal assignedQuantity = productionPlanDto.getTotalAssignedQuantity();
+ if (assignedQuantity == null || assignedQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("涓嬪彂澶辫触锛屼笅鍙戞暟閲忓繀椤诲ぇ浜�0");
+ }
+ if (assignedQuantity.compareTo(totalRequiredQuantity) > 0) {
+ throw new ServiceException("涓嬪彂澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庤鍒掗渶姹傛�婚噺");
+ }
+
ProductionOrder productionOrder = new ProductionOrder();
- productionOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
+ productionOrder.setProductionPlanIds(formatPlanIds(planIds));
+ productionOrder.setProductModelId(firstPlan.getProductModelId());
+ productionOrder.setQuantity(assignedQuantity);
productionOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
-// // 鍙犲姞鍓╀綑鏂规暟
-// BigDecimal totalRemainingVolume = plans.stream()
-// .map(ProductionPlan::getRemainingVolume)
-// .filter(Objects::nonNull)
-// .reduce(BigDecimal.ZERO, BigDecimal::add);
-// // 鍒ゆ柇涓嬪彂鏁伴噺鏄惁澶т簬绛変簬鍓╀綑鏂规暟
-// if (productionPlanDto.getTotalAssignedQuantity().compareTo(totalRemainingVolume) > 0) {
-// throw new BaseException("鎿嶄綔澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庡墿浣欐柟鏁�");
-// }
-//
-// // 鍒涘缓鐢熶骇璁㈠崟
-// ProductOrder productOrder = new ProductOrder();
-// productOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
-// productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
-// productOrder.setStatus(ProductOrderStatusEnum.WAIT.getCode());
-// productOrder.setStrength(productionPlanDto.getStrength());
-// productOrder.setProductMaterialSkuId(plans.get(0).getProductMaterialSkuId());
-//
-// Long orderId = productOrderService.insertProductOrder(productOrder);
-//
-// // 褰撲笅鍙戠殑浜у搧涓虹爩鍧楁垨鏉挎潗锛屽氨鎷夊彇BOM瀛愰泦涓庡伐鑹鸿矾绾垮瓙闆嗘暟鎹瓨鍏ュ埌闄勮〃涓�
-// if ("鐮屽潡".equals(productionPlanDto.getProductName())) {
-// productOrder.setRouteId(productionOrderAppendixService.populateBlocks(orderId, productionPlanDto));
-// }
-// if ("鏉挎潗".equals(productionPlanDto.getProductName())) {
-// productOrder.setRouteId(productionOrderAppendixService.populatePlates(orderId, productionPlanDto));
-// }
-// // 鏇存柊缁戝畾鐨勫伐鑹鸿矾绾�
-// productOrderService.updateById(productOrder);
-//
-// // 鏍规嵁涓嬪彂鏁伴噺锛屼粠绗竴涓敓浜ц鍒掑紑濮嬪垎閰嶆柟鏁�
-// BigDecimal assignedVolume = BigDecimal.ZERO;
-// for (ProductionPlan plan : plans) {
-// BigDecimal volume = plan.getVolume();
-// if (volume == null) {
-// continue;
-// }
-// // 璁＄畻鍓╀綑鏂规暟
-// BigDecimal remainingVolume = plan.getRemainingVolume();
-// if (remainingVolume.compareTo(BigDecimal.ZERO) <= 0) {
-// continue;
-// }
-//
-// ProductOrderPlan productOrderPlan = new ProductOrderPlan();
-// productOrderPlan.setProductOrderId(productOrder.getId());
-// productOrderPlan.setProductionPlanId(plan.getId());
-//
-// if (assignedVolume.add(remainingVolume).compareTo(productionPlanDto.getTotalAssignedQuantity()) >= 0) {
-// // 鏈�鍚庝竴涓鍒掞紝鍒嗛厤鍓╀綑鏂规暟
-// BigDecimal lastRemainingVolume = productionPlanDto.getTotalAssignedQuantity().subtract(assignedVolume);
-// BigDecimal assignedQuantity = Optional.ofNullable(plan.getAssignedQuantity()).orElse(BigDecimal.ZERO).add(lastRemainingVolume);
-// plan.setAssignedQuantity(assignedQuantity);
-// plan.setStatus(assignedQuantity.compareTo(plan.getVolume()) >= 0 ? 2 : 1);
-// productOrderPlan.setAssignedQuantity(lastRemainingVolume);
-// productionPlanMapper.updateById(plan);
-// productOrderPlanMapper.insert(productOrderPlan);
-// break;
-// }
-//
-// // 鍒嗛厤褰撳墠璁″垝鏂规暟
-// BigDecimal assignedQuantity = Optional.ofNullable(plan.getAssignedQuantity()).orElse(BigDecimal.ZERO).add(remainingVolume);
-// plan.setAssignedQuantity(assignedQuantity);
-// plan.setStatus(assignedQuantity.compareTo(plan.getVolume()) >= 0 ? 2 : 1);
-// productOrderPlan.setAssignedQuantity(remainingVolume);
-// // 鏇存柊鐢熶骇璁″垝
-// productionPlanMapper.updateById(plan);
-// // 鍒涘缓鍏宠仈鍏崇郴
-// productOrderPlanMapper.insert(productOrderPlan);
-// assignedVolume = assignedVolume.add(remainingVolume);
-// }
-//
-// for (ProductionPlan plan : plans) {
-// BigDecimal assignedQuantity = Optional.ofNullable(plan.getAssignedQuantity()).orElse(BigDecimal.ZERO);
-// BigDecimal volume = Optional.ofNullable(plan.getVolume()).orElse(BigDecimal.ZERO);
-// if (assignedQuantity.compareTo(BigDecimal.ZERO) <= 0) {
-// plan.setStatus(0);
-// } else if (assignedQuantity.compareTo(volume) >= 0) {
-// plan.setStatus(2);
-// } else {
-// plan.setStatus(1);
-// }
-// productionPlanMapper.updateById(plan);
-// }
+
+ boolean saved = productionOrderService.saveProductionOrder(productionOrder);
+ if (!saved) {
+ throw new ServiceException("涓嬪彂澶辫触锛岀敓浜ц鍗曚繚瀛樺け璐�");
+ }
+
+ int targetStatus = assignedQuantity.compareTo(totalRequiredQuantity) < 0 ? PLAN_STATUS_PARTIAL : PLAN_STATUS_ISSUED;
+ List<ProductionPlan> updates = planIds.stream().map(id -> {
+ ProductionPlan update = new ProductionPlan();
+ update.setId(id);
+ update.setStatus(targetStatus);
+ return update;
+ }).collect(Collectors.toList());
+ if (!updates.isEmpty()) {
+ this.updateBatchById(updates);
+ }
return true;
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean add(ProductionPlanDto dto) {
- if (StringUtils.isBlank(dto.getApplyNo())) {
- throw new ServiceException("鏂板澶辫触锛岀敵璇峰崟缂栧彿涓嶈兘涓虹┖");
- }
- checkApplyNoUnique(dto.getApplyNo(), null);
-
- dto.setStatus(0);
+ if (StringUtils.isBlank(dto.getMpsNo())) {
+ dto.setMpsNo(generateNextPlanNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"))));
+ }else checkMpsNoUnique(dto.getMpsNo(), null);
+ dto.setStatus(PLAN_STATUS_WAIT);
+ dto.setSource("鍐呴儴");
return productionPlanMapper.insert(dto) > 0;
}
@@ -179,51 +150,49 @@
@Transactional(rollbackFor = Exception.class)
public boolean update(ProductionPlanDto dto) {
if (dto == null || dto.getId() == null) {
- throw new ServiceException("缂栬緫澶辫触,鏁版嵁涓嶈兘涓虹┖");
+ throw new ServiceException("缂栬緫澶辫触锛屾暟鎹笉鑳戒负绌�");
}
ProductionPlan old = getById(dto.getId());
if (old == null) {
- throw new ServiceException("缂栬緫澶辫触,涓荤敓浜ц鍒掍笉瀛樺湪");
+ throw new ServiceException("缂栬緫澶辫触锛岀敓浜ц鍒掍笉瀛樺湪");
}
- // 鐘舵�佹牎楠�
- if (old.getStatus() != 0) {
- throw new BaseException("缂栬緫澶辫触,璇ョ敓浜ц鍒掑凡涓嬪彂鎴栭儴鍒嗕笅鍙戠姸鎬�,绂佹缂栬緫");
+ if (old.getStatus() != PLAN_STATUS_WAIT) {
+ throw new BaseException("缂栬緫澶辫触锛岃鐢熶骇璁″垝宸蹭笅鍙戞垨閮ㄥ垎涓嬪彂锛岀姝㈢紪杈�");
}
- // applyNo鍙樻洿鎵嶆牎楠�
- if (StringUtils.isNotBlank(dto.getApplyNo())
- && !dto.getApplyNo().equals(old.getApplyNo())) {
- checkApplyNoUnique(dto.getApplyNo(), dto.getId());
+ if (StringUtils.isNotBlank(dto.getMpsNo()) && !dto.getMpsNo().equals(old.getMpsNo())) {
+ checkMpsNoUnique(dto.getMpsNo(), dto.getId());
}
return productionPlanMapper.updateById(dto) > 0;
}
- private void checkApplyNoUnique(String applyNo, Long excludeId) {
+ private void checkMpsNoUnique(String mpsNo, Long excludeId) {
LambdaQueryWrapper<ProductionPlan> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(ProductionPlan::getApplyNo, applyNo);
-
+ wrapper.eq(ProductionPlan::getMpsNo, mpsNo);
if (excludeId != null) {
wrapper.ne(ProductionPlan::getId, excludeId);
}
-
if (productionPlanMapper.selectCount(wrapper) > 0) {
- throw new ServiceException("鐢宠鍗曠紪鍙� " + applyNo + " 宸插瓨鍦�");
+ throw new ServiceException("鐢熶骇璁″垝鍙� " + mpsNo + " 宸插瓨鍦�");
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean delete(List<Long> ids) {
- // 濡傛灉瀛樺湪宸蹭笅鍙戠殑璁″垝锛屽垯涓嶈兘鍒犻櫎
- if (productionPlanMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery().in(ProductionPlan::getId, ids)).stream().anyMatch(p -> p.getStatus() == 1 || p.getStatus() == 2)) {
+ if (productionPlanMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery().in(ProductionPlan::getId, ids))
+ .stream()
+ .anyMatch(p -> p.getStatus() == PLAN_STATUS_PARTIAL || p.getStatus() == PLAN_STATUS_ISSUED)) {
throw new BaseException("鍒犻櫎澶辫触锛屽瓨鍦ㄥ凡涓嬪彂鎴栭儴鍒嗕笅鍙戠殑璁″垝");
}
- // 濡傛灉鏈夊叧鑱旇鍗曪紝鍒欎笉鑳藉垹闄�
- if (productionOrderMapper.selectList(Wrappers.<ProductionOrder>lambdaQuery().in(ProductionOrder::getProductionPlanIds, ids)).stream().anyMatch(p -> p.getId() != null)) {
- throw new BaseException("鍒犻櫎澶辫触锛屽瓨鍦ㄥ叧鑱旇鍗�");
+
+ if (productionOrderMapper.selectList(Wrappers.<ProductionOrder>lambdaQuery().in(ProductionOrder::getProductionPlanIds, ids))
+ .stream()
+ .anyMatch(p -> p.getId() != null)) {
+ throw new BaseException("鍒犻櫎澶辫触锛屽瓨鍦ㄥ叧鑱旂敓浜ц鍗�");
}
return productionPlanMapper.deleteBatchIds(ids) > 0;
@@ -240,80 +209,81 @@
try {
list = excelUtil.importExcel(file.getInputStream());
} catch (Exception e) {
- log.error("鐢熶骇闇�姹侲xcel瀵煎叆澶辫触", e);
throw new ServiceException("Excel瑙ｆ瀽澶辫触");
}
-
if (list == null || list.isEmpty()) {
throw new ServiceException("Excel娌℃湁鏁版嵁");
}
-
- Set<String> applyNos = new HashSet<>();
- Set<String> materialCodes = new HashSet<>();
+ Set<String> mpsNos = new HashSet<>();
for (int i = 0; i < list.size(); i++) {
ProductionPlanImportDto dto = list.get(i);
- String applyNo = dto.getApplyNo();
- String materialCode = dto.getMaterialCode();
-
- if (StringUtils.isEmpty(applyNo)) {
- throw new ServiceException("瀵煎叆澶辫触锛氱 " + (i + 2) + " 琛岀敵璇峰崟缂栧彿涓嶈兘涓虹┖");
+ String mpsNo = dto.getMpsNo();
+ if (StringUtils.isEmpty(mpsNo)) {
+ generateNextPlanNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")));
}
- if (!applyNos.add(applyNo)) {
- throw new ServiceException("瀵煎叆澶辫触锛欵xcel 涓瓨鍦ㄩ噸澶嶇殑鐢宠鍗曠紪鍙�: " + applyNo);
+ if (!mpsNos.add(mpsNo)) {
+ throw new ServiceException("瀵煎叆澶辫触锛欵xcel 涓瓨鍦ㄩ噸澶嶇殑鐢宠鍗曠紪鍙� " + mpsNo);
}
- if (StringUtils.isEmpty(materialCode)) {
- throw new ServiceException("瀵煎叆澶辫触锛氱 " + (i + 2) + " 琛岀墿鏂欑紪鐮佷笉鑳戒负绌�");
- }
-
- String strength = dto.getStrength();
- if (StringUtils.isNotEmpty(strength)) {
- if (!"A3.5".equals(strength) && !"A5.0".equals(strength)) {
- throw new ServiceException("瀵煎叆澶辫触锛氱 " + (i + 2) + " 琛屽己搴﹀彧鑳芥槸 A3.5 鎴� A5.0");
- }
- }
-
- materialCodes.add(materialCode);
}
-
- // 鐢宠鍗曠紪鍙锋槸鍚﹀凡瀛樺湪
Long existApplyNoCount = baseMapper.selectCount(Wrappers.<ProductionPlan>lambdaQuery()
- .in(ProductionPlan::getApplyNo, applyNos));
+ .in(ProductionPlan::getMpsNo, mpsNos));
if (existApplyNoCount > 0) {
- List<String> existApplyNos = baseMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery()
- .in(ProductionPlan::getApplyNo, applyNos))
- .stream().map(ProductionPlan::getApplyNo).collect(Collectors.toList());
- throw new ServiceException("瀵煎叆澶辫触锛岀敵璇峰崟缂栧彿宸插瓨鍦�: " + String.join(", ", existApplyNos));
+ List<String> existMpsNos = baseMapper.selectList(Wrappers.<ProductionPlan>lambdaQuery()
+ .in(ProductionPlan::getMpsNo, mpsNos))
+ .stream()
+ .map(ProductionPlan::getMpsNo)
+ .collect(Collectors.toList());
+ throw new ServiceException("瀵煎叆澶辫触锛岀敓浜ц鍒掑彿宸插瓨鍦�: " + String.join(", ", existMpsNos));
}
-
LocalDateTime now = LocalDateTime.now();
List<ProductionPlan> entityList = list.stream().map(dto -> {
ProductionPlan entity = new ProductionPlan();
BeanUtils.copyProperties(dto, entity);
- entity.setStatus(0);
+ entity.setStatus(PLAN_STATUS_WAIT);
+ entity.setSource("鍐呴儴");
entity.setCreateTime(now);
entity.setUpdateTime(now);
return entity;
}).collect(Collectors.toList());
-
this.saveBatch(entityList);
}
@Override
public void exportProdData(HttpServletResponse response, List<Long> ids) {
- List<ProductionPlan> list;
- if (ids != null && !ids.isEmpty()) {
- list = baseMapper.selectBatchIds(ids);
- } else {
- list = baseMapper.selectList(null);
- }
-
+ List<ProductionPlanDto> list = productionPlanMapper.selectWithMaterialByIds(ids);
List<ProductionPlanImportDto> exportList = new ArrayList<>();
- for (ProductionPlan entity : list) {
+ for (ProductionPlanDto entity : list) {
ProductionPlanImportDto dto = new ProductionPlanImportDto();
BeanUtils.copyProperties(entity, dto);
exportList.add(dto);
}
ExcelUtil<ProductionPlanImportDto> util = new ExcelUtil<>(ProductionPlanImportDto.class);
- util.exportExcel(response, exportList, "閿�鍞敓浜ч渶姹傛暟鎹�");
+ util.exportExcel(response, exportList, "涓荤敓浜ц鍒�");
+ }
+
+ private String formatPlanIds(List<Long> planIds) {
+ return planIds.stream()
+ .filter(Objects::nonNull)
+ .distinct()
+ .map(String::valueOf)
+ .collect(Collectors.joining(",", "[", "]"));
+ }
+
+ private String generateNextPlanNo(String datePrefix) {
+ QueryWrapper<ProductionPlan> queryWrapper = new QueryWrapper<>();
+ queryWrapper.likeRight("mps_no", "JH" + datePrefix);
+ queryWrapper.orderByDesc("mps_no");
+ queryWrapper.last("LIMIT 1");
+ ProductionPlan latestPlan = productionPlanMapper.selectOne(queryWrapper);
+ int sequence = 1;
+ if (latestPlan != null && latestPlan.getMpsNo() != null && !latestPlan.getMpsNo().isEmpty()) {
+ String sequenceStr = latestPlan.getMpsNo().substring(("JH" + datePrefix).length());
+ try {
+ sequence = Integer.parseInt(sequenceStr) + 1;
+ } catch (NumberFormatException e) {
+ sequence = 1;
+ }
+ }
+ return "JH" + datePrefix + String.format("%04d", sequence);
}
}
diff --git a/src/main/java/com/ruoyi/project/common/CommonController.java b/src/main/java/com/ruoyi/project/common/CommonController.java
index d3069a5..bf7bda4 100644
--- a/src/main/java/com/ruoyi/project/common/CommonController.java
+++ b/src/main/java/com/ruoyi/project/common/CommonController.java
@@ -3,10 +3,9 @@
import com.ruoyi.basic.service.StorageBlobService;
import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
-import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.framework.web.domain.R;
-import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.slf4j.Logger;
@@ -36,9 +35,6 @@
public class CommonController {
private static final Logger log = LoggerFactory.getLogger(CommonController.class);
- private ServerConfig serverConfig;
-
- private static final String FILE_DELIMETER = ",";
private final StorageBlobService storageBlobService;
private final FileUtil fileUtil;
@@ -77,16 +73,6 @@
// }
//
// /**
-// * minio閫氱敤涓婁紶璇锋眰锛堝涓級
-// */
-// @PostMapping("/minioUploads")
-// @Operation(summary = "minio閫氱敤涓婁紶璇锋眰")
-// public AjaxResult minioUploadFiles(List<MultipartFile> files, String bucketName, Long type) throws Exception
-// {
-// return AjaxResult.success();
-// }
-//
-// /**
// * 閫氱敤涓婁紶璇锋眰锛堝崟涓級
// */
// @PostMapping("/upload")
@@ -104,43 +90,6 @@
// ajax.put("fileName", fileName);
// ajax.put("newFileName", FileUtils.getName(fileName));
// ajax.put("originalFilename", file.getOriginalFilename());
-// return ajax;
-// }
-// catch (Exception e)
-// {
-// return AjaxResult.error(e.getMessage());
-// }
-// }
-//
-// /**
-// * 閫氱敤涓婁紶璇锋眰锛堝涓級
-// */
-// @PostMapping("/uploads")
-// public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
-// {
-// try
-// {
-// // 涓婁紶鏂囦欢璺緞
-// String filePath = RuoYiConfig.getUploadPath();
-// List<String> urls = new ArrayList<String>();
-// List<String> fileNames = new ArrayList<String>();
-// List<String> newFileNames = new ArrayList<String>();
-// List<String> originalFilenames = new ArrayList<String>();
-// for (MultipartFile file : files)
-// {
-// // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
-// String fileName = FileUploadUtils.upload(filePath, file);
-// String url = serverConfig.getUrl() + fileName;
-// urls.add(url);
-// fileNames.add(fileName);
-// newFileNames.add(FileUtils.getName(fileName));
-// originalFilenames.add(file.getOriginalFilename());
-// }
-// AjaxResult ajax = AjaxResult.success();
-// ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
-// ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
-// ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
-// ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
// return ajax;
// }
// catch (Exception e)
diff --git a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
index 675bba1..9ff3f09 100644
--- a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -1,10 +1,10 @@
package com.ruoyi.sales.dto;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.ShippingInfo;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@@ -33,4 +33,7 @@
private String productName;
+ private List<StorageBlobDTO> storageBlobDTOs;
+ private List<StorageBlobVO> storageBlobVOs;
+
}
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 5765262..70ffa12 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -232,6 +232,7 @@
private BigDecimal ticketsTotal = BigDecimal.ZERO;
@Schema(description = "鏄惁璐ㄦ")
+ //閽堝閲囪喘鍙拌处锛屾槸鍚﹁川妫�
private Boolean isChecked;
@TableField(exist = false)
@@ -251,4 +252,8 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
+ @Schema(description = "鏄惁鐢熶骇")
+ //閽堝閿�鍞彴璐︼紝鏄惁鐢熶骇
+ private Boolean isProduction;
+
}
diff --git a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
index 2aa1a13..a701bf2 100644
--- a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
+++ b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
@@ -3,13 +3,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.procurementrecord.dto.ReturnSaleProductDto;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.pojo.ShippingInfo;
-import org.apache.ibatis.annotations.Param;
-import java.io.IOException;
import java.util.List;
/**
@@ -19,7 +16,7 @@
public interface ShippingInfoService extends IService<ShippingInfo>{
IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req);
- boolean deductStock(ShippingInfoDto req) throws IOException;
+ boolean deductStock(ShippingInfoDto req);
boolean delete(List<Long> ids);
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
index 56cfbb0..cf333a2 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -6,20 +6,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
-import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.mapper.*;
-import com.ruoyi.production.pojo.ProductionAccount;
-import com.ruoyi.production.pojo.ProductionOperationTask;
-import com.ruoyi.production.pojo.ProductionOrder;
-import com.ruoyi.production.pojo.ProductionProductMain;
+import com.ruoyi.production.pojo.ProductionPlan;
import com.ruoyi.production.service.ProductionOrderService;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.quality.mapper.QualityInspectMapper;
-import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
@@ -68,7 +62,7 @@
private final ProductionAccountMapper productionAccountMapper;
private final SalesLedgerMapper salesLedgerMapper;
private final PurchaseLedgerMapper purchaseLedgerMapper;
- private final ProductionOrderMapper productionOrderMapper;
+ private final ProductionPlanMapper productionPlanMapper;
private final ProductionOperationTaskMapper productionOperationTaskMapper;
private final ProductionOrderService productionOrderService;
private final TechnologyRoutingMapper technologyRoutingMapper;
@@ -256,70 +250,38 @@
* 鏂板鐢熶骇鏁版嵁
*/
public void addProductionData(SalesLedgerProduct salesLedgerProduct) {
- ProductionOrder productionOrder = new ProductionOrder();
- productionOrder.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());
- productionOrder.setProductModelId(salesLedgerProduct.getProductModelId());
- productionOrder.setSaleLedgerProductId(salesLedgerProduct.getId().intValue());
- productionOrder.setNpsNo(generateNextOrderNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"))));
- productionOrder.setQuantity(salesLedgerProduct.getQuantity());
- productionOrder.setCompleteQuantity(BigDecimal.ZERO);
+ //鍏堝垽鏂浜у搧鏄惁闇�瑕佺敓浜�
+ if (!salesLedgerProduct.getIsProduction()) {
+ return;
+ }
+ ProductionPlan productionPlan = new ProductionPlan();
+ productionPlan.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());
+ productionPlan.setSalesLedgerProductId(salesLedgerProduct.getId());
+ productionPlan.setMpsNo(generateNextPlanNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"))));
+ productionPlan.setProductModelId(salesLedgerProduct.getProductModelId());
+ productionPlan.setQtyRequired(salesLedgerProduct.getQuantity());
+ productionPlan.setSource("閿�鍞�");
+ productionPlan.setStatus(0);
+ productionPlanMapper.insert(productionPlan);
- TechnologyRouting routing = technologyRoutingMapper.selectOne(
- new QueryWrapper<TechnologyRouting>().lambda()
- .eq(TechnologyRouting::getProductModelId, salesLedgerProduct.getProductModelId())
- .orderByDesc(TechnologyRouting::getCreateTime)
- .last("LIMIT 1"));
- if (routing != null) {
- productionOrder.setTechnologyRoutingId(routing.getId());
- }
- productionOrderMapper.insert(productionOrder);
- if (productionOrder.getTechnologyRoutingId() != null) {
- productionOrderService.syncProductionOrderSnapshot(productionOrder.getId());
- }
}
/**
- * 鍒犻櫎鐢熶骇鏁版嵁
+ * 鍒犻櫎鐢熶骇璁″垝
*/
public void deleteProductionData(List<Long> productIds) {
- List<ProductionOrder> productionOrders = productionOrderMapper.selectList(
- new LambdaQueryWrapper<ProductionOrder>()
- .in(ProductionOrder::getSaleLedgerProductId, productIds.stream().map(Long::intValue).collect(Collectors.toList())));
- if (org.springframework.util.CollectionUtils.isEmpty(productionOrders)) {
+ List<ProductionPlan> productionPlans = productionPlanMapper.selectList(
+ new LambdaQueryWrapper<ProductionPlan>()
+ .in(ProductionPlan::getSalesLedgerProductId, productIds.stream().map(Long::intValue).collect(Collectors.toList())));
+ if (org.springframework.util.CollectionUtils.isEmpty(productionPlans)) {
return;
}
- List<Long> orderIds = productionOrders.stream().map(ProductionOrder::getId).collect(Collectors.toList());
- List<Long> taskIds = productionOperationTaskMapper.selectList(
- new LambdaQueryWrapper<ProductionOperationTask>()
- .in(ProductionOperationTask::getProductionOrderId, orderIds))
- .stream().map(ProductionOperationTask::getId).collect(Collectors.toList());
- if (!taskIds.isEmpty()) {
- List<ProductionProductMain> productMains = productionProductMainMapper.selectList(
- new LambdaQueryWrapper<ProductionProductMain>()
- .in(ProductionProductMain::getProductionOperationTaskId, taskIds));
- List<Long> productMainIds = productMains.stream().map(ProductionProductMain::getId).collect(Collectors.toList());
- if (!productMainIds.isEmpty()) {
- List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(
- new LambdaQueryWrapper<QualityInspect>().in(QualityInspect::getProductMainId, productMainIds));
- qualityInspects.forEach(qualityInspect -> {
- if (qualityInspect.getInspectState() == 1) {
- throw new RuntimeException("宸叉彁浜ょ殑妫�楠屽崟涓嶈兘鍒犻櫎");
- }
- });
- productionProductOutputMapper.deleteByProductMainIds(productMainIds);
- productionProductInputMapper.deleteByProductMainIds(productMainIds);
- qualityInspectMapper.deleteByProductMainIds(productMainIds);
- productionAccountMapper.delete(new LambdaQueryWrapper<ProductionAccount>()
- .in(ProductionAccount::getProductionProductMainId, productMainIds));
- for (Long productMainId : productMainIds) {
- stockUtils.deleteStockOutRecord(productMainId, StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode());
- stockUtils.deleteStockInRecord(productMainId, StockInUnQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode());
- }
- }
- productionProductMainMapper.delete(new LambdaQueryWrapper<ProductionProductMain>()
- .in(ProductionProductMain::getProductionOperationTaskId, taskIds));
+ //濡傛灉鐢熶骇璁″垝宸蹭笅鍙戝垯涓嶈兘鍒犻櫎
+ if (productionPlans.stream().anyMatch(productionPlan -> productionPlan.getStatus() != 0)) {
+ throw new RuntimeException("鐢熶骇璁″垝宸蹭笅鍙戯紝涓嶈兘鍒犻櫎璇ラ攢鍞骇鍝�");
}
- productionOrderService.removeProductionOrder(orderIds);
+ List<Long> ids = productionPlans.stream().map(ProductionPlan::getId).collect(Collectors.toList());
+ productionPlanMapper.deleteByIds(ids);
}
@Override
@@ -432,21 +394,21 @@
return R.ok();
}
- private String generateNextOrderNo(String datePrefix) {
- QueryWrapper<ProductionOrder> queryWrapper = new QueryWrapper<>();
- queryWrapper.likeRight("nps_no", "SC" + datePrefix);
- queryWrapper.orderByDesc("nps_no");
+ private String generateNextPlanNo(String datePrefix) {
+ QueryWrapper<ProductionPlan> queryWrapper = new QueryWrapper<>();
+ queryWrapper.likeRight("mps_no", "JH" + datePrefix);
+ queryWrapper.orderByDesc("mps_no");
queryWrapper.last("LIMIT 1");
- ProductionOrder latestOrder = productionOrderMapper.selectOne(queryWrapper);
+ ProductionPlan latestPlan = productionPlanMapper.selectOne(queryWrapper);
int sequence = 1;
- if (latestOrder != null && latestOrder.getNpsNo() != null && !latestOrder.getNpsNo().isEmpty()) {
- String sequenceStr = latestOrder.getNpsNo().substring(("SC" + datePrefix).length());
+ if (latestPlan != null && latestPlan.getMpsNo() != null && !latestPlan.getMpsNo().isEmpty()) {
+ String sequenceStr = latestPlan.getMpsNo().substring(("JH" + datePrefix).length());
try {
sequence = Integer.parseInt(sequenceStr) + 1;
} catch (NumberFormatException e) {
sequence = 1;
}
}
- return "SC" + datePrefix + String.format("%04d", sequence);
+ return "JH" + datePrefix + String.format("%04d", sequence);
}
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 607ada0..32d6069 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -520,7 +520,7 @@
List<Long> productIds = products.stream()
.map(SalesLedgerProduct::getId)
.collect(Collectors.toList());
- //鍒犻櫎鐢熶骇鏁版嵁
+ //鍒犻櫎鐢熶骇璁″垝
salesLedgerProductServiceImpl.deleteProductionData(productIds);
// 鎵归噺鍒犻櫎浜у搧瀛愯〃
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
index f524ffe..9c51b3f 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
+import com.ruoyi.basic.enums.ApplicationTypeEnum;
+import com.ruoyi.basic.enums.RecordTypeEnum;
+import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
@@ -22,7 +25,6 @@
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
-import java.io.IOException;
import java.util.Collections;
import java.util.List;
@@ -41,18 +43,19 @@
private final StockUtils stockUtils;
private final CommonFileServiceImpl commonFileService;
private final ApproveProcessServiceImpl approveProcessService;
+ private final FileUtil fileUtil;
@Override
public IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req) {
IPage<ShippingInfoDto> listPage = shippingInfoMapper.listPage(page, req);
listPage.getRecords().forEach(item ->{
- item.setCommonFileList(commonFileService.getFileListByBusinessId(item.getId(), FileNameType.SHIP.getValue()));
+ item.setStorageBlobVOs(fileUtil.getStorageBlobVOsByApplicationAndRecordTypeAndRecordId(ApplicationTypeEnum.IMAGE, RecordTypeEnum.SHIPPING_INFO, item.getId()));
});
return listPage;
}
@Override
- public boolean deductStock(ShippingInfoDto req) throws IOException {
+ public boolean deductStock(ShippingInfoDto req) {
ShippingInfo byId = this.getById(req.getId());
if (byId == null) {
throw new RuntimeException("鍙戣揣淇℃伅涓嶅瓨鍦�");
@@ -68,10 +71,8 @@
byId.setShippingCarNumber(req.getShippingCarNumber());
byId.setShippingDate(req.getShippingDate());
boolean update = this.updateById(byId);
- // 杩佺Щ鏂囦欢
- if(CollectionUtils.isNotEmpty(req.getTempFileIds())){
- tempFileService.migrateTempFilesToFormal(req.getId(), req.getTempFileIds(), FileNameType.SHIP.getValue());
- }
+ // 淇濆瓨鏂囦欢
+ fileUtil.saveStorageAttachment(ApplicationTypeEnum.IMAGE, RecordTypeEnum.SHIPPING_INFO, req.getId(), req.getStorageBlobDTOs());
return update ;
}
diff --git a/src/main/resources/mapper/production/ProductionPlanMapper.xml b/src/main/resources/mapper/production/ProductionPlanMapper.xml
index a7ad8f7..da0d293 100644
--- a/src/main/resources/mapper/production/ProductionPlanMapper.xml
+++ b/src/main/resources/mapper/production/ProductionPlanMapper.xml
@@ -23,31 +23,25 @@
<select id="listPage" resultType="com.ruoyi.production.bean.vo.ProductionPlanVo">
SELECT
pp.*,
- pms.material_code AS materialCode,
- pmdl.model,
- pms.product_id AS productMaterialId,
+ pm.model,
+ p.id as productId,
p.product_name AS productName,
- pmdl.unit
+ pm.unit
FROM production_plan pp
- left join product_material_sku pms on pp.product_material_sku_id = pms.id
- left join product_model pmdl on pp.product_model_id = pmdl.id
- left join product p on pmdl.product_id = p.id
-
- ORDER BY COALESCE(pp.form_modified_time, pp.id) DESC
+ left join product_model pm on pp.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ ORDER BY COALESCE(pp.id) DESC
</select>
<select id="selectWithMaterialByIds" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
SELECT
pp.*,
- pms.material_code AS materialCode,
- pmdl.model,
+ pm.model,
p.product_name AS productName,
- pmdl.unit,
- pms.product_id AS productMaterialId
+ pm.unit
FROM production_plan pp
- LEFT JOIN product_material_sku pms ON pp.product_material_sku_id = pms.id
- LEFT JOIN product_model pmdl ON pp.product_model_id = pmdl.id
- LEFT JOIN product p ON pmdl.product_id = p.id
+ LEFT JOIN product_model pm ON pp.product_model_id = pm.id
+ LEFT JOIN product p ON pm.product_id = p.id
WHERE pp.id IN
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
@@ -57,15 +51,12 @@
<select id="selectProductionPlanDtoById" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
SELECT
pp.*,
- pms.material_code AS materialCode,
- pmdl.model,
- pms.product_id AS productMaterialId,
+ pm.model,
p.product_name AS productName,
- pmdl.unit
+ pm.unit
FROM production_plan pp
- left join product_material_sku pms on pp.product_material_sku_id = pms.id
- left join product_model pmdl on pp.product_model_id = pmdl.id
- left join product p on pmdl.product_id = p.id
+ left join product_model pm on pp.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
WHERE pp.id = #{productionPlanId}
</select>
</mapper>
--
Gitblit v1.9.3