From f3f7a99b1075c5317d71893863a033006532f323 Mon Sep 17 00:00:00 2001 From: jiangpeng Date: Tue, 30 Jun 2026 14:31:57 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=87=87=E8=B4=AD=E5=8D=95?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E5=A4=9A=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/PurchaseOrderDetail.vue | 10 ++++--- .../components/PurchaseOrderDetailView.vue | 14 +++++++--- .../ruoyi/sip/domain/OmsPurchaseOrder.java | 3 ++- .../sip/domain/OmsPurchaseOrderHistory.java | 2 +- .../impl/OmsPurchaseOrderServiceImpl.java | 27 +++++++++++++------ 5 files changed, 39 insertions(+), 17 deletions(-) diff --git a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue index aaf962c6..0b0e275e 100644 --- a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue +++ b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetail.vue @@ -109,7 +109,7 @@ - @@ -318,7 +318,9 @@ export default { this.$nextTick(() => { this.handleVendorChange(this.form.vendorId); // 初始化 fileList - if (this.form.fileLog) { + if (this.form.fileList && this.form.fileList.length) { + this.fileList = [...this.form.fileList] + } else if (this.form.fileLog) { this.fileList = [{...this.form.fileLog}] } else { this.fileList = []; @@ -346,7 +348,9 @@ export default { if (this.orderData) { this.form = JSON.parse(JSON.stringify(this.orderData)); this.handleVendorChange(this.form.vendorId); - if (this.form.fileLog) { + if (this.form.fileList && this.form.fileList.length) { + this.fileList = [...this.form.fileList] + } else if (this.form.fileLog) { this.fileList = [{...this.form.fileLog}] } else { this.fileList = []; diff --git a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetailView.vue b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetailView.vue index 90aad00b..be90f23c 100644 --- a/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetailView.vue +++ b/oms_web/oms_vue/src/views/purchaseorder/components/PurchaseOrderDetailView.vue @@ -110,10 +110,12 @@ {{ form.remark }} - - - {{ form.fileLog.fileName }} - 下载 + + +
+ {{ file.fileName }} + 下载 +
@@ -280,6 +282,8 @@ export default { ownerName: null, remark: null, annex: null, + fileId: null, + fileList: [], totalAmount: null, status: 0, approveStatus: 0, @@ -382,6 +386,8 @@ export default { ownerName: null, remark: null, annex: null, + fileId: null, + fileList: [], totalAmount: null, status: 0, approveStatus: 0, diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java index e1bea253..c6a09f3a 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrder.java @@ -145,8 +145,9 @@ public class OmsPurchaseOrder extends BaseEntity private String productCode; private String productModel; private String vendorEmail; - private Integer fileId; + private String fileId; private OmsFileLog fileLog; + private List fileList; /** 采购单明细表信息 */ diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderHistory.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderHistory.java index be40ec0f..e4a8ee10 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderHistory.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderHistory.java @@ -91,7 +91,7 @@ public class OmsPurchaseOrderHistory extends BaseEntity /** 版本号 */ private Integer version; - private Integer fileId; + private String fileId; private List omsPurchaseOrderItemList; } \ No newline at end of file diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java index 20bfc71a..9c006082 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPurchaseOrderServiceImpl.java @@ -117,13 +117,27 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To } List omsPurchaseOrderItems = omsPurchaseOrderMapper.listItemByPurchaseId(id); omsPurchaseOrder.setOmsPurchaseOrderItemList(omsPurchaseOrderItems); - if (omsPurchaseOrder.getFileId() != null) { - OmsFileLog omsFileLog = omsFileLogService.queryById(omsPurchaseOrder.getFileId()); - omsPurchaseOrder.setFileLog(omsFileLog); - } + fillFileList(omsPurchaseOrder); return omsPurchaseOrder; } + private void fillFileList(OmsPurchaseOrder omsPurchaseOrder) { + if (omsPurchaseOrder == null || StringUtils.isEmpty(omsPurchaseOrder.getFileId())) { + return; + } + List fileIdList = Arrays.stream(omsPurchaseOrder.getFileId().split(",")) + .filter(StringUtils::isNotEmpty) + .map(Integer::valueOf) + .collect(Collectors.toList()); + if (CollUtil.isNotEmpty(fileIdList)) { + OmsFileLog query = new OmsFileLog(); + query.setIdList(fileIdList); + List fileList = omsFileLogService.queryAll(query); + omsPurchaseOrder.setFileList(fileList); + omsPurchaseOrder.setFileLog(fileList.get(0)); + } + } + /** * 查询采购单主表列表 * @@ -427,10 +441,7 @@ public class OmsPurchaseOrderServiceImpl implements IOmsPurchaseOrderService, To } List omsPurchaseOrderItems = omsPurchaseOrderMapper.listItemByPurchaseId(omsPurchaseOrder.getId()); omsPurchaseOrder.setOmsPurchaseOrderItemList(omsPurchaseOrderItems); - if (omsPurchaseOrder.getFileId() != null) { - OmsFileLog omsFileLog = omsFileLogService.queryById(omsPurchaseOrder.getFileId()); - omsPurchaseOrder.setFileLog(omsFileLog); - } + fillFileList(omsPurchaseOrder); return omsPurchaseOrder; }