diff --git a/oms_web/oms_vue/src/views/approve/finance/payment/components/PaymentDetail.vue b/oms_web/oms_vue/src/views/approve/finance/payment/components/PaymentDetail.vue
index 39bb0e3e..8e9b284f 100644
--- a/oms_web/oms_vue/src/views/approve/finance/payment/components/PaymentDetail.vue
+++ b/oms_web/oms_vue/src/views/approve/finance/payment/components/PaymentDetail.vue
@@ -28,6 +28,22 @@
应付单信息
+
+
+
+
+ {{ purchaseItem.purchaseNo }}
+
+
+
+
{{ scope.row.payableBillCode }}
@@ -38,13 +54,9 @@
{{ scope.row.projectName }}
-
-
-
-
-
-
-
+
+
+
@@ -72,19 +84,44 @@
+
+
+
+
+
+
+ 采购单编号: {{ pruchaseDetailOrderData ? pruchaseDetailOrderData.purchaseNo : '' }}
+ | 版本号: {{ pruchaseDetailOrderData.version }}
+
+
+
@@ -163,4 +233,12 @@ export default {
.payment-detail {
margin-bottom: 20px;
}
+
+.purchase-no-cell {
+ word-break: break-all;
+}
+
+.purchase-no-link {
+ display: block;
+}
diff --git a/oms_web/oms_vue/src/views/purchaseorder/index.vue b/oms_web/oms_vue/src/views/purchaseorder/index.vue
index be1a6dd6..3f9e3767 100644
--- a/oms_web/oms_vue/src/views/purchaseorder/index.vue
+++ b/oms_web/oms_vue/src/views/purchaseorder/index.vue
@@ -284,7 +284,7 @@
- 订单编号: {{ currentDetailPurchaseNo }}
+ 采购单编号: {{ currentDetailPurchaseNo }}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
index cfb5f9c9..c4c4bcfa 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
@@ -194,4 +194,4 @@ public @interface Excel
return this.value;
}
}
-}
\ No newline at end of file
+}
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 83df5136..eaac6d26 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
@@ -118,7 +118,7 @@ public class OmsPurchaseOrder extends BaseEntity
@Excel(name = "流程类型", readConverterExp = "online=线上,offline=线下")
private String flowType;
- @Excel(name = "备注")
+ @Excel(name = "备注", wrapText = true)
private String remark;
/** 删除标志(0正常 1删除) */
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/dto/PaymentBillPayableDetailDTO.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/dto/PaymentBillPayableDetailDTO.java
index 2434eaf0..7ebbcc3a 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/dto/PaymentBillPayableDetailDTO.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/dto/PaymentBillPayableDetailDTO.java
@@ -22,8 +22,19 @@ public class PaymentBillPayableDetailDTO {
/** 项目名称 */
private String projectName;
+
+ /** 产品类型 */
private String productType;
+ /** 产品编码 */
+ private String productCode;
+
+ /** 产品型号 */
+ private String model;
+
+ /** 产品名称 */
+ private String productName;
+
/** 采购应付单ID */
private Long payableBillId;
@@ -40,4 +51,8 @@ public class PaymentBillPayableDetailDTO {
private BigDecimal paymentRate;
private String vendorName;
private Date createTime;
+
+ /** 采购单号 */
+ private String purchaseNo;
+
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPayableBillMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPayableBillMapper.java
index 8af3045a..212e5889 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPayableBillMapper.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPayableBillMapper.java
@@ -79,4 +79,6 @@ public interface OmsPayableBillMapper
List listPayable(OmsPayableBill payableBill);
+ String selectPurcahseNoByPayableBillCode(@Param("payableBillCode") String payableBillCode);
+
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPayableBillService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPayableBillService.java
index 1656f978..cc7f2026 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPayableBillService.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IOmsPayableBillService.java
@@ -89,4 +89,7 @@ public interface IOmsPayableBillService
void deleteByInventoryCode(List collect);
List listPayable(OmsPayableBill payableBill);
+
+ String selectPurcahseNoByPayableBillCode(String payableBillCode);
+
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPayableBillServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPayableBillServiceImpl.java
index dbf95605..3e52d2ed 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPayableBillServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPayableBillServiceImpl.java
@@ -582,5 +582,11 @@ public class OmsPayableBillServiceImpl implements IOmsPayableBillService {
public List listPayable(OmsPayableBill payableBill) {
return omsPayableBillMapper.listPayable( payableBill);
}
+
+ @Override
+ public String selectPurcahseNoByPayableBillCode(String payableBillCode) {
+ return omsPayableBillMapper.selectPurcahseNoByPayableBillCode(payableBillCode);
+ }
+
}
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPaymentBillServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPaymentBillServiceImpl.java
index 05eda529..c171dff9 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPaymentBillServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsPaymentBillServiceImpl.java
@@ -214,6 +214,10 @@ public class OmsPaymentBillServiceImpl implements IOmsPaymentBillService , TodoC
}
}
List paymentBillPayableDetailDTOS = detailService.listPayableByPaymentCode(paymentBillDetailDTO.getPaymentBillCode());
+ paymentBillPayableDetailDTOS.forEach(item -> {
+ String purchaseNo = payableBillService.selectPurcahseNoByPayableBillCode(item.getPayableBillCode());
+ item.setPurchaseNo(purchaseNo);
+ });
paymentBillDetailDTO.setPayableDetails(paymentBillPayableDetailDTOS);
return paymentBillDetailDTO;
}
diff --git a/ruoyi-sip/src/main/resources/mapper/finance/OmsPayableBillMapper.xml b/ruoyi-sip/src/main/resources/mapper/finance/OmsPayableBillMapper.xml
index cbaa0708..f8757f3a 100644
--- a/ruoyi-sip/src/main/resources/mapper/finance/OmsPayableBillMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/finance/OmsPayableBillMapper.xml
@@ -341,4 +341,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
\ No newline at end of file
diff --git a/ruoyi-sip/src/main/resources/mapper/finance/OmsPayablePaymentDetailMapper.xml b/ruoyi-sip/src/main/resources/mapper/finance/OmsPayablePaymentDetailMapper.xml
index 33ef4bc8..d654b0d2 100644
--- a/ruoyi-sip/src/main/resources/mapper/finance/OmsPayablePaymentDetailMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/finance/OmsPayablePaymentDetailMapper.xml
@@ -122,7 +122,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ORDER BY t1.create_time DESC